diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-07 16:49:28 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:30:16 +0100 |
commit | f74faae1642bfae131c60db84eb91e75aa9bd2ce (patch) | |
tree | c13d9c3fb5ecbad423dc6fa42d452f3333fcc01f /meta-oe/recipes-navigation | |
parent | 2fe11200fb1976528864a3022fd6dece72709db0 (diff) | |
download | meta-openembedded-f74faae1642bfae131c60db84eb91e75aa9bd2ce.tar.gz |
navit: disable qt4 support by default
* now with qt4 moved to separate meta-qt4 we shouldn't enable it by default
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc index 26b91b3da..1c0bfdaae 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc | |||
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \ | |||
8 | SECTION = "x11/applications" | 8 | SECTION = "x11/applications" |
9 | DEPENDS = "glib-2.0 gd gypsy librsvg-native" | 9 | DEPENDS = "glib-2.0 gd gypsy librsvg-native" |
10 | RDEPENDS_${PN} = " ${PN}-icons ${PN}-config " | 10 | RDEPENDS_${PN} = " ${PN}-icons ${PN}-config " |
11 | RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg" | ||
12 | RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" | 11 | RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" |
13 | RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" | 12 | RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" |
14 | 13 | ||
@@ -20,12 +19,12 @@ PNBLACKLIST[navit] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 | |||
20 | 19 | ||
21 | inherit autotools gettext pkgconfig | 20 | inherit autotools gettext pkgconfig |
22 | 21 | ||
23 | PACKAGECONFIG ?= "qt" | 22 | PACKAGECONFIG ?= "" |
24 | PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi" | 23 | PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi" |
25 | PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" | 24 | PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" |
26 | PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl" | 25 | PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl" |
27 | PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+" | 26 | PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+" |
28 | PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free" | 27 | PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free,qt4-plugin-imageformat-svg" |
29 | 28 | ||
30 | EXTRA_OECONF += " \ | 29 | EXTRA_OECONF += " \ |
31 | --disable-binding-python \ | 30 | --disable-binding-python \ |