summaryrefslogtreecommitdiffstats
path: root/meta
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 18:00:27 +0100
commit31122b03bf64cf14386251eada8e090a50137576 (patch)
treea029d6e959fe6838e5e77cd147807b7c7978ba9a /meta
parentf7555827928aa699bdbd43fa6c042b7b897f4cd9 (diff)
downloadpoky-31122b03bf64cf14386251eada8e090a50137576.tar.gz
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. (From OE-Core rev: 4cb21630cf87e6cc9a062f1c2be9fea25d3e218a) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 e31f71701a..a88700b9d0 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-${
19SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" 19SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
20SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" 20SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
21 21
22PR = "r0" 22PR = "r1"
23 23
24inherit autotools pkgconfig gettext 24inherit autotools pkgconfig gettext
25 25
@@ -28,9 +28,16 @@ LIBV = "2.10.0"
28EXTRA_OECONF = "\ 28EXTRA_OECONF = "\
29 --without-libtiff \ 29 --without-libtiff \
30 --with-libpng \ 30 --with-libpng \
31 --without-x11 \ 31 ${X11DEPENDS} \
32 --disable-introspection \ 32 --disable-introspection \
33" 33"
34X11DEPENDS = "--without-x11"
35X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
36
37PACKAGES =+ "${PN}-xlib"
38
39FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
40RPROVIDES_${PN}-xlib = "${PN}-xlib"
34 41
35FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 42FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
36 ${libdir}/lib*.so.*" 43 ${libdir}/lib*.so.*"