sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Zhai Edwin 2010-12-31 09:18:30 +08:00 committed by Richard Purdie
parent c19c5b49be
commit fbd6f9f45f
3 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch
View File

@ -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 ####

16
meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch
View File

@ -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);

10
meta/recipes-multimedia/pulseaudio/libcanberra_0.10.bb → meta/recipes-multimedia/pulseaudio/libcanberra_0.26.bb
View File

@ -5,16 +5,14 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/canberra.h;endline=24;md5=8dd99ba690687f5816f711d9313c8967"
DEPENDS = "gtk+ pulseaudio alsa-lib libtool"
PR = "r3"
PR = "r0"
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 = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz"
SRC_URI[md5sum] = "2623370bfcecaeecaeb85e5ec445f340"
SRC_URI[sha256sum] = "b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272"
SRC_URI[md5sum] = "ee2c66ada7c851a4e7b6eb1682285a24"
SRC_URI[sha256sum] = "4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
EXTRA_OECONF = " --disable-oss --disable-ltdl-install"