[oe-commits] org.oe.dev roadmap: fix roadmap-gtk2, drop 1.0.12.
xjqian commit
openembedded-commits at lists.openembedded.org
Thu Jan 10 09:22:12 UTC 2008
roadmap: fix roadmap-gtk2, drop 1.0.12.
* fix roadmap-gtk2 build and packaging (use Makefile supplied by upstream)
* fix building gtk2 with agg support Courtesy of Joshua
* drop 1.0.12: old (2002 map), not upwards compatible, buggy, messy to patch,
* not working originally and nobody uses it anyway.
* TODO: fix packaging of zroadmap (same as above), further unification of recipies
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: b40ff574864609e2e568aaadd2819286b3608596
ViewMTN: http://monotone.openembedded.org/revision/info/b40ff574864609e2e568aaadd2819286b3608596
Files:
1
packages/roadmap/roadmap-gtk2-1.0.12
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/roadmap/zroadmap-1.0.12
packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/files/options.mk.patch
packages/roadmap/roadmap-gtk2.inc
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
Diffs:
#
# mt diff -r186f1df730ce7f786b9928b76f4ecfd1a5f6c717 -rb40ff574864609e2e568aaadd2819286b3608596
#
#
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12"
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
#
# delete "packages/roadmap/roadmap-gtk2_1.0.12.bb"
#
# delete "packages/roadmap/zroadmap-1.0.12"
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch"
#
# delete "packages/roadmap/zroadmap_1.0.12.bb"
#
# add_file "packages/roadmap/files/options.mk.patch"
# content [400094f1965f7aa3f864a63465d0fbe56e3ca672]
#
# add_file "packages/roadmap/roadmap-gtk2.inc"
# content [fc58e3e70037346d52758067318eda8023e6b2be]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
# to [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [511a10a8453ed27a0df812a48cdcba14f90788e9]
# to [2790f799a13355e4ee5e15d33a9b0c737fde2269]
#
============================================================
--- packages/roadmap/files/options.mk.patch 400094f1965f7aa3f864a63465d0fbe56e3ca672
+++ packages/roadmap/files/options.mk.patch 400094f1965f7aa3f864a63465d0fbe56e3ca672
@@ -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)
============================================================
--- packages/roadmap/roadmap-gtk2.inc fc58e3e70037346d52758067318eda8023e6b2be
+++ packages/roadmap/roadmap-gtk2.inc fc58e3e70037346d52758067318eda8023e6b2be
@@ -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"
============================================================
--- packages/roadmap/roadmap-gtk2_1.1.0.bb 2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d
+++ packages/roadmap/roadmap-gtk2_1.1.0.bb bf65c63e6c550a015ebf7d3afe59f77c139cc5f3
@@ -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"
-
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
+++ packages/roadmap/roadmap-gtk2_cvs.bb 2790f799a13355e4ee5e15d33a9b0c737fde2269
@@ -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"
-
More information about the Openembedded-commits
mailing list