[vlc-commits] contrib: Patch libpng to make it build with automake 1.12 and 1.11 again

[Martin Storsjö]

vlc/vlc-2.1 | branch: master | Martin Storsjö <martin at martin.st> | Mon Aug 26 14:20:54 2013 +0300| [dbbf0750f11af0b6d2b61b656b09ecb9ca24864d] | committer: Jean-Baptiste Kempf

contrib: Patch libpng to make it build with automake 1.12 and 1.11 again

(cherry picked from commit 2219f25d04e34911f8016640a33b72898113440f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=dbbf0750f11af0b6d2b61b656b09ecb9ca24864d
---

 contrib/src/png/automake.patch |   12 ++++++++++++
 contrib/src/png/rules.mak      |    1 +
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/png/automake.patch b/contrib/src/png/automake.patch
new file mode 100644
index 0000000..9757dd1
--- /dev/null
+++ b/contrib/src/png/automake.patch
@@ -0,0 +1,12 @@
+diff -ur png/configure.ac png.new/configure.ac
+--- png/configure.ac	2013-07-18 03:03:02.000000000 +0300
++++ png.new/configure.ac	2013-08-08 19:20:12.459900241 +0300
+@@ -27,7 +27,7 @@
+ # dist-xz requires automake 1.11 or later
+ # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
+ # 1.13 is required for parallel tests
+-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
++AM_INIT_AUTOMAKE([1.11 foreign dist-xz color-tests silent-rules])
+ # The following line causes --disable-maintainer-mode to be the default to
+ # configure, this is necessary because libpng distributions cannot rely on the
+ # time stamps of the autotools generated files being correct
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index ae6ae5b..d1adc34 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -16,6 +16,7 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
 	$(UNPACK)
 	$(APPLY) $(SRC)/png/winrt.patch
 	$(APPLY) $(SRC)/png/bins.patch
+	$(APPLY) $(SRC)/png/automake.patch
 	$(MOVE)
 
 DEPS_png = zlib $(DEPS_zlib)