Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
2219f25d
Commit
2219f25d
authored
Aug 26, 2013
by
Martin Storsjö
Browse files
contrib: Patch libpng to make it build with automake 1.12 and 1.11 again
parent
08c53179
Changes
2
Hide whitespace changes
Inline
Side-by-side
contrib/src/png/automake.patch
0 → 100644
View file @
2219f25d
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
contrib/src/png/rules.mak
View file @
2219f25d
...
...
@@ -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)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment