vlc/vlc-2.2 | branch: master | Steve Lhomme <[email protected]> | Fri May 20 18:02:22 2016 +0200| [5e72b88d69a480ba77518d697ae6519a21abae08] | committer: Jean-Baptiste Kempf
contrib: mad: don't create dummy files, use foreign automake Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit a4c8871abb0c7ea2458999c918aa0bc6100d12f3) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5e72b88d69a480ba77518d697ae6519a21abae08 --- contrib/src/mad/mad-foreign.patch | 11 +++++++++++ contrib/src/mad/rules.mak | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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 ff2c428..256dde6 100644 --- a/contrib/src/mad/rules.mak +++ b/contrib/src/mad/rules.mak @@ -29,10 +29,10 @@ 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 $(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) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
