[vlc-commits] Contribs: update libpng to 1.6.29

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr  8 12:13:59 2017 +0200| [8891af2d84de3caa5c4f2a51acbb2b47647ed62d] | committer: Jean-Baptiste Kempf

Contribs: update libpng to 1.6.29

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

 contrib/src/png/SHA512SUMS |  2 +-
 contrib/src/png/bins.patch | 15 +++++++++------
 contrib/src/png/rules.mak  |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
index 83d7d029b9..b07b35b341 100644
--- a/contrib/src/png/SHA512SUMS
+++ b/contrib/src/png/SHA512SUMS
@@ -1 +1 @@
-166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8  libpng-1.6.19.tar.xz
+070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc  libpng-1.6.29.tar.xz
diff --git a/contrib/src/png/bins.patch b/contrib/src/png/bins.patch
index 317f9c85ea..660437c71b 100644
--- a/contrib/src/png/bins.patch
+++ b/contrib/src/png/bins.patch
@@ -1,15 +1,18 @@
---- libpng-1.6.10/Makefile.am.orig	2014-05-24 18:11:01.881964331 +0200
-+++ libpng-1.6.10/Makefile.am	2014-05-24 18:12:02.839819773 +0200
-@@ -7,10 +7,10 @@
+--- libpng-1.6.29/Makefile.am.orig	2017-04-08 12:12:49.688261183 +0200
++++ libpng-1.6.29/Makefile.am	2017-04-08 12:13:27.148259514 +0200
+@@ -12,13 +12,13 @@
  ACLOCAL_AMFLAGS = -I scripts
  
  # test programs - run on make check, make distcheck
--check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
-+check_PROGRAMS= 
+-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp
++check_PROGRAMS=
+ if HAVE_CLOCK_GETTIME
+ check_PROGRAMS += timepng
+ endif
  
  # Utilities - installed
 -bin_PROGRAMS= pngfix png-fix-itxt
-+bin_PROGRAMS= 
++bin_PROGRAMS=
  
  # This ensures that pnglibconf.h gets built at the start of 'make all' or
  # 'make check', but it does not add dependencies to the individual programs,
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 731f613502..3bcfa77848 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -1,5 +1,5 @@
 # PNG
-PNG_VERSION := 1.6.19
+PNG_VERSION := 1.6.29
 PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
 
 PKGS += png