diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-10 16:01:25 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-12 08:38:30 +0200 |
| commit | 90d05545a7f984378cdb97325466166420b13a77 (patch) | |
| tree | 1444afe145fddbe4aaae4519b831090297d45763 /meta-oe/recipes-navigation | |
| parent | 601fd016266cb87b6f000f6dca347043a4e64488 (diff) | |
| download | meta-openembedded-contrib-90d05545a7f984378cdb97325466166420b13a77.tar.gz | |
navit: add PACKAGECONFIG for imlib2, qt, gtk, sdl
* fixes following issues from test-dependencies report:
navit/navit/latest lost dependency on fribidi
navit/navit-graphics-gtk/latest lost dependency on imlib2
navit/navit-graphics-sdl/latest lost dependency on eglibc freetype
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
| -rw-r--r-- | meta-oe/recipes-navigation/navit/navit.inc | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch | 16 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/navit/navit_svn.bb | 1 |
3 files changed, 25 insertions, 3 deletions
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc index 8b63bba9b9..eb8f43a5a2 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \ " SECTION = "x11/applications" -DEPENDS = "glib-2.0 gtk+ qt4-x11-free gd gypsy librsvg-native" +DEPENDS = "glib-2.0 gd gypsy librsvg-native" RDEPENDS_${PN} = " ${PN}-icons ${PN}-config " RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg" RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" @@ -17,12 +17,17 @@ INC_PR = "r11" inherit autotools gettext +PACKAGECONFIG ?= "qt" +PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi" +PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" +PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl" +PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+" +PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free" + EXTRA_OECONF += " \ --disable-binding-python \ --disable-samplemap \ --enable-avoid-unaligned \ - --enable-graphics-qt-qpainter \ - --enable-gui-qml \ --enable-svg2png-scaling-flag=32 \ --disable-speech-speech-dispatcher \ --enable-cache-size=20971520 \ diff --git a/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch b/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch new file mode 100644 index 0000000000..be41792617 --- /dev/null +++ b/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch @@ -0,0 +1,16 @@ +--- a/configure.in.orig 2014-05-10 15:57:18.146362110 +0200 ++++ b/configure.in 2014-05-10 15:59:27.859358845 +0200 +@@ -498,10 +498,13 @@ + AC_SUBST(FRIBIDI_CFLAGS) + AC_SUBST(FRIBIDI_LIBS) + ++AC_ARG_ENABLE(imlib2, [ --disable-imlib2 disable imlib2 support], imlib2=$enableval;imlib2_reason="configure parameter", imlib2=yes) ++if test x"${imlib2}" = "xyes"; then + PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no]) + if test "x$imlib2_pkgconfig" = "xyes"; then + AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2]) + fi ++fi + AC_SUBST(IMLIB2_CFLAGS) + AC_SUBST(IMLIB2_LIBS) + diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb index 2661507db1..eff1eb32f2 100644 --- a/meta-oe/recipes-navigation/navit/navit_svn.bb +++ b/meta-oe/recipes-navigation/navit/navit_svn.bb @@ -7,4 +7,5 @@ PR = "${INC_PR}.3" S = "${WORKDIR}/${PN}" SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ file://freetype-include-path.patch \ + file://configure.add.imlib2.option.patch \ " |