[oe-commits] org.oe.dev gpsdrive: fix pre4 dependency issues, clean up all versions, unify

xjqian commit oe at amethyst.openembedded.net
Mon Mar 17 08:56:03 UTC 2008 

gpsdrive: fix pre4 dependency issues, clean up all versions, unify
* bump pre4 to be the default version
* TODO: pre4: remove mysql dependency and better packaging

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 7162a5265c021e64719e192cd7c05b8f562d6001
ViewMTN: http://monotone.openembedded.org/revision/info/7162a5265c021e64719e192cd7c05b8f562d6001
Files:
1
packages/gpsdrive/gpsdrive_2.10pre3.bb
packages/gpsdrive/gpsdrive_cvs.bb
packages/gpsdrive/gpsdrive.inc
packages/gpsdrive/files/gpsdrive.desktop
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre4.bb
Diffs:

#
# mt diff -rb7bf0016f42503605382df1fb30e05c67e45930a -r7162a5265c021e64719e192cd7c05b8f562d6001
#
#
#
# delete "packages/gpsdrive/gpsdrive_2.10pre3.bb"
# 
# delete "packages/gpsdrive/gpsdrive_cvs.bb"
# 
# add_file "packages/gpsdrive/gpsdrive.inc"
#  content [5f8c0acff5d8cf63f4811596ed94872a5194ae27]
# 
# patch "packages/gpsdrive/files/gpsdrive.desktop"
#  from [3ed787c2d437f213fb2d28b7fe9bcc9feac2cfa7]
#    to [3abd06e7721592808a5ecab632fd527bf57b2d29]
# 
# patch "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#  from [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
#    to [cddc5f1f7eb5adf78aaad3610fccaddcf0616dfc]
# 
# patch "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
#  from [29c061374aefcc591a87829d659fc50cdc3acefa]
#    to [059b9eb48f476a17434ac0532e14eca6bb1b8ae2]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
#  from [29a714e888f2ef1c714628caa9619d49cfc6609b]
#    to [45654d0e7c03d8edde1c51eec731eee66b9e2ca3]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  from [8019316f995c6928f922a1b2412b7393fe8599f3]
#    to [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#
============================================================
--- packages/gpsdrive/gpsdrive.inc	5f8c0acff5d8cf63f4811596ed94872a5194ae27
+++ packages/gpsdrive/gpsdrive.inc	5f8c0acff5d8cf63f4811596ed94872a5194ae27
@@ -0,0 +1,25 @@
+DESCRIPTION = "GPS navigation/map display software"
+HOMEPAGE = "http://www.gpsdrive.de/"
+AUTHOR = ""Fritz Ganter gpsdrive at warbase.selwerd.nl"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" 
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_install_append() {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/*.desktop ${D}${datadir}/applications/gpsdrive.desktop
+
+        # gpsd is provided by RDEPENDS
+        if test -e ${D}${bindir}/gpsd
+        then
+                rm ${D}${bindir}/gpsd
+        fi
+}
============================================================
--- packages/gpsdrive/files/gpsdrive.desktop	3ed787c2d437f213fb2d28b7fe9bcc9feac2cfa7
+++ packages/gpsdrive/files/gpsdrive.desktop	3abd06e7721592808a5ecab632fd527bf57b2d29
@@ -2,8 +2,8 @@ Exec=gpsdrive -p -1
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -p -1
-Terminal=0
+Terminal=false
 Type=Application
+Icon=gpsicon
+Categories=Graphics;Network;Geography;
+StartupNotify=false
-Icon=gpsicon.png
-Categories=Application;Other
-StartupNotify=False
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop	6ef8f7d5db97dd3541a0bfe44325bd07296baf1b
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop	cddc5f1f7eb5adf78aaad3610fccaddcf0616dfc
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -M pda -1
-Icon=gpsicon
 Terminal=false
 Type=Application
+Icon=gpsicon
+Categories=Graphics;Network;Geography;
+StartupNotify=false
-Categories=Graphics;Network;Geography;Application;Other
-StartupNotify=true
============================================================
--- packages/gpsdrive/gpsdrive-pda_2.10pre2.bb	29c061374aefcc591a87829d659fc50cdc3acefa
+++ packages/gpsdrive/gpsdrive-pda_2.10pre2.bb	059b9eb48f476a17434ac0532e14eca6bb1b8ae2
@@ -1,34 +1,29 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
 
-PR = "r1"
+PR = "r2"
+
 DESCRIPTION = "GPS navigation/map display software, PDA-optimized version"
 HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
-inherit pkgconfig
-
 SRC_URI = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/gpsdrive-2.10pre2-ipaq-r4.tar.gz \
+           file://gpsdrive.desktop \
 	   file://makefile.patch;patch=1 "
 
 S = "${WORKDIR}/gpsdrive-2.10pre2-ipaq"
 
-FILES_${PN} = "${bindir}/gpsdrive ${datadir}/gpsdrive ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-do_compile () {
+do_compile() {
 	oe_runmake "CC=${CC}" "LD=${CC}" "STRIP=${STRIP}" all
 }
 
-do_install () {
+do_install() {
 	mkdir -p ${D}${datadir}
         cp -a ipkg-data/usr/share/*  ${D}${datadir}/
         cp -a README.iPAQ.txt ${D}${datadir}/gpsdrive
         cp -a COPYING  ${D}${datadir}/gpsdrive
         cp -a original-docs  ${D}${datadir}/gpsdrive
+
 	mkdir -p ${D}${bindir}
         install -m 0755 gpsdrive ${D}${bindir}/
 }
+
+FILES_${PN} += "${datadir}/gpsdrive"
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre2.bb	29a714e888f2ef1c714628caa9619d49cfc6609b
+++ packages/gpsdrive/gpsdrive_2.10pre2.bb	45654d0e7c03d8edde1c51eec731eee66b9e2ca3
@@ -1,27 +1,6 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
 
-PR = "r1"
-PACKAGES += "gpsdrive-add"
-DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive.desktop"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-FILES_gpsdrive-add = "${libdir}"
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
-}
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	8019316f995c6928f922a1b2412b7393fe8599f3
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
@@ -1,21 +1,16 @@
-DESCRIPTION = "GPS navigation/map display software"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
-PR = "r1"
+require gpsdrive.inc
 
+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
+
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
            file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
            file://gpsdrive-ifdef-mapnik.patch;patch=1 \
            file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-garmin"
-
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
@@ -36,7 +31,3 @@ FILES_${PN}-doc = "${datadir}/man ${data
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "1"

More information about the Openembedded-commits mailing list