From 780333ce0d786748530078a81b56568ad72119c9 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 8 Jun 2015 13:17:46 +0800 Subject: 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 Signed-off-by: Martin Jansa --- .../libcanberra/libcanberra_0.29.bb | 62 --------------------- .../libcanberra/libcanberra_0.30.bb | 63 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb create mode 100644 meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb deleted file mode 100644 index 0f00b209fb..0000000000 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Implementation of XDG Sound Theme and Name Specifications" -DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." -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" - -inherit autotools gtk-doc - -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" - -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)} \ -" -PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" -PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" - -python populate_packages_prepend() { - plugindir = d.expand('${libdir}/${BPN}-${PV}/') - do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) - do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) -} - -PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" -PACKAGES_DYNAMIC += "^libcanberra-.*" - -FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" - -FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" - -FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" - -FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ - ${libdir}/gtk-2.0/modules/*.so \ - ${bindir}/canberra-gtk-play" - -# -gtk3 ships a symlink to a .so -INSANE_SKIP_${PN}-gtk3 = "dev-so" -FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ - ${libdir}/gtk-3.0/modules/*.so \ - ${bindir}/canberra-gtk3-play" - -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ - ${datadir}/gdm/ ${datadir}/gnome/" - -FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service" diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb new file mode 100644 index 0000000000..26638c3b9a --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -0,0 +1,63 @@ +SUMMARY = "Implementation of XDG Sound Theme and Name Specifications" +DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" + +DEPENDS = "libtool libvorbis" + +inherit autotools gtk-doc + +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] = "34cb7e4430afaf6f447c4ebdb9b42072" +SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" + +EXTRA_OECONF = "\ + --enable-null \ + --disable-oss \ + --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}/') + do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) +} + +PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" +PACKAGES_DYNAMIC += "^libcanberra-.*" + +FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" + +FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" + +FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" + +FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ + ${libdir}/gtk-2.0/modules/*.so \ + ${bindir}/canberra-gtk-play" + +# -gtk3 ships a symlink to a .so +INSANE_SKIP_${PN}-gtk3 = "dev-so" +FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ + ${libdir}/gtk-3.0/modules/*.so \ + ${bindir}/canberra-gtk3-play" + +FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ + ${datadir}/gdm/ ${datadir}/gnome/" + +FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service" -- cgit v1.2.3-54-g00ecf