mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libtheora: update the patches to be applied with fuzz 0

Browse Source 
Commit 8f88a644ed ("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 <dario.binacchi@amarulasolutions.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Dario Binacchi
2024-07-02 09:20:24 +02:00
committed by Arnout Vandecappelle
parent 6524a59664
commit b2c5c608a3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -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

14
package/libtheora/0002-fix-autoreconf.patch
View File

@@ -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 <bernd.kuhls@t-online.de>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
From: Tim Terriberry <tterribe@xiph.org>
@@ -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)