Patchwork [meta-oe,3/3] libmad: replace obsolete automake macros with working ones

login
mail settings
Submitter Marko Lindqvist
Date Jan. 3, 2013, 6:54 p.m.
Message ID <1357239255-20959-4-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/41915/
State Accepted, archived
Commit 3e65b43f9d483b3ecc69ecd2a5eb2e41a82da653
Headers show

Comments

Marko Lindqvist - Jan. 3, 2013, 6:54 p.m.
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>
---
 .../libmad/libmad-0.15.1b/obsolete_automake_macros.patch |   14 ++++++++++++++
 meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb      |    6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch

Patch

diff --git a/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch b/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch
new file mode 100644
index 0000000..b0f5f77
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@ 
+Upstream-Status: Submitted (https://sourceforge.net/tracker/?group_id=12349&atid=112349)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libmad-0.15.1b/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b/configure.ac	2004-01-23 11:41:32.000000000 +0200
++++ libmad-0.15.1b/configure.ac	2013-01-03 08:28:23.718693697 +0200
+@@ -28,7 +28,7 @@
+
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ dnl System type.
diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
index e4a3df7..b5ff698 100644
--- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -6,10 +6,14 @@  DEPENDS = "libid3tag"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
            file://add-pkgconfig.patch \
            file://mad.diff \
-           file://mad-mips-h-constraint.patch"
+           file://mad-mips-h-constraint.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch"