diff options
-rw-r--r-- | packages/agg/agg_2.5.bb | 11 | ||||
-rw-r--r-- | packages/roadmap/files/options.mk.patch | 34 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch | 11 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2.inc | 24 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2_1.0.12.bb | 44 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2_1.1.0.bb | 43 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2_cvs.bb | 41 | ||||
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch | 25 | ||||
-rw-r--r-- | packages/roadmap/zroadmap_1.0.12.bb | 38 |
11 files changed, 73 insertions, 198 deletions
diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb index a3cf4b9557..ba76a7b4c6 100644 --- a/packages/agg/agg_2.5.bb +++ b/packages/agg/agg_2.5.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "AGG License" DEPENDS = "virtual/libx11 virtual/libsdl freetype" -PR = "r0" +PR = "r1" SRC_URI = "http://www.antigrain.com/${P}.tar.gz" S = "${WORKDIR}/${P}" @@ -32,6 +32,12 @@ do_stage() { oe_libinstall -a -so libaggplatformsdl ${STAGING_LIBDIR} install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/ install -d ${STAGING_INCDIR}/agg2 + + for f in font_freetype font_win32_tt gpc + do + install -m 0644 ${S}/$f/*.h ${STAGING_INCDIR}/agg2/ + done + cd include headers=`find . -name "*.h"` for f in $headers @@ -39,6 +45,3 @@ do_stage() { install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f done } - - - diff --git a/packages/roadmap/files/options.mk.patch b/packages/roadmap/files/options.mk.patch new file mode 100644 index 0000000000..196f16e31d --- /dev/null +++ b/packages/roadmap/files/options.mk.patch @@ -0,0 +1,34 @@ +--- roadmap-1.1.0/src/options.mk.old 2008-01-09 22:08:00.000000000 -0600 ++++ roadmap-1.1.0/src/options.mk 2008-01-09 23:06:29.000000000 -0600 +@@ -177,10 +177,7 @@ ifeq ($(strip $(AGG)),NO) + else + LIBS += -laggfontfreetype -lagg -lfreetype + CFLAGS += -DAGG_PIXFMT=pixfmt_$(AGG) \ +- -I$(TOP)/agg_support \ +- -I/usr/include/agg2 \ +- -I/usr/local/include/agg2 \ +- -I/usr/include/freetype2 ++ -I$(TOP)/agg_support + CANVAS_OBJS = roadmap_canvas_agg.o \ + $(TOP)/agg_support/roadmap_canvas.o + endif +@@ -188,7 +185,7 @@ endif + # bidirectional text lib + ifneq ($(strip $(BIDI)),NO) + LIBS += -lfribidi +- CFLAGS += -DUSE_FRIBIDI -I/usr/include/fribidi ++ CFLAGS += -DUSE_FRIBIDI + endif + + # RoadMap internal profiling +@@ -205,8 +202,8 @@ else + endif + + +-CFLAGS += -I$(TOP) -I/usr/local/include -DNDEBUG ++CFLAGS += -I$(TOP) -DNDEBUG + +-LIBS := -L/usr/local/lib $(LIBS) -lm ++LIBS := $(LIBS) -lm + + CXXFLAGS = $(CFLAGS) diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty +++ /dev/null diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch deleted file mode 100644 index 8f79b5503f..0000000000 --- a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600 -+++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600 -@@ -1,6 +1,7 @@ - [Desktop Entry] - Comment=RoadMap - Exec=roadgps --Icon=zroadgps -+Icon=roadgps - Type=Application - Name=RoadMapGPS -+Categories=Graphics;Viewer;GTK; diff --git a/packages/roadmap/roadmap-gtk2.inc b/packages/roadmap/roadmap-gtk2.inc new file mode 100644 index 0000000000..f64ad8dbfa --- /dev/null +++ b/packages/roadmap/roadmap-gtk2.inc @@ -0,0 +1,24 @@ +require roadmap.inc + +SECTION = "x11/applications" + +DEPENDS = "agg expat gtk+" + +EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \ + POPT=NO SCRIPTS= BUILD= \ + INSTALLDIR=/usr DESTDIR=${D}" + +CFLAGS += " -I${STAGING_INCDIR}/agg2 " + +do_compile() { + oe_runmake runtime $(TOOLS) icons +} + +do_install() { + oe_runmake install + mv ${D}/usr/applications ${D}/usr/share/ + + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap-gtk2_1.0.12.bb b/packages/roadmap/roadmap-gtk2_1.0.12.bb deleted file mode 100644 index e2ce5f2316..0000000000 --- a/packages/roadmap/roadmap-gtk2_1.0.12.bb +++ /dev/null @@ -1,44 +0,0 @@ -require roadmap.inc - -DEPENDS = "gtk+" -PR = "r0" - -SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ - file://roadmap.desktop.patch;patch=1 \ - file://roadgps.desktop.patch;patch=1 \ - http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ - file://zroadgps.png " - -S = "${WORKDIR}/roadmap-${PV}/src" - -DESKTOP = "GTK2" -CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ - -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a - cd gtk2 && oe_runmake -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${datadir}/applications - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/roadmap - - install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap - install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps - - install -m 0644 icons/*png ${D}${datadir}/pixmaps/ - install -m 0644 roadmap.png ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png - - install -m 0644 roadmap.desktop ${D}${datadir}/applications/ - install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop - - install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - -FILES_${PN} += "${datadir}/roadmap" - diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb index f638cf1fdd..5855413cbe 100644 --- a/packages/roadmap/roadmap-gtk2_1.1.0.bb +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -1,46 +1,11 @@ -require roadmap.inc +require roadmap-gtk2.inc -DEPENDS = "agg expat gtk+" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ + file://options.mk.patch;patch=1;pnum=2 \ file://roadmap.desktop.patch;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " S = "${WORKDIR}/roadmap-${PV}/src" - -DESKTOP = "GTK2" -POPT = "NO" -AGG = "rgba32" -CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ - -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " - -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 gtk2 gtkroadmap gtkroadgps -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${datadir}/applications - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/roadmap - - install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap - install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps - - install -m 0644 icons/*png ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png - - install -m 0644 roadmap.desktop ${D}${datadir}/applications/ - - install -m 0644 sprites preferences ${D}${datadir}/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - -FILES_${PN} += "${datadir}/roadmap" - diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 2ece0de929..2efa67821a 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,45 +1,12 @@ -require roadmap.inc +require roadmap-gtk2.inc -DEPENDS = "agg expat gtk+" -PV = "1.1.0+cvs${SRCDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" + file://options.mk.patch;patch=1;pnum=2 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " S = "${WORKDIR}/roadmap/src" -DESKTOP = "GTK2" -AGG = "rgba32" -CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ - -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " - -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 gtk2 gtkroadmap gtkroadgps -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${datadir}/applications - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/roadmap - - install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap - install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps - - install -m 0644 icons/*png ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png - - install -m 0644 roadmap.desktop ${D}${datadir}/applications/ - - install -m 0644 sprites preferences ${D}${datadir}/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - -FILES_${PN} += "${datadir}/roadmap" - diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty +++ /dev/null diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch deleted file mode 100644 index 46b17b8cfb..0000000000 --- a/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes -+++ roadmap-1.0.12/src/qt/qt_main.cc -@@ -123,7 +123,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -132,7 +132,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb deleted file mode 100644 index c7fc851d0d..0000000000 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ /dev/null @@ -1,38 +0,0 @@ -require zroadmap.inc - -PR = "r1" - -SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ - file://qt2-fixes.patch;pnum=2;patch=1 \ - http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ - file://zroadgps.png" - -S = "${WORKDIR}/roadmap-${PV}/src" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ - GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a - cd qt && oe_runmake -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/share/roadmap - - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - - install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ - 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/Applications/ - - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} |