libcanberra: upgrade and add packageconfig for gstreamer and gtk

- 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 x11 DISTRO_FEATURES to decide
  if gtk is needed, gstreamer is not enabled by default.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
index 0f00b209f..26638c3b9 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,25 @@ 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)} \
 "
 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}/')