diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-12-31 09:18:30 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-06 10:06:25 +0000 |
| commit | fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12 (patch) | |
| tree | 2e9186c56a1075653a40b9e54d72d8efa2f3c863 /meta/recipes-multimedia/pulseaudio/libcanberra | |
| parent | c19c5b49be39f5e1c8d253710f35fe90744cce84 (diff) | |
| download | openembedded-core-fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12.tar.gz openembedded-core-fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12.tar.bz2 openembedded-core-fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12.tar.xz openembedded-core-fbd6f9f45fe8ee3f59a82cd5c66417a5afbfdb12.zip | |
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 <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/libcanberra')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch | 16 |
2 files changed, 0 insertions, 54 deletions
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 73a2ea6e4..000000000 --- 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 - # <http://www.gnu.org/licenses/>. - --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 89a4fbf9f..000000000 --- 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); |