[libmad] use automatic autogen instead of autogen patch

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

9 files changed, 254 insertions, 1 deletions

diff --git a/patches/libmad-0.15.1b/autoconf.diff.bz2 b/patches/libmad-0.15.1b/autoconf.diff.bz2
deleted file mode 100644
index d5013c5ca..000000000
--- a/patches/libmad-0.15.1b/autoconf.diff.bz2
+++ /dev/null
diff --git a/patches/libmad-0.15.1b/autogen.sh b/patches/libmad-0.15.1b/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/libmad-0.15.1b/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-am-config-header.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-am-config-header.diff
new file mode 100644
index 000000000..dce8b5a7a
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-am-config-header.diff
@@ -0,0 +1,24 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libmad: update autoconf
+
+configure.ac:32: warning: The macro `AM_CONFIG_HEADER' is obsolete.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libmad-0.15.1b/configure.ac
+===================================================================
+--- libmad-0.15.1b.orig/configure.ac
++++ libmad-0.15.1b/configure.ac
+@@ -29,7 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl System type.
+ 
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-as-help-string.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-as-help-string.diff
new file mode 100644
index 000000000..8ceaeb978
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-as-help-string.diff
@@ -0,0 +1,99 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libmad: update autoconf
+
+configure.ac:212: warning: The macro `AC_HELP_STRING' is obsolete.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+Index: libmad-0.15.1b/configure.ac
+===================================================================
+--- libmad-0.15.1b.orig/configure.ac
++++ libmad-0.15.1b/configure.ac
+@@ -172,7 +172,7 @@ AC_CACHE_SAVE
+ 
+ AC_MSG_CHECKING(whether to optimize for speed or for accuracy)
+ 
+-AC_ARG_ENABLE(speed, AC_HELP_STRING([--enable-speed],
++AC_ARG_ENABLE(speed, AS_HELP_STRING([--enable-speed],
+ 		     [optimize for speed over accuracy]),
+ [
+     case "$enableval" in
+@@ -184,7 +184,7 @@ AC_ARG_ENABLE(speed, AC_HELP_STRING([--e
+     esac
+ ])
+ 
+-AC_ARG_ENABLE(accuracy, AC_HELP_STRING([--enable-accuracy],
++AC_ARG_ENABLE(accuracy, AS_HELP_STRING([--enable-accuracy],
+ 			[optimize for accuracy over speed]),
+ [
+     case "$enableval" in
+@@ -209,7 +209,7 @@ then
+ fi
+ 
+ AC_MSG_CHECKING(for architecture-specific fixed-point math routines)
+-AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],
++AC_ARG_ENABLE(fpm, AS_HELP_STRING([--enable-fpm=ARCH],
+ 		   [use ARCH-specific fixed-point math routines
+ 		    (one of: intel, arm, mips, sparc, ppc, 64bit, default)]),
+ [
+@@ -252,7 +252,7 @@ fi
+ 
+ FPM="-DFPM_$FPM"
+ 
+-AC_ARG_ENABLE(sso, AC_HELP_STRING([--enable-sso],
++AC_ARG_ENABLE(sso, AS_HELP_STRING([--enable-sso],
+ 		   [use subband synthesis optimization]),
+ [
+     case "$enableval" in
+@@ -263,7 +263,7 @@ AC_ARG_ENABLE(sso, AC_HELP_STRING([--ena
+     esac
+ ])
+ 
+-AC_ARG_ENABLE(aso, AC_HELP_STRING([--disable-aso],
++AC_ARG_ENABLE(aso, AS_HELP_STRING([--disable-aso],
+ 		   [disable architecture-specific optimizations]),
+     [], [enable_aso=yes])
+ 
+@@ -289,7 +289,7 @@ then
+ fi
+ 
+ AC_MSG_CHECKING(for ISO/IEC interpretation)
+-AC_ARG_ENABLE(strict-iso, AC_HELP_STRING([--enable-strict-iso],
++AC_ARG_ENABLE(strict-iso, AS_HELP_STRING([--enable-strict-iso],
+ 			  [use strict ISO/IEC interpretations]),
+ [
+     case "$enableval" in
+@@ -304,7 +304,7 @@ AC_ARG_ENABLE(strict-iso, AC_HELP_STRING
+ AC_MSG_RESULT(${interpretation-best accepted practices})
+ 
+ AC_MSG_CHECKING(whether to enable profiling)
+-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
++AC_ARG_ENABLE(profiling, AS_HELP_STRING([--enable-profiling],
+ 			 [generate profiling code]),
+ [
+     case "$enableval" in
+@@ -314,9 +314,9 @@ AC_ARG_ENABLE(profiling, AC_HELP_STRING(
+ AC_MSG_RESULT(${enable_profiling-no})
+ 
+ AC_MSG_CHECKING(whether to enable debugging)
+-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
++AC_ARG_ENABLE(debugging, AS_HELP_STRING([--enable-debugging],
+ 			 [enable diagnostic debugging support])
+-AC_HELP_STRING([--disable-debugging],
++AS_HELP_STRING([--disable-debugging],
+ 	       [do not enable debugging and use more optimization]),
+ [
+     case "$enableval" in
+@@ -344,7 +344,7 @@ AC_HELP_STRING([--disable-debugging],
+ AC_MSG_RESULT(${enable_debugging-default})
+ 
+ AC_MSG_CHECKING(whether to enable experimental code)
+-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
++AC_ARG_ENABLE(experimental, AS_HELP_STRING([--enable-experimental],
+ 			    [enable experimental code]),
+ [
+     case "$enableval" in
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-automake-m4.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-automake-m4.diff
new file mode 100644
index 000000000..f2e806176
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-automake-m4.diff
@@ -0,0 +1,24 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libmad: update Makefile.am
+
+libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ Makefile.am |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: libmad-0.15.1b/Makefile.am
+===================================================================
+--- libmad-0.15.1b.orig/Makefile.am
++++ libmad-0.15.1b/Makefile.am
+@@ -24,6 +24,8 @@
+ SUBDIRS =		
+ DIST_SUBDIRS =		msvc++
+ 
++ACLOCAL_AMFLAGS =	-I m4
++
+ lib_LTLIBRARIES =	libmad.la
+ include_HEADERS =	mad.h
+ 
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-lt-init.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-lt-init.diff
new file mode 100644
index 000000000..e05add7e4
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-lt-init.diff
@@ -0,0 +1,23 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+configure.ac:66: warning: The macro `AC_PROG_LIBTOOL' is obsolete.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libmad-0.15.1b/configure.ac
+===================================================================
+--- libmad-0.15.1b.orig/configure.ac
++++ libmad-0.15.1b/configure.ac
+@@ -63,7 +63,7 @@ dnl Support for libtool.
+ 
+ dnl AC_DISABLE_SHARED
+ dnl AC_LIBTOOL_WIN32_DLL
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ AC_SUBST(LIBTOOL_DEPS)
+ 
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-updates.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-updates.diff
new file mode 100644
index 000000000..fb0f92c3c
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-autotool-updates.diff
@@ -0,0 +1,41 @@
+automake 1.11 bails out with the following error:
+
+Makefile.am:57: `INCLUDES' is the old name for `AM_CPPFLAGS' (or `*_CPPFLAGS')
+
+And:
+
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
+libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ Makefile.am  |    2 +-
+ configure.ac |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+Index: libmad-0.15.1b/Makefile.am
+===================================================================
+--- libmad-0.15.1b.orig/Makefile.am
++++ libmad-0.15.1b/Makefile.am
+@@ -54,7 +54,7 @@ EXTRA_libmad_la_SOURCES =	imdct_l_arm.S 
+ libmad_la_DEPENDENCIES =	@ASO_OBJS@
+ libmad_la_LIBADD =		@ASO_OBJS@
+ 
+-INCLUDES =		$(FPM) $(ASO)
++AM_CPPFLAGS =		$(FPM) $(ASO)
+ 
+ BUILT_SOURCES =		mad.h
+ CLEANFILES =		mad.h
+Index: libmad-0.15.1b/configure.ac
+===================================================================
+--- libmad-0.15.1b.orig/configure.ac
++++ libmad-0.15.1b/configure.ac
+@@ -25,6 +25,7 @@ AC_INIT([MPEG Audio Decoder], [0.15.1b],
+ AC_PREREQ(2.53)
+ 
+ AC_CONFIG_SRCDIR([decoder.h])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE
+ 
diff --git a/patches/libmad-0.15.1b/libmad-0.15.1b-new-files.diff b/patches/libmad-0.15.1b/libmad-0.15.1b-new-files.diff
new file mode 100644
index 000000000..7706d7d50
--- /dev/null
+++ b/patches/libmad-0.15.1b/libmad-0.15.1b-new-files.diff
@@ -0,0 +1,36 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libmad: add missing files
+
+Makefile.am: required file `./NEWS' not found
+Makefile.am: required file `./AUTHORS' not found
+Makefile.am: required file `./ChangeLog' not found
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ AUTHORS   |    2 ++
+ ChangeLog |    2 ++
+ NEWS      |    2 ++
+ 3 files changed, 6 insertions(+)
+
+Index: libmad-0.15.1b/AUTHORS
+===================================================================
+--- /dev/null
++++ libmad-0.15.1b/AUTHORS
+@@ -0,0 +1,2 @@
++
++
+Index: libmad-0.15.1b/ChangeLog
+===================================================================
+--- /dev/null
++++ libmad-0.15.1b/ChangeLog
+@@ -0,0 +1,2 @@
++
++
+Index: libmad-0.15.1b/NEWS
+===================================================================
+--- /dev/null
++++ libmad-0.15.1b/NEWS
+@@ -0,0 +1,2 @@
++
++
diff --git a/patches/libmad-0.15.1b/series b/patches/libmad-0.15.1b/series
index 108401db9..760f32a36 100644
--- a/patches/libmad-0.15.1b/series
+++ b/patches/libmad-0.15.1b/series
@@ -1,3 +1,8 @@
 optimize.diff
 amd64-64bit.diff
-autoconf.diff.bz2
+libmad-0.15.1b-autotool-updates.diff
+libmad-0.15.1b-autotool-lt-init.diff
+libmad-0.15.1b-autotool-as-help-string.diff
+libmad-0.15.1b-autotool-automake-m4.diff
+libmad-0.15.1b-new-files.diff
+libmad-0.15.1b-am-config-header.diff