On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
From: Xiaofeng Yan<[email protected]>

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<[email protected]>
---
  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   11 +++++++++--
  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 e31f717..a88700b 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)}"
+
I hate to ask this after this has already been merged, but should this really have been more generic or do other packages need to be fixed since we are seeing failures in the non-LSB case of this new -xlib package being depended on.

|       gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-png-2.24.1-r1.armv5te
|       gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-jpeg-2.24.1-r1.armv5te
|       gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-xpm-2.24.1-r1.armv5te
|       gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-gif-2.24.1-r1.armv5te

Sau!

+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.*"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to