summaryrefslogtreecommitdiff
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2012-05-11 15:23:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-11 17:59:53 +0100
commit4cb21630cf87e6cc9a062f1c2be9fea25d3e218a (patch)
tree94bac2ee5aa6d989490f8455bb725fcb205eee5b /meta/recipes-gnome
parente79f19ef4fb59d6dc14ea139d4e4b132add80842 (diff)
downloadopenembedded-core-4cb21630cf87e6cc9a062f1c2be9fea25d3e218a.tar.gz
openembedded-core-4cb21630cf87e6cc9a062f1c2be9fea25d3e218a.tar.bz2
openembedded-core-4cb21630cf87e6cc9a062f1c2be9fea25d3e218a.tar.xz
openembedded-core-4cb21630cf87e6cc9a062f1c2be9fea25d3e218a.zip
gdk-pixbuf: Add --with-x11 when building lsb image
LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \ because of having "--without-x11" for gdk-pixbuf_2.24.1.bb. Use the linuxstdbase override and also make it conditional on x11 \ being in DISTRO_FEATURES for passing lsb test. Split libgdk_pixbuf_xlib to a single package. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index e31f71701..a88700b9d 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
-PR = "r0"
+PR = "r1"
inherit autotools pkgconfig gettext
@@ -28,9 +28,16 @@ LIBV = "2.10.0"
EXTRA_OECONF = "\
--without-libtiff \
--with-libpng \
- --without-x11 \
+ ${X11DEPENDS} \
--disable-introspection \
"
+X11DEPENDS = "--without-x11"
+X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
+
+PACKAGES =+ "${PN}-xlib"
+
+FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
+RPROVIDES_${PN}-xlib = "${PN}-xlib"
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${libdir}/lib*.so.*"