From b2c5c608a366faed8af312a59e9ad22eec69be5f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:20:24 +0200 Subject: [PATCH] package/libtheora: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, theora fails to build with output: Applying 0002-fix-autoreconf.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej patching file configure.ac Hunk #1 FAILED at 68. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. While we're at it, fix the usage of the Upstream: tag and update .checkpackageignore accordingly. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - package/libtheora/0002-fix-autoreconf.patch | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 8fc0f4e798..d4a4b47274 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -910,7 +910,6 @@ package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch lib_pa package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch lib_patch.Upstream package/libtelnet/0001-fix-compilation-without-zlib.patch lib_patch.Upstream package/libtheora/0001-link-libtheoradec.patch lib_patch.Upstream -package/libtheora/0002-fix-autoreconf.patch lib_patch.Upstream package/libtomcrypt/0001-fix-CVE-2019-17362.patch lib_patch.Upstream package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch lib_patch.Upstream package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch lib_patch.Upstream diff --git a/package/libtheora/0002-fix-autoreconf.patch b/package/libtheora/0002-fix-autoreconf.patch index dd3f473222..27fc379ad4 100644 --- a/package/libtheora/0002-fix-autoreconf.patch +++ b/package/libtheora/0002-fix-autoreconf.patch @@ -1,9 +1,10 @@ Fix broken autoreconf -Downloaded from upstream git -https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 +Upstream: https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi From: Tim Terriberry @@ -22,9 +23,8 @@ diff --git a/Makefile.am b/Makefile.am index 89fd753..1783857 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -4,6 +4,8 @@ - #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2 - AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz +@@ -2,5 +2,7 @@ + AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 +ACLOCAL_AMFLAGS=-I m4 + @@ -35,7 +35,7 @@ diff --git a/configure.ac b/configure.ac index 1cbec1a..456b603 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL +@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl Add parameters for aclocal @@ -43,4 +43,4 @@ index 1cbec1a..456b603 100644 +AC_CONFIG_MACRO_DIR([m4]) dnl Check for doxygen - AC_ARG_ENABLE([doc], + AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)