[oe-commits] Ross Burton : gdk-pixbuf: use PACKAGECONFIG to control legacy X11 sub-library
git at git.openembedded.org
git at git.openembedded.org
Sun Oct 27 11:27:45 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: d75b659ca22991662c78e4e7913f75675acf7e66
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d75b659ca22991662c78e4e7913f75675acf7e66
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Oct 21 10:28:49 2013 +0100
gdk-pixbuf: use PACKAGECONFIG to control legacy X11 sub-library
Instead of appending and using overrides, turn gdk-pixbuf-xlib into a
PACKAGECONFIG option and enable it for LSB-builds only.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
index 08d6f0a..d027fcf 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
@@ -26,15 +26,18 @@ inherit autotools pkgconfig gettext pixbufcache
LIBV = "2.10.0"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG_class-native = ""
+PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
+
EXTRA_OECONF = "\
- --without-libtiff \
--with-libpng \
- ${X11DEPENDS} \
+ --with-libjpeg \
+ --without-libtiff \
+ --without-libjasper \
--disable-introspection \
"
-X11DEPENDS = "--without-x11"
-X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
-X11DEPENDS_class-native = "--without-x11"
PACKAGES =+ "${PN}-xlib"
More information about the Openembedded-commits
mailing list