diff options
| author |   Kang Kai <kai.kang@windriver.com> | 2012-03-14 17:03:39 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-14 13:12:43 +0000 |
| commit | 555bd3102fcd83d728091e074977b5a4228a2b1b (patch) | |
| tree | f2dd21e0a63022f665245e5a2a91ee0f22558382 /meta/recipes-multimedia/alsa/alsa-lib-1.0.25 | |
| parent | 94e18a1c574b97ba87724c0fea79d2af77ba4186 (diff) | |
| download | openembedded-core-contrib-555bd3102fcd83d728091e074977b5a4228a2b1b.tar.gz | |
alsa-lib: update to 1.0.25
Update to version 1.0.25, rename the patch directory at same time.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib-1.0.25')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib-1.0.25/fix-tstamp-declaration.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib-1.0.25/unbreak_plugindir.patch | 14 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..32b84b7d7e --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/fix-tstamp-declaration.patch @@ -0,0 +1,21 @@ +# Author: Michael Lauer <mickey@vanille-media.de> +# Date: Thu Jan 18 00:27:21 2007 +0000 +# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options +# +# Acquired from OpenEmbedded + +Upstream-Status: Pending + +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include <time.h> + + #ifdef __cplusplus diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/unbreak_plugindir.patch new file mode 100644 index 0000000000..1f3edd06aa --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/unbreak_plugindir.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in +--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 ++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 +@@ -93,7 +93,7 @@ + esac + plugindir="$dir/$PACKAGE" + fi +-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) ++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) + ALSA_PLUGIN_DIR="$plugindir" + AC_SUBST(ALSA_PLUGIN_DIR) + |