summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-lib
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-01-18 13:39:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 12:17:35 +0000
commita3ca3ecb93e34f9aa465e2d17c18fa68325f9e2b (patch)
tree3bcc846326dbe97e8d136842a37208589a708210 /meta/recipes-multimedia/alsa/alsa-lib
parentc96768b240de55050c54752fda3df2e4b6290ce2 (diff)
downloadpoky-a3ca3ecb93e34f9aa465e2d17c18fa68325f9e2b.tar.gz
alsa-lib: upgrade to 1.0.26
(From OE-Core rev: 759191ee0b11231e1719bd5c66ac0afbd02e2a80) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/fix-tstamp-declaration.patch21
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch14
3 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib/fix-tstamp-declaration.patch
new file mode 100644
index 0000000000..32b84b7d7e
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/fix-tstamp-declaration.patch
@@ -0,0 +1,21 @@
1# Author: Michael Lauer <mickey@vanille-media.de>
2# Date: Thu Jan 18 00:27:21 2007 +0000
3# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options
4#
5# Acquired from OpenEmbedded
6
7Upstream-Status: Pending
8
9Index: alsa-lib-1.0.13/include/global.h
10===================================================================
11--- alsa-lib-1.0.13.orig/include/global.h
12+++ alsa-lib-1.0.13/include/global.h
13@@ -29,6 +29,8 @@
14 #define __ALSA_GLOBAL_H_
15
16 /* for timeval and timespec */
17+#define __need_timeval
18+#define __need_timespec
19 #include <time.h>
20
21 #ifdef __cplusplus
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..95c29dac7c
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [alsa-devel@alsa-project.org]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd alsa-lib-1.0.25/configure.in alsa-lib-1.0.25/configure.in
5--- alsa-lib-1.0.25/configure.in 2012-01-25 09:56:56.000000000 +0200
6+++ alsa-lib-1.0.25/configure.in 2013-01-02 17:00:31.468090167 +0200
7@@ -53,7 +53,7 @@
8
9 dnl Checks for header files.
10 AC_HEADER_STDC
11-AM_CONFIG_HEADER(include/config.h)
12+AC_CONFIG_HEADERS(include/config.h)
13
14 dnl Checks for typedefs, structures, and compiler characteristics.
15 AC_C_CONST
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch
new file mode 100644
index 0000000000..1f3edd06aa
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
4--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
5+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
6@@ -93,7 +93,7 @@
7 esac
8 plugindir="$dir/$PACKAGE"
9 fi
10-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
11+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
12 ALSA_PLUGIN_DIR="$plugindir"
13 AC_SUBST(ALSA_PLUGIN_DIR)
14