[meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and gtk

[meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and gtk

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

- GStreamer 0.10 has been removed meta-openembedded/meta-multimedia
  and 1.0 left in oe-core, so upgrade libcanberra to the version
  that support GStreamer 1.0

- GStreamer and gtk support for libcanberra are optional, add
  PACKAGECONFIG for them and use DISTRO_FEATURES to decide if
  they are needed.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../{libcanberra_0.29.bb => libcanberra_0.30.bb}           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/libcanberra/{libcanberra_0.29.bb => libcanberra_0.30.bb} (80%)

diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
similarity index 80%
rename from meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
rename to meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
index 0f00b20..959b88f 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03"
 
-DEPENDS = "gstreamer gtk+ gtk+3 libtool libvorbis"
+DEPENDS = "libtool libvorbis"
 
 inherit autotools gtk-doc
 
@@ -12,24 +12,26 @@ SRC_URI = " \
     http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \
     file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
 "
-SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
-SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
+SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072"
+SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
 
 EXTRA_OECONF = "\
     --enable-null \
-    --enable-gstreamer \
     --disable-oss \
-    --enable-gtk \
-    --enable-gtk3 \
     --disable-tdb \
     --disable-lynx \
 "
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','alsa','alsa','',d)} \
                    ${@base_contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \
+                   ${@base_contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \
+                   ${@base_contains('DISTRO_FEATURES','gstreamer','gstreamer','',d)} \
 "
 PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib"
 PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio"
+PACKAGECONFIG[gstreamer] = "--enable-gstreamer, --disable-gstreamer, gstreamer1.0"
+PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+"
+PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3"
 
 python populate_packages_prepend() {
     plugindir = d.expand('${libdir}/${BPN}-${PV}/')
-- 
1.9.1

Re: [meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and gtk

[Burton, Ross]

On 5 June 2015 at 10:26, <jackie.huang@windriver.com> wrote:

> +
>  ${@base_contains('DISTRO_FEATURES','gstreamer','gstreamer','',d)} \
>

Lets not invent distro features for no reason.

Ross

Re: [meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and gtk

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-
> bounces@lists.openembedded.org] On Behalf Of Burton, Ross
> Sent: Friday, June 05, 2015 5:48 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and
> gtk
> 
> On 5 June 2015 at 10:26, <jackie.huang@windriver.com> wrote:
> 
> > +
> >  ${@base_contains('DISTRO_FEATURES','gstreamer','gstreamer','',d)} \
> >
> 
> Lets not invent distro features for no reason.

Ok, so I will remove this and left gstreamer not enabled by default, someone can enable it
when needed, does that make sense?

Thanks,
Jackie

> 
> Ross
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and gtk

[Randy MacLeod]

On 2015-06-07 09:49 PM, Huang, Jie (Jackie) wrote:
>
>
>> -----Original Message-----
>> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-
>> bounces@lists.openembedded.org] On Behalf Of Burton, Ross
>> Sent: Friday, June 05, 2015 5:48 PM
>> To: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe] [meta-oe][PATCH] libcanberra: upgrade and add packageconfig for gstreamer and
>> gtk
>>
>> On 5 June 2015 at 10:26, <jackie.huang@windriver.com> wrote:
>>
>>> +
>>>   ${@base_contains('DISTRO_FEATURES','gstreamer','gstreamer','',d)} \
>>>
>>
>> Lets not invent distro features for no reason.
>
> Ok, so I will remove this and left gstreamer not enabled by default, someone can enable it
> when needed, does that make sense?
>
> Thanks,
> Jackie

I think Ross is saying that you can just add a PACKAGECONFIG
for gstreamer itself rather than make gstreamer a DISTRO_FEATURE.
For example see: meta-efl/recipes-efl/efl/efl.inc

../Randy

>
>>
>> Ross
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


-- 
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, 
Canada, K2K 2W5