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

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

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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 <xiaofeng.yan@windriver.com>
---


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(-)

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

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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 <xiaofeng.yan@windriver.com>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
 1 files changed, 3 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..3000c79 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,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.*"
 
-- 
1.7.0.4

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

[Richard Purdie]

On Fri, 2012-04-27 at 16:39 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> 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 <xiaofeng.yan@windriver.com>
> ---
>  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
>  1 files changed, 3 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..3000c79 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

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

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

[Xiaofeng Yan]

On 2012年04月27日 18:58, Richard Purdie wrote:
> On Fri, 2012-04-27 at 16:39 +0800, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> 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<xiaofeng.yan@windriver.com>
>> ---
>>   meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    5 +++--
>>   1 files changed, 3 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..3000c79 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
> 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.
got it, thanks for your suggestion.
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

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

[Xiaofeng Yan]

On 2012年04月24日 15:29, Richard Purdie wrote:
> On Tue, 2012-04-24 at 08:29 +0200, Koen Kooi wrote:
>> Op 24 apr. 2012, om 08:12 heeft Xiaofeng Yan het volgende geschreven:
>>
>>> On 2012年04月24日 13:53, Koen Kooi wrote:
>>>> Op 24 apr. 2012, om 07:50 heeft Xiaofeng Yan het volgende geschreven:
>>>>
>>>>
>>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>>
>>>>>
>>>>> 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.
>>>>> For passing lsb test I add PACKAGECONFIG support to the recipe and \
>>>>> have poky-lsb turn on the poky-lsb distro for this recipe.
>>>>>
>>>>> [YOCTO #2284]
>>>>>
>>>> Shouldn't this be an 'x11' DISTRO_FEATURE instead?
>>>>
>>> because "--without-x11" is disabled when x11 exists in core-image-sato. Using 'x11' DISTRO_FEATURE instead will change the default set, which will cause enable "--with-x11" when x11 is in DISTRO_FEATURE. LSB Test Suite need this configuration but other image may not need it even if having x11.
>> What use-case is there for having 'x11' in DISTRO_FEATURES but not wanting x11 support in pixbuf?
>>
>> Regardless of that, poky-lsb distro overrides have no place in oe-core, they should go into their own layer as bbappends.
> We should be using the linuxstdbase override and also make it
> conditional on x11 being in DISTRO_FEATURES.
You mean I should use the following methods in gdk-pixbuf_2.24.1.bb
EXTRA_OECONF_append_linuxstdbase = " ${@base_contains('DISTRO_FEATURES', 
'x11', '--with-x11', '--without-x11', d)}"

The above variable should be putted into gdk-pixbuf_2.24.1.bb because 
poky-lsb.conf is parsed before this bb file.
right ??
> As far as I can tell nothing uses/cares about this library apart from
> lsb right now. If that changes I'm happy to build more of the time but
> until we need it, its pointless. We should also split it into a separate
> package.
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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

[Richard Purdie]

On Tue, 2012-04-24 at 08:29 +0200, Koen Kooi wrote:
> Op 24 apr. 2012, om 08:12 heeft Xiaofeng Yan het volgende geschreven:
> 
> > On 2012年04月24日 13:53, Koen Kooi wrote:
> >> Op 24 apr. 2012, om 07:50 heeft Xiaofeng Yan het volgende geschreven:
> >> 
> >> 
> >>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> >>> 
> >>> 
> >>> 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.
> >>> For passing lsb test I add PACKAGECONFIG support to the recipe and \
> >>> have poky-lsb turn on the poky-lsb distro for this recipe.
> >>> 
> >>> [YOCTO #2284]
> >>> 
> >> Shouldn't this be an 'x11' DISTRO_FEATURE instead?
> >> 
> > because "--without-x11" is disabled when x11 exists in core-image-sato. Using 'x11' DISTRO_FEATURE instead will change the default set, which will cause enable "--with-x11" when x11 is in DISTRO_FEATURE. LSB Test Suite need this configuration but other image may not need it even if having x11.
> 
> What use-case is there for having 'x11' in DISTRO_FEATURES but not wanting x11 support in pixbuf?
> 
> Regardless of that, poky-lsb distro overrides have no place in oe-core, they should go into their own layer as bbappends.

We should be using the linuxstdbase override and also make it
conditional on x11 being in DISTRO_FEATURES.

As far as I can tell nothing uses/cares about this library apart from
lsb right now. If that changes I'm happy to build more of the time but
until we need it, its pointless. We should also split it into a separate
package.

Cheers,

Richard

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

[Koen Kooi]

Op 24 apr. 2012, om 08:12 heeft Xiaofeng Yan het volgende geschreven:

> On 2012年04月24日 13:53, Koen Kooi wrote:
>> Op 24 apr. 2012, om 07:50 heeft Xiaofeng Yan het volgende geschreven:
>> 
>> 
>>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>>> 
>>> 
>>> 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.
>>> For passing lsb test I add PACKAGECONFIG support to the recipe and \
>>> have poky-lsb turn on the poky-lsb distro for this recipe.
>>> 
>>> [YOCTO #2284]
>>> 
>> Shouldn't this be an 'x11' DISTRO_FEATURE instead?
>> 
> because "--without-x11" is disabled when x11 exists in core-image-sato. Using 'x11' DISTRO_FEATURE instead will change the default set, which will cause enable "--with-x11" when x11 is in DISTRO_FEATURE. LSB Test Suite need this configuration but other image may not need it even if having x11.

What use-case is there for having 'x11' in DISTRO_FEATURES but not wanting x11 support in pixbuf?

Regardless of that, poky-lsb distro overrides have no place in oe-core, they should go into their own layer as bbappends.

regards,

Koen

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

[Xiaofeng Yan]

[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]

On 2012?04?24? 13:53, Koen Kooi wrote:
> Op 24 apr. 2012, om 07:50 heeft Xiaofeng Yan het volgende geschreven:
>
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> 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.
>> For passing lsb test I add PACKAGECONFIG support to the recipe and \
>> have poky-lsb turn on the poky-lsb distro for this recipe.
>>
>> [YOCTO #2284]
> Shouldn't this be an 'x11' DISTRO_FEATURE instead?
because "--without-x11" is disabled when x11 exists in core-image-sato. 
Using 'x11' DISTRO_FEATURE instead will change the default set, which 
will cause enable "--with-x11" when x11 is in DISTRO_FEATURE. LSB Test 
Suite need this configuration but other image may not need it even if 
having x11.

>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>


[-- Attachment #2: Type: text/html, Size: 2525 bytes --]

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

[Koen Kooi]

Op 24 apr. 2012, om 07:50 heeft Xiaofeng Yan het volgende geschreven:

> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> 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.
> For passing lsb test I add PACKAGECONFIG support to the recipe and \
> have poky-lsb turn on the poky-lsb distro for this recipe.
> 
> [YOCTO #2284]

Shouldn't this be an 'x11' DISTRO_FEATURE instead?

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

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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.
For passing lsb test I add PACKAGECONFIG support to the recipe and \
have poky-lsb turn on the poky-lsb distro for this recipe.

[YOCTO #2284]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 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..33627a3 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
@@ -28,9 +28,10 @@ LIBV = "2.10.0"
 EXTRA_OECONF = "\
   --without-libtiff \
   --with-libpng \
-  --without-x11 \
   --disable-introspection \
 "
+PACKAGECONFIG ??= "${@base_contains('DISTRO', 'poky-lsb', 'poky-lsb', '', d)}"
+PACKAGECONFIG[poky-lsb] = "--with-x11,--without-x11,,"
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${libdir}/lib*.so.*"
-- 
1.7.0.4