summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-12 23:37:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:06 +0100
commitcac24abd04c9b3e84b1be354a4ca710b649eb940 (patch)
tree31d38c187ff53e3e1a3461bbe6f186c6310c55e2 /meta
parent20a04e39b739c095dcd3396fc52832100f2b10c6 (diff)
downloadpoky-cac24abd04c9b3e84b1be354a4ca710b649eb940.tar.gz
lame: fix build with automake 1.12.x
automake 1.12.x has deprecated automatic de-ANSI-fication support. Fix sources to work with automake 1.12.x Added a new patch: lame-3.99.5_fix_for_automake-1.12.x.patch (From OE-Core rev: 84a433e383e7b2e96932739c31b25956ad8dfc54) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch59
-rw-r--r--meta/recipes-multimedia/lame/lame_3.99.5.bb14
2 files changed, 62 insertions, 11 deletions
diff --git a/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch b/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
new file mode 100644
index 0000000000..571a1d07a3
--- /dev/null
+++ b/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Pending
2
3Fix this kind of errors with automake 1.12.x:
4| doc/man/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
5| autoreconf: automake failed with exit status: 1
6
7Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
82012/07/13
9
10Index: lame-3.99.5/configure.in
11===================================================================
12--- lame-3.99.5.orig/configure.in
13+++ lame-3.99.5/configure.in
14@@ -77,9 +77,6 @@ if test "${GCC}" = "yes"; then
15 AC_MSG_RESULT(${GCC_version})
16 fi
17
18-dnl more automake stuff
19-AM_C_PROTOTYPES
20-
21 AC_CHECK_HEADER(dmalloc.h)
22 if test "${ac_cv_header_dmalloc_h}" = "yes"; then
23 AM_WITH_DMALLOC
24Index: lame-3.99.5/doc/html/Makefile.am
25===================================================================
26--- lame-3.99.5.orig/doc/html/Makefile.am
27+++ lame-3.99.5/doc/html/Makefile.am
28@@ -1,6 +1,6 @@
29 ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
30
31-AUTOMAKE_OPTIONS = foreign ansi2knr
32+AUTOMAKE_OPTIONS = foreign
33
34 docdir = $(datadir)/doc
35 pkgdocdir = $(docdir)/$(PACKAGE)
36Index: lame-3.99.5/libmp3lame/i386/Makefile.am
37===================================================================
38--- lame-3.99.5.orig/libmp3lame/i386/Makefile.am
39+++ lame-3.99.5/libmp3lame/i386/Makefile.am
40@@ -1,6 +1,6 @@
41 ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
42
43-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
44+AUTOMAKE_OPTIONS = foreign
45
46 DEFS = @DEFS@ @CONFIG_DEFS@
47
48Index: lame-3.99.5/doc/man/Makefile.am
49===================================================================
50--- lame-3.99.5.orig/doc/man/Makefile.am
51+++ lame-3.99.5/doc/man/Makefile.am
52@@ -1,6 +1,6 @@
53 ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
54
55-AUTOMAKE_OPTIONS = foreign ansi2knr
56+AUTOMAKE_OPTIONS = foreign
57
58 man_MANS = lame.1
59 EXTRA_DIST = ${man_MANS}
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index a0c4cf5c65..764fcc1122 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -8,10 +8,11 @@ LICENSE_FLAGS = "commercial"
8LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
9 file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \ 9 file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \
10" 10"
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
14 file://no-gtk1.patch" 14 file://no-gtk1.patch \
15 file://lame-3.99.5_fix_for_automake-1.12.x.patch "
15 16
16SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce" 17SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
17SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff" 18SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
@@ -23,12 +24,3 @@ FILES_${PN} = "${bindir}/lame"
23FILES_libmp3lame = "${libdir}/libmp3lame.so.*" 24FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
24FILES_libmp3lame-dev = "${includedir} ${libdir}/*" 25FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
25FILES_${PN}-dev = "" 26FILES_${PN}-dev = ""
26
27do_configure() {
28 # no autoreconf please
29 aclocal
30 autoconf
31 libtoolize --force
32 gnu-configize --force
33 oe_runconf
34}