aboutsummaryrefslogtreecommitdiffstats
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:15 +0000
commit759191ee0b11231e1719bd5c66ac0afbd02e2a80 (patch)
tree320bd8013232da70ee620eac7e2c3ede3d9dd19a /meta/recipes-multimedia/alsa/alsa-lib
parent3d72ba9d25a02cac2c0a63ab32c5483be5c6ea3f (diff)
downloadopenembedded-core-contrib-759191ee0b11231e1719bd5c66ac0afbd02e2a80.tar.gz
alsa-lib: upgrade to 1.0.26
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@
+# 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/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 @@
+Upstream-Status: Submitted [alsa-devel@alsa-project.org]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd alsa-lib-1.0.25/configure.in alsa-lib-1.0.25/configure.in
+--- alsa-lib-1.0.25/configure.in 2012-01-25 09:56:56.000000000 +0200
++++ alsa-lib-1.0.25/configure.in 2013-01-02 17:00:31.468090167 +0200
+@@ -53,7 +53,7 @@
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ 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 @@
+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)
+