alsa-utils: 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.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..1a20b48
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils-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-utils-1.0.25/configure.in alsa-utils-1.0.25/configure.in
+--- alsa-utils-1.0.25/configure.in     2012-01-25 11:43:48.000000000 +0200
++++ alsa-utils-1.0.25/configure.in     2013-01-12 10:11:51.401498722 +0200
+@@ -269,7 +269,7 @@
+   TESTSOUND="$dir/test.wav")
+ AC_SUBST(TESTSOUND)
+
+-AM_CONFIG_HEADER(include/aconfig.h)
++AC_CONFIG_HEADERS(include/aconfig.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
index a76985c4c293cf16c368bfac235a7054eb4bf58d..ab8d8459638ef03402cdc292b9453e21b77641f3 100644 (file)
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
@@ -6,12 +6,13 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \
            file://uclibc-exp10-replacement.patch \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
+           file://obsolete_automake_macros.patch \
           "
 
 SRC_URI[md5sum] = "f81f9dcb9a014fd32cb3a70066a5b9a9"