From 5b91cdde2a3ccbb016bcc08208537a3d0cc29a53 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 10 Jan 2013 12:00:12 +0200 Subject: [PATCH] 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. (From OE-Core rev: 8bfb260eb601360bea251d77633f463063e4d451) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../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(-) create mode 100644 meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch 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 0000000000..6405b2b42f --- /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 +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 fedaa6e52d..c6480e9db6 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"