summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/faad2/A00-libtool22.patch13
-rw-r--r--make/include/contrib.defs2
2 files changed, 1 insertions, 14 deletions
diff --git a/contrib/faad2/A00-libtool22.patch b/contrib/faad2/A00-libtool22.patch
deleted file mode 100644
index 4eab08487..000000000
--- a/contrib/faad2/A00-libtool22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: faad2/configure.in
-===================================================================
---- faad2.orig/configure.in
-+++ faad2/configure.in
-@@ -18,7 +18,7 @@ dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
- dnl disable for mpeg4ip plugin
--dnl AC_PROG_CXX
-+AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 5f1f9e54b..cbc70866b 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -52,7 +52,7 @@ define import.CONTRIB.defs
# extra line feed is required
define $(1).PATCH.item
- $$(PATCH.exe) -t -p1 -d $$(1) < $$(2)
+ $$(PATCH.exe) -t -N -p1 -d $$(1) < $$(2)
endef