alsa-lib: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

(From OE-Core rev: 453fd36914fe1ae41a2115266833ec7fcba0869d)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 19 insertions, 2 deletions

diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..95c29dac7c
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.25/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_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
index 7914bb9800..d0cb0b0b51 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
@@ -14,10 +14,12 @@ BBCLASSEXTEND = "native nativesdk"
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch"
+           file://fix-tstamp-declaration.patch \
+           file://obsolete_automake_macros.patch \
+          "
 
 SRC_URI[md5sum] = "06fe5819020c6684b991dcffc5471304"
 SRC_URI[sha256sum] = "5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6"