libvorbis: 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/libvorbis/libvorbis-1.3.3/obsolete_automake_macros.patch b/meta/recipes-multimedia/libvorbis/libvorbis-1.3.3/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..211d949
--- /dev/null
+++ b/meta/recipes-multimedia/libvorbis/libvorbis-1.3.3/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted [https://trac.xiph.org/ticket/1919]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libvorbis-1.3.3/configure.ac libvorbis-1.3.3/configure.ac
+--- libvorbis-1.3.3/configure.ac       2012-02-04 00:00:34.000000000 +0200
++++ libvorbis-1.3.3/configure.ac       2013-01-03 08:41:34.718676342 +0200
+@@ -13,7 +13,7 @@
+
+ AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_MAINTAINER_MODE
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ dnl Add parameters for aclocal
+ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")

diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.3.bb b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.3.bb
index e846a6381f3ef5e59332e91563236449e174655c..1df3bb5526e607bb1986adfbb31798db7bbcaaff 100644 (file)
--- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.3.bb
+++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.3.bb
@@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ca77c6c3ea4d29cb68dce8ef5ab0d897 \
                     file://include/vorbis/vorbisenc.h;beginline=1;endline=11;md5=d1c1d138863d6315131193d4046d81cb"
 DEPENDS = "libogg"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz"
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[md5sum] = "6b1a36f0d72332fae5130688e65efe1f"
 SRC_URI[sha256sum] = "6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762"