From 29e9f08f9e174a048693ca7d42aa6231d79a63c8 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Fri, 10 Feb 2017 10:12:00 +0100
Subject: [PATCH] bump version libpng-1.6.28

---
 .../libpng-1.26.x-disable-tools.patch         | 22 +++++++++++++++++++
 make/libraries.mk                             |  4 +++-
 make/versions.mk                              |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 archive-patches/libpng-1.26.x-disable-tools.patch

diff --git a/archive-patches/libpng-1.26.x-disable-tools.patch b/archive-patches/libpng-1.26.x-disable-tools.patch
new file mode 100644
index 0000000..88bb962
--- /dev/null
+++ b/archive-patches/libpng-1.26.x-disable-tools.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@
+ endif
+ 
+ # Utilities - installed
+-bin_PROGRAMS= pngfix png-fix-itxt
++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,
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -104,7 +104,6 @@
+ 	pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \
+ 	pngcp$(EXEEXT) $(am__EXEEXT_1)
+ @HAVE_CLOCK_GETTIME_TRUE@am__append_1 = timepng
+-bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT)
+ @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\
+ @PNG_ARM_NEON_TRUE@	arm/filter_neon.S arm/filter_neon_intrinsics.c
+ 
+
diff --git a/make/libraries.mk b/make/libraries.mk
index 31e10e6..a46da5b 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -246,14 +246,16 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(PNG_VER).tar.xz | $(TARGETPREFIX)
 	$(UNTAR)/libpng-$(PNG_VER).tar.xz
 	pushd $(BUILD_TMP)/libpng-$(PNG_VER) && \
+		$(PATCH)/libpng-1.26.x-disable-tools.patch && \
 		$(CONFIGURE) \
 			--prefix=$(TARGETPREFIX) \
 			--build=$(BUILD) \
 			--host=$(TARGET) \
 			--bindir=$(HOSTPREFIX)/bin \
-			--mandir=$(BUILD_TMP)/libpng-$(PNG_VER)/tmpman && \
+			--mandir=$(BUILD_TMP)/.remove && \
 		ECHO=echo $(MAKE) all && \
 		$(MAKE) install
+	$(REMOVE)/.remove
 	$(REMOVE)/libpng-$(PNG_VER)
 	touch $@
 
diff --git a/make/versions.mk b/make/versions.mk
index 7b4974c..54524f7 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -54,7 +54,7 @@ JPEG_TURBO_VER = 1.4.2
 LIBDVBSI_GIT=ff57e5
 
 # libpng; reference library for reading and writing PNGs
-PNG_VER=1.6.21
+PNG_VER=1.6.28
 
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.19
-- 
2.39.5