[oe-commits] Marko Lindqvist : libogg: replace obsolete automake macros with working ones

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 8bfb260eb601360bea251d77633f463063e4d451
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8bfb260eb601360bea251d77633f463063e4d451

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Thu Jan 10 12:00:12 2013 +0200

libogg: 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 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../libogg-1.3.0/obsolete_automake_macros.patch    |   14 ++++++++++++++
 meta/recipes-multimedia/libogg/libogg_1.3.0.bb     |    6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch b/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch
new file mode 100644
index 0000000..6405b2b
--- /dev/null
+++ b/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted [https://trac.xiph.org/ticket/1921]
+
+Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+diff -Nurd libogg-1.3.0/configure.in libogg-1.3.0/configure.in
+--- libogg-1.3.0/configure.in	2011-08-04 20:11:08.000000000 +0300
++++ libogg-1.3.0/configure.in	2013-01-03 06:23:03.334858696 +0200
+@@ -19,7 +19,7 @@
+ AM_PROG_CC_C_O
+
+ dnl config.h
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ dnl Set some options based on environment
diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.0.bb b/meta/recipes-multimedia/libogg/libogg_1.3.0.bb
index fedaa6e..c6480e9 100644
--- a/meta/recipes-multimedia/libogg/libogg_1.3.0.bb
+++ b/meta/recipes-multimedia/libogg/libogg_1.3.0.bb
@@ -9,9 +9,11 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \
                     file://include/ogg/ogg.h;beginline=1;endline=11;md5=eda812856f13a3b1326eb8f020cc3b0b"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz"
+SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz \
+           file://obsolete_automake_macros.patch \
+          "
 
 SRC_URI[md5sum] = "0a7eb40b86ac050db3a789ab65fe21c2"
 SRC_URI[sha256sum] = "a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780"