Skip to contentSkip to conversation

gdk-pixbuf: Add --with-x11 when building lsb image

PATCH In review Xiaofeng Yan 2 participants 4 messages Apr 27, 2012 – Apr 28, 2012

lore
Share & tools
lore

Xiaofeng Yan

author
#0 lore raw

cover gdk-pixbuf: Add --with-x11 when building lsb image

From: Xiaofeng Yan <[email protected]>

Hi Richard,

This is V2 for fixing bug 2284. I made some modification according to your suggestion. Please review it again.

The following was your suggestion:
We should be using the linuxstdbase override and also make it conditional on x11 being in DISTRO_FEATURES.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/2284
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2284

Thanks,
Xiaofeng Yan <[email protected]>
---

Xiaofeng Yan (1):
gdk-pixbuf: Add --with-x11 when building lsb image

 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
author
#1 lore raw

PATCH 1/1 gdk-pixbuf: Add --with-x11 when building lsb image

From: Xiaofeng Yan <[email protected]>

LSB Test Suite complain "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

[YOCTO #2284]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +3 -2
index e31f717..3000c79 100644
@@ -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,10 +28,11 @@ LIBV = "2.10.0"
 EXTRA_OECONF = "\
   --without-libtiff \
   --with-libpng \
-  --without-x11 \
   --disable-introspection \
 "
 
+EXTRA_OECONF_append_linuxstdbase = " ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
+
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${libdir}/lib*.so.*"
Signature · 1 line
1.7.0.4
#2 lore raw
Quoted 19 lines · Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

LSB Test Suite complain "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

[YOCTO #2284]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +0 -0
index e31f717..3000c79 100644

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ · line 24

Quoted 7 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +1 -1
@@ -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

Your patch will leave it enabled in the non-lsb case under many circumstances. How about something like:

@@ -28,10 +28,13 @@ 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)}" +
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${libdir}/lib*.so.*"

I'd also like to split the library into a separate package.

Cheers,

Richard

author
#3 lore raw
Quoted 46 lines · Richard Purdie
Quoted 19 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>

LSB Test Suite complain "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

[YOCTO #2284]

Signed-off-by Xiaofeng Yan<[email protected]>
---
  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +0 -0
index e31f717..3000c79 100644

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ · line 24

Quoted 7 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +1 -1
@@ -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

Your patch will leave it enabled in the non-lsb case under many circumstances. How about something like:

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +4 -1
@@ -28,10 +28,13 @@ 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)}"
+
  FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
  	${libdir}/lib*.so.*"
Quoted 1 line

I'd also like to split the library into a separate package.

got it, thanks for your suggestion.

Quoted 10 lines

Cheers,

Richard

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