[oe-commits] Martin Jansa : navit: move packaging from svn version to .inc file, add qt-painter package, enable qt
git version control
git at git.openembedded.org
Mon Jun 14 12:58:07 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 68641750dd76a0e7142103b9af7681c9555f1443
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=68641750dd76a0e7142103b9af7681c9555f1443
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Thu Jun 10 00:40:59 2010 +0200
navit: move packaging from svn version to .inc file, add qt-painter package, enable qt
* for qml you need qt-4.7.0-beta1 or newer
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
recipes/navit/navit.inc | 76 ++++++++++++++++++++++++++++++++++++++------
recipes/navit/navit_svn.bb | 72 +----------------------------------------
2 files changed, 68 insertions(+), 80 deletions(-)
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 49e8ee6..0eb805b 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -1,20 +1,27 @@
DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPL"
SECTION = "x11/applications"
-DEPENDS = "glib-2.0 gtk+"
-RRECOMMENDS_${PN} = "gpsd speechd flite"
+DEPENDS = "glib-2.0 gtk+ qt4-x11-free"
+DEPENDS_shr += " gd gypsy librsvg-native"
+RDEPENDS_${PN} = " navit-icons ${PN}-config "
+RDEPENDS_append_shr = " fsoraw"
+RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk"
+RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
PE = "1"
-INC_PR = "r6"
+INC_PR = "r7"
inherit autotools
EXTRA_OECONF = " \
--disable-binding-python \
- --disable-gui-sdl \
--disable-samplemap \
--enable-avoid-unaligned \
- --disable-graphics-qt-qpainter \
+ --enable-graphics-qt-qpainter \
+ --enable-gui-qml \
+ --enable-svg2png-scaling-flag=32 \
+ --disable-speech-speech-dispatcher \
+ --enable-cache-size=20971520 \
"
# --enable-avoid-float \
@@ -22,15 +29,50 @@ EXTRA_OECONF = " \
require navit-fpu.inc
EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}"
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk ${PN}-graphics-qt"
+
+EXTRA_AUTORECONF = " -I m4"
+
+CONFFILES_${PN}-config += "${datadir}/navit/navit.default.xml \
+ ${datadir}/navit/navit.xml \
+ ${datadir}/navit/maps.xml \
+ ${datadir}/navit/osd.xml \
+ ${datadir}/navit/speech.xml \
+ ${datadir}/navit/plugins.xml \
+ "
+
+SRC_URI += "file://navit.xml \
+ file://maps.xml \
+ file://osd.xml \
+ file://speech.xml \
+ file://plugins.xml \
+ file://navit.desktop \
+ file://navit.png \
+ "
+
+#Second launcher for shr
+SRC_URI_append_shr = "file://navitD.desktop \
+ file://navitD.png \
+ "
FILES_${PN} += "${libdir}/${PN}/*/*.so"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-maptool = " ${bindir}/maptool "
+FILES_${PN}-config = " ${datadir}/navit/*.xml "
+FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so "
+FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so "
+FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so "
+FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so "
+FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
+FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
+FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
+FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so "
+FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
-SRC_URI_append = " \
- file://navit.desktop \
- file://navit.png \
- "
+do_configure_prepend() {
+ #Remove xpm building, replaced by icons in own package
+ sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
+}
do_install_append() {
install -d ${D}${datadir}/applications/
@@ -39,4 +81,18 @@ do_install_append() {
install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
rm ${D}${libdir}/${PN}/*/*.la
+
+ #Use split config
+ mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml
+ install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml
+ install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml
+ install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml
+ install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml
+ install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml
+}
+
+do_install_append_shr() {
+ #Install second launcher for shr
+ install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/
}
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 2b75c4e..1d01a8c 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,76 +1,8 @@
require navit.inc
-SRCREV = "3349"
+SRCREV = "3358"
PV = "0.1.99+svnr${SRCPV}"
PR = "${INC_PR}.8"
S = "${WORKDIR}/navit"
-
-# override navit.inc RRECOMMENDS, we only suggest a text2speech app
-RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk"
-RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-maptool"
-
-DEPENDS_shr += " gd librsvg-native"
-RDEPENDS_${PN} = " navit-icons ${PN}-config "
-DEPENDS_append_shr = " gypsy"
-RDEPENDS_append_shr = " fsoraw"
-
-EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
-
-SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
-
-EXTRA_AUTORECONF = " -I m4"
-
-CONFFILES_${PN}-config += "${datadir}/navit/navit.default.xml \
- ${datadir}/navit/navit.xml \
- ${datadir}/navit/maps.xml \
- ${datadir}/navit/osd.xml \
- ${datadir}/navit/speech.xml \
- ${datadir}/navit/plugins.xml \
- "
-
-SRC_URI += "file://navit.xml \
- file://maps.xml \
- file://osd.xml \
- file://speech.xml \
- file://plugins.xml \
- "
-
-PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk"
-
-FILES_${PN}-maptool = " ${bindir}/maptool "
-FILES_${PN}-config = " ${datadir}/navit/*.xml "
-FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so "
-FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so "
-FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so "
-FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so "
-FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
-FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
-FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
-FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
-
-#Second launcher for shr
-SRC_URI_append_shr = "file://navitD.desktop \
- file://navitD.png \
- "
-
-do_configure_prepend() {
- #Remove xpm building, replaced by icons in own package
- sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
-}
-
-do_install_append() {
- #Use split config
- mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml
- install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml
- install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml
- install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml
- install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml
- install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml
-}
-
-do_install_append_shr() {
- #Install second launcher for shr
- install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/
- install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/
-}
+SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https "
More information about the Openembedded-commits
mailing list