[2/4] libtheora: backport a patch to fix autoreconf

Message ID	20250108154636.1431857-2-ross.burton@arm.com
State	New
Headers	show Return-Path: <ross.burton@arm.com> ip: 217.140.110.172, mailfrom: ross.burton@arm.com) From: Ross Burton <ross.burton@arm.com> To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] libtheora: backport a patch to fix autoreconf Date: Wed, 8 Jan 2025 15:46:34 +0000 Message-ID: <20250108154636.1431857-2-ross.burton@arm.com> In-Reply-To: <20250108154636.1431857-1-ross.burton@arm.com> References: <20250108154636.1431857-1-ross.burton@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable
Series	[1/4] rsync: clean up configure/configure.sh fiddling \| expand [1/4] rsync: clean up configure/configure.sh fiddling [2/4] libtheora: backport a patch to fix autoreconf [3/4] autotools: log when we're removing aclocal.m4 [4/4] autotools: remove aclocal --automake-acdir, relocated so knows the right path

Message ID

20250108154636.1431857-2-ross.burton@arm.com

State

New

Headers

From: Ross Burton <ross.burton@arm.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/4] libtheora: backport a patch to fix autoreconf
Date: Wed,  8 Jan 2025 15:46:34 +0000
Message-ID: <20250108154636.1431857-2-ross.burton@arm.com>
In-Reply-To: <20250108154636.1431857-1-ross.burton@arm.com>
References: <20250108154636.1431857-1-ross.burton@arm.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Series

[1/4] rsync: clean up configure/configure.sh fiddling | expand

Commit Message

Ross Burton Jan. 8, 2025, 3:46 p.m. UTC

This is needed so that autoreconf works without any macro path fiddling,
which autotools may no longer be doing implicitly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../libtheora-1.1.1/autoreconf.patch          | 42 +++++++++++++++++++
 .../libtheora/libtheora_1.1.1.bb              |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch

diff --git a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch
new file mode 100644
index 00000000000..0fc09ba413c
--- /dev/null
+++ b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch
@@ -0,0 +1,42 @@ 
+From 859e58b440e64aeec446ae0a923a638e4203f408 Mon Sep 17 00:00:00 2001
+From: Tim Terriberry <tterribe@xiph.org>
+Date: Fri, 20 May 2011 20:41:50 +0000
+Subject: [PATCH] Make autoreconf -i -f work.
+
+Patch from David Schleef.
+
+svn path=/trunk/theora/; revision=17990
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ Makefile.am  | 2 ++
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d833491..369978d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,8 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
+ 
++ACLOCAL_AMFLAGS=-I m4
++
+ if THEORA_ENABLE_EXAMPLES
+ EXAMPLES_DIR = examples
+ else
+diff --git a/configure.ac b/configure.ac
+index 8260bdf..d4feb86 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ 
+ dnl Add parameters for aclocal
+-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ dnl Check for doxygen
+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
index 11674af379f..f3d053d9f47 100644
--- a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
+++ b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
@@ -9,6 +9,7 @@  DEPENDS = "libogg"
 
 
 SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \
+           file://autoreconf.patch \
            file://no-docs.patch"
 
 SRC_URI[md5sum] = "292ab65cedd5021d6b7ddd117e07cd8e"