From fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Fri, 31 Dec 2010 09:18:30 +0800 Subject: libcanberra: Upgrade to 0.26 Remove nofallbackfix.patch it as already in upstream. Remove autoconf_version.patch as already have new version of autoconf and no inbuild libltdl now. Signed-off-by: Zhai Edwin --- .../pulseaudio/libcanberra/autoconf_version.patch | 38 ---------------------- .../pulseaudio/libcanberra/nofallbackfix.patch | 16 --------- .../pulseaudio/libcanberra_0.10.bb | 27 --------------- .../pulseaudio/libcanberra_0.26.bb | 25 ++++++++++++++ 4 files changed, 25 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra_0.10.bb create mode 100644 meta/recipes-multimedia/pulseaudio/libcanberra_0.26.bb (limited to 'meta/recipes-multimedia/pulseaudio') diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch deleted file mode 100644 index 73a2ea6e49..0000000000 --- a/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch +++ /dev/null @@ -1,38 +0,0 @@ -Allow a slightly older autoconf and disable the inbuild libltdl - -RP - 16/4/09 - -Index: libcanberra-0.10/Makefile.am -=================================================================== ---- libcanberra-0.10.orig/Makefile.am 2009-04-16 14:38:53.000000000 +0100 -+++ libcanberra-0.10/Makefile.am 2009-04-16 14:39:04.000000000 +0100 -@@ -19,7 +19,7 @@ - dist_doc_DATA = README - - EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas --SUBDIRS = src gtkdoc libltdl doc -+SUBDIRS = src gtkdoc doc - - MAINTAINERCLEANFILES = README - noinst_DATA = README -Index: libcanberra-0.10/configure.ac -=================================================================== ---- libcanberra-0.10.orig/configure.ac 2009-04-16 14:32:33.000000000 +0100 -+++ libcanberra-0.10/configure.ac 2009-04-16 14:37:50.000000000 +0100 -@@ -19,7 +19,7 @@ - # License along with libcanberra. If not, see - # . - --AC_PREREQ(2.62) -+AC_PREREQ(2.61) - - AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de]) - AC_CONFIG_SRCDIR([src/common.c]) -@@ -70,7 +70,6 @@ - AC_PROG_LIBTOOL - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) --AC_CONFIG_SUBDIRS(libltdl) - - #### Determine build environment #### - diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch b/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch deleted file mode 100644 index 89a4fbf9f1..0000000000 --- a/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: libcanberra-0.10/src/sound-theme-spec.c -=================================================================== ---- libcanberra-0.10.orig/src/sound-theme-spec.c 2009-05-22 17:08:23.000000000 +0100 -+++ libcanberra-0.10/src/sound-theme-spec.c 2009-05-22 17:12:50.000000000 +0100 -@@ -398,9 +398,9 @@ - if ((ret = load_theme_dir(t, name)) < 0) - goto fail; - -+ /* The fallback theme may intentionally not exist so ignore failure */ - if (!t->loaded_fallback_theme) -- if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0) -- goto fail; -+ load_theme_dir(t, FALLBACK_THEME); - - if (*_t) - ca_theme_data_free(*_t); diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.10.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.10.bb deleted file mode 100644 index a94be2076c..0000000000 --- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.10.bb +++ /dev/null @@ -1,27 +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;endline=24;md5=8dd99ba690687f5816f711d9313c8967" - -DEPENDS = "gtk+ pulseaudio alsa-lib libtool" -PR = "r3" - -inherit gconf autotools - -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ - file://nofallbackfix.patch;patch=1 \ - file://autoconf_version.patch;patch=1" - -SRC_URI[md5sum] = "2623370bfcecaeecaeb85e5ec445f340" -SRC_URI[sha256sum] = "b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272" - -EXTRA_OECONF = " --disable-oss --disable-ltdl-install" - -do_configure_prepend () { - rm -f ${S}/libltdl/configure* -} - -FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" - diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.26.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.26.bb new file mode 100644 index 0000000000..7f91bdc978 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/libcanberra_0.26.bb @@ -0,0 +1,25 @@ +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;endline=24;md5=8dd99ba690687f5816f711d9313c8967" + +DEPENDS = "gtk+ pulseaudio alsa-lib libtool" +PR = "r0" + +inherit gconf autotools + +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" + +SRC_URI[md5sum] = "ee2c66ada7c851a4e7b6eb1682285a24" +SRC_URI[sha256sum] = "4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982" + +EXTRA_OECONF = " --disable-oss --disable-ltdl-install" + +do_configure_prepend () { + rm -f ${S}/libltdl/configure* +} + +FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" + -- cgit v1.2.3-54-g00ecf