[vlc-devel] [PATCH 1/2] contrib: mad: don't create dummy files, use foreign automake

Steve Lhomme robux4 at videolabs.io
Fri May 20 18:02:22 CEST 2016


---
 contrib/src/mad/mad-foreign.patch | 11 +++++++++++
 contrib/src/mad/rules.mak         |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 contrib/src/mad/mad-foreign.patch

diff --git a/contrib/src/mad/mad-foreign.patch b/contrib/src/mad/mad-foreign.patch
new file mode 100644
index 0000000..0058c29
--- /dev/null
+++ b/contrib/src/mad/mad-foreign.patch
@@ -0,0 +1,11 @@
+--- libmad/configure.ac.foreign	2016-05-20 14:08:42.644100100 +0200
++++ libmad/configure.ac	2016-05-20 14:08:32.875935700 +0200
+@@ -26,7 +26,7 @@ AC_PREREQ(2.53)
+ 
+ AC_CONFIG_SRCDIR([decoder.h])
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([1.15 foreign])
+ 
+ AM_CONFIG_HEADER([config.h])
+ 
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index a4f10f7..3d01a20 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -29,13 +29,13 @@ endif
 	$(APPLY) $(SRC)/mad/mad-noopt.patch
 	$(APPLY) $(SRC)/mad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
 	$(APPLY) $(SRC)/mad/mad-mips-h-constraint-removal.patch
+	$(APPLY) $(SRC)/mad/mad-foreign.patch
 ifdef HAVE_VISUALSTUDIO
 	$(APPLY) $(SRC)/mad/msvc.patch
 endif
 	$(MOVE)
 
 .mad: libmad
-	touch libmad/NEWS libmad/AUTHORS libmad/ChangeLog
 	$(RECONF)
 ifdef HAVE_IOS
 	cd $< && $(HOSTVARS) CCAS="$(AS)" CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(MAD_CONF)
-- 
2.8.1



More information about the vlc-devel mailing list