diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-multimedia/pulseaudio/libcanberra | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@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, 54 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch new file mode 100644 index 0000000000..73a2ea6e49 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/libcanberra/autoconf_version.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Allow a slightly older autoconf and disable the inbuild libltdl | ||
2 | |||
3 | RP - 16/4/09 | ||
4 | |||
5 | Index: libcanberra-0.10/Makefile.am | ||
6 | =================================================================== | ||
7 | --- libcanberra-0.10.orig/Makefile.am 2009-04-16 14:38:53.000000000 +0100 | ||
8 | +++ libcanberra-0.10/Makefile.am 2009-04-16 14:39:04.000000000 +0100 | ||
9 | @@ -19,7 +19,7 @@ | ||
10 | dist_doc_DATA = README | ||
11 | |||
12 | EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas | ||
13 | -SUBDIRS = src gtkdoc libltdl doc | ||
14 | +SUBDIRS = src gtkdoc doc | ||
15 | |||
16 | MAINTAINERCLEANFILES = README | ||
17 | noinst_DATA = README | ||
18 | Index: libcanberra-0.10/configure.ac | ||
19 | =================================================================== | ||
20 | --- libcanberra-0.10.orig/configure.ac 2009-04-16 14:32:33.000000000 +0100 | ||
21 | +++ libcanberra-0.10/configure.ac 2009-04-16 14:37:50.000000000 +0100 | ||
22 | @@ -19,7 +19,7 @@ | ||
23 | # License along with libcanberra. If not, see | ||
24 | # <http://www.gnu.org/licenses/>. | ||
25 | |||
26 | -AC_PREREQ(2.62) | ||
27 | +AC_PREREQ(2.61) | ||
28 | |||
29 | AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de]) | ||
30 | AC_CONFIG_SRCDIR([src/common.c]) | ||
31 | @@ -70,7 +70,6 @@ | ||
32 | AC_PROG_LIBTOOL | ||
33 | AC_SUBST(LTDLINCL) | ||
34 | AC_SUBST(LIBLTDL) | ||
35 | -AC_CONFIG_SUBDIRS(libltdl) | ||
36 | |||
37 | #### Determine build environment #### | ||
38 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch b/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch new file mode 100644 index 0000000000..89a4fbf9f1 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/libcanberra/nofallbackfix.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Index: libcanberra-0.10/src/sound-theme-spec.c | ||
2 | =================================================================== | ||
3 | --- libcanberra-0.10.orig/src/sound-theme-spec.c 2009-05-22 17:08:23.000000000 +0100 | ||
4 | +++ libcanberra-0.10/src/sound-theme-spec.c 2009-05-22 17:12:50.000000000 +0100 | ||
5 | @@ -398,9 +398,9 @@ | ||
6 | if ((ret = load_theme_dir(t, name)) < 0) | ||
7 | goto fail; | ||
8 | |||
9 | + /* The fallback theme may intentionally not exist so ignore failure */ | ||
10 | if (!t->loaded_fallback_theme) | ||
11 | - if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0) | ||
12 | - goto fail; | ||
13 | + load_theme_dir(t, FALLBACK_THEME); | ||
14 | |||
15 | if (*_t) | ||
16 | ca_theme_data_free(*_t); | ||