From: Ross Burton <ross.burton@intel.com>
Date: Mon, 21 Oct 2013 09:28:49 +0000 (+0100)
Subject: gdk-pixbuf: use PACKAGECONFIG to control legacy X11 sub-library
X-Git-Tag: 2015-4~4820
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d75b659ca22991662c78e4e7913f75675acf7e66;p=openembedded-core.git

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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

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 08d6f0aedc..d027fcf4f7 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"