Patchwork [2/2] gdk-pixbuf: Add --with-x11 when building lsb image

login
register
mail settings
Submitter Xiaofeng Yan
Date May 11, 2012, 7:23 a.m.
Message ID <7e9ada8b4a3af9425d343f37de63536abd7de711.1336719792.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/27459/
State Accepted
Commit 4cb21630cf87e6cc9a062f1c2be9fea25d3e218a
Headers show

Comments

Xiaofeng Yan - May 11, 2012, 7:23 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
Saul Wold - May 12, 2012, 5:41 a.m.
On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> 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>
> ---
>   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.*"
Richard Purdie - May 12, 2012, 9:58 a.m.
On Fri, 2012-05-11 at 22:41 -0700, Saul Wold wrote:
> On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
> > From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> >
> > 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>
> > ---
> >   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

This is a bug in package.bbclass:

From 2006:
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/package.bbclass?id=2af3b213e554d34d7f17e41cd9f5abfe842f6a08
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/package.bbclass?id=77597031696448e691831ddca735c8fd096788f5

So 6 years ago I put a bandaid on this. That code is simply nuts and I
think its time to remove/rework it. We could change it to use ${PN} I
guess which would be more likely to work and I can't see it breaking too
much...

Cheers,

Richard
Mark Hatle - May 14, 2012, 3:12 p.m.
On 5/12/12 12:41 AM, Saul Wold wrote:
> On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> 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>
>> ---
>>    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

BTW I agree, there is nothing linuxstdbase specific about this check.  We have a 
distro policy w/ x11, then we should enabled this in gdk-pixbuf.  (The rest of 
the bug it looks like Richard has already worked on.)

--Mark

> 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
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

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