mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-27 20:40:34 -09:00
b2c5c608a3
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>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
Fix broken autoreconf
|
|
|
|
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>
|
|
Date: Fri, 20 May 2011 20:41:50 +0000 (+0000)
|
|
Subject: Make autoreconf -i -f work.
|
|
X-Git-Url: https://git.xiph.org/?p=theora.git;a=commitdiff_plain;h=28cc6dbd9b2a141df94f60993256a5fca368fa54
|
|
|
|
Make autoreconf -i -f work.
|
|
|
|
Patch from David Schleef.
|
|
|
|
svn path=/trunk/theora/; revision=17990
|
|
---
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 89fd753..1783857 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -2,5 +2,7 @@
|
|
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 1cbec1a..456b603 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)
|