[vlc-commits] contribs: Add a patch for libpng for building with automake 1.11

[Martin Storsjö]

vlc/vlc-2.1 | branch: master | Martin Storsjö <martin at martin.st> | Tue Jul  9 14:22:15 2013 +0300| [5522128028d7949d072f642ca2568abe257cd634] | committer: Jean-Baptiste Kempf

contribs: Add a patch for libpng for building with automake 1.11

automake 1.12 changed the default for tests, requiring projects
that need serial test execution to add an option for setting this.
This option isn't available on automake 1.11, so those projects
became incompatible with automake 1.11 once they got ready for 1.12.
This obviously isn't an issue in most cases where the prebuilt
configure is good enough.

Since we don't run the tests in contribs, just remove this option
for now, to allow building with both automake 1.11 and 1.12.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit f7a43ee510aca827892ae9891904d219faa6e264)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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..8aefb2e
--- /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-06-27 06:25:42.000000000 +0300
++++ png.new/configure.ac	2013-07-09 14:19:02.953919579 +0300
+@@ -19,7 +19,7 @@
+ dnl Version number stuff here:
+ 
+ AC_INIT([libpng], [1.5.17], [png-mng-implement at lists.sourceforge.net])
+-AM_INIT_AUTOMAKE([serial-tests])
++AM_INIT_AUTOMAKE
+ dnl stop configure from automagically running automake
+ AM_MAINTAINER_MODE
+ 
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 2acf3bd..89bb4e0 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libpng-$(PNG_VERSION).tar.bz2:
 png: libpng-$(PNG_VERSION).tar.bz2 .sum-png
 	$(UNPACK)
 	$(APPLY) $(SRC)/png/winrt.patch
+	$(APPLY) $(SRC)/png/automake.patch
 	$(MOVE)
 
 DEPS_png = zlib $(DEPS_zlib)