From 759191ee0b11231e1719bd5c66ac0afbd02e2a80 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 18 Jan 2013 13:39:30 +0200 Subject: alsa-lib: upgrade to 1.0.26 Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../alsa/alsa-lib/fix-tstamp-declaration.patch | 21 +++++++++++++++++++++ .../alsa/alsa-lib/obsolete_automake_macros.patch | 15 +++++++++++++++ .../alsa/alsa-lib/unbreak_plugindir.patch | 14 ++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/fix-tstamp-declaration.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch (limited to 'meta/recipes-multimedia/alsa/alsa-lib') 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 +# 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 + + #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 +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) + -- cgit v1.2.3