From 3fd6cbd2ee79c56c94ead0f370ac1c49e033c429 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 23:01:15 +0000 Subject: zroadmap: add cvs version. add patch to overcome questionable handcrafted Makefiles --- packages/zroadmap/files/qt2-fixes-r1.patch | 44 ++++++++++++++++++++++++ packages/zroadmap/zroadmap_cvs.bb | 55 ++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 packages/zroadmap/files/qt2-fixes-r1.patch create mode 100644 packages/zroadmap/zroadmap_cvs.bb diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch new file mode 100644 index 0000000000..a17fefe869 --- /dev/null +++ b/packages/zroadmap/files/qt2-fixes-r1.patch @@ -0,0 +1,44 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- src/qt/qt_main.cc~qt2-fixes.patch ++++ src/qt/qt_main.cc +@@ -136,7 +136,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -145,7 +145,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -11,14 +11,9 @@ + + # --- QT-specific options ------------------------------------------------ + +-CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3 +-CFLAGS += -fno-rtti -fno-exceptions +-LIBS += -L$(QTDIR)/lib -lqt-mt +- +- + ifeq ($(DESKTOP),QPE) +- CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ CFLAGS += -I$(QTDIR)/include -DQWS ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif + diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..23bd5d15e5 --- /dev/null +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection." +SECTION = "opie/applications" +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +MAINTAINER = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +DEPENDS = "popt" +LICENSE = "GPL" +PV = "1.0.12+cvs-${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ + file://qt2-fixes-r1.patch;pnum=1;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap/src" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' +PARALLEL_MAKE = "" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} -- cgit v1.2.3 From fab4f88c1807af93d74ee6d58a61660dc78993ee Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 00:18:39 +0000 Subject: zroadmap cvs patch fixlet --- packages/zroadmap/files/qt2-fixes-r1.patch | 20 ++++++-------------- packages/zroadmap/zroadmap_cvs.bb | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch index a17fefe869..24fe1c9bdb 100644 --- a/packages/zroadmap/files/qt2-fixes-r1.patch +++ b/packages/zroadmap/files/qt2-fixes-r1.patch @@ -3,9 +3,9 @@ # Signed off by Michael 'Mickey' Lauer # ---- src/qt/qt_main.cc~qt2-fixes.patch +--- src/qt/qt_main.cc~qt2-fixes-r1.patch +++ src/qt/qt_main.cc -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ switch (orientation[0]) { case 't': case 'T': break; @@ -14,7 +14,7 @@ case 'b': case 'B': moveDockWindow (toolBar, DockBottom); break; -@@ -145,7 +145,7 @@ +@@ -146,7 +146,7 @@ case 'r': case 'R': moveDockWindow (toolBar, DockRight); break; @@ -23,21 +23,13 @@ default: roadmap_log (ROADMAP_FATAL, "Invalid toolbar orientation %s", orientation); } ---- src/qt/Makefile~qt2-fixes.patch +--- src/qt/Makefile~qt2-fixes-r1.patch +++ src/qt/Makefile -@@ -11,14 +11,9 @@ +@@ -19,7 +19,7 @@ - # --- QT-specific options ------------------------------------------------ - --CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3 --CFLAGS += -fno-rtti -fno-exceptions --LIBS += -L$(QTDIR)/lib -lqt-mt -- -- ifeq ($(DESKTOP),QPE) -- CFLAGS += -I$(QTDIR)/include -DQWS + CFLAGS += -I$(QTDIR)/include -DQWS - LIBS += -lqte -lqpe -+ CFLAGS += -I$(QTDIR)/include -DQWS + LIBS += -lqpe INSTALLDIR=$(QTDIR) endif diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb index 23bd5d15e5..db44964bfd 100644 --- a/packages/zroadmap/zroadmap_cvs.bb +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -24,7 +24,7 @@ QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt QT_LIBRARY_append_c7x0 = " -laticore" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' PARALLEL_MAKE = "" -- cgit v1.2.3 From 8f263baffb8ac13d3dbe512c4a5436b193157acf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:52:22 +0000 Subject: zrev7 1.0.1 fix packaging .desktop file --- packages/qpe-games/zrev7_1.0.1.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb index 2f023c4264..5bf5f47eb6 100644 --- a/packages/qpe-games/zrev7_1.0.1.bb +++ b/packages/qpe-games/zrev7_1.0.1.bb @@ -1,22 +1,20 @@ DESCRIPTION = "Reversi" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "Team Opie " LICENSE = "GPL" AUTHOR = "Mario Weilguni" HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html" - +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \ file://zrev.patch;patch=1" - -PV = "1.0.1" S = "${WORKDIR}/zrev7_V${PV}" APPNAME = "zrev7" APPTYPE = "binary" +APPDESKTOP = "${S}" - +inherit opie do_compile_prepend() { oe_runmake -C images @@ -25,8 +23,4 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games } - - -inherit opie -- cgit v1.2.3 From 32dd9f8aee118b72a3754045254c54ebf8bcad2f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:53:57 +0000 Subject: gemdropx 0.9 fix linking --- packages/gemdropx/gemdropx_0.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb index a50fd6b567..4f96715b79 100644 --- a/packages/gemdropx/gemdropx_0.9.bb +++ b/packages/gemdropx/gemdropx_0.9.bb @@ -18,6 +18,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=qt \ LIBS+=-lSDL_mixer \ LIBS+=-lSDL_image \ LIBS+=-lpthread \ + LIBS+=-Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT} \ DEFINES+=DATA_PREFIX=\\"\"${datadir}/gemdropx/\\"\"" do_configure_prepend() { -- cgit v1.2.3 From 58c6116d47e95bb8ebbb88d68e5345fc8b9f9333 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:59:18 +0000 Subject: billiardz 0.1.4 add gcc4 patch TODO: decouple from opie, make useful also for pure SDL environments --- packages/billiardz/billiardz_0.1.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb index fcba6d2f30..c0477bd4fc 100644 --- a/packages/billiardz/billiardz_0.1.4.bb +++ b/packages/billiardz/billiardz_0.1.4.bb @@ -5,9 +5,10 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "libsdl-qpe libsdl-image" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz" +SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \ + file://gcc4.patch;patch=1" inherit palmtop -- cgit v1.2.3 From b155f8c5b12987c372c4e18ccd15e283a07e6980 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Jul 2006 14:06:25 +0000 Subject: opensimpad-kernel: set COMPATIBLE_MACHINE = 'simpad' --- packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb | 2 ++ packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index fd5d161cc1..40cf007174 100644 --- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -8,6 +8,8 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" PR = "r22" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index fff45f20e9..51fabecd75 100644 --- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -9,6 +9,8 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" USBV= "usb20040610" PR = "r4" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ -- cgit v1.2.3