From 3f4721602e8c1bceb50fdc73d67611722d9acafc Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Wed, 3 Jan 2018 23:05:17 +0100
Subject: [PATCH] bump version libpng-1.26.34

---
 .../libpng-1.26.30-fix-compile-on-arm.patch     | 11 -----------
 make/archives.mk                                |  4 ++--
 make/libraries.mk                               | 17 +++++++++--------
 make/versions.mk                                |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 archive-patches/libpng-1.26.30-fix-compile-on-arm.patch

diff --git a/archive-patches/libpng-1.26.30-fix-compile-on-arm.patch b/archive-patches/libpng-1.26.30-fix-compile-on-arm.patch
deleted file mode 100644
index 6b75665..0000000
--- a/archive-patches/libpng-1.26.30-fix-compile-on-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pngpriv.h.orig	2017-06-28 18:46:03.000000000 +0000
-+++ b/pngpriv.h
-@@ -464,7 +464,7 @@
-    static_cast<type>(static_cast<void*>(value))
- #  define png_aligncastconst(type, value) \
-    static_cast<type>(static_cast<const void*>(value))
--#else
-+#elif !defined(__ASSEMBLER__)
- #  define png_voidcast(type, value) (value)
- #  ifdef _WIN64
- #     ifdef __GNUC__
diff --git a/make/archives.mk b/make/archives.mk
index 89c8c61..bd655fa 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -24,8 +24,8 @@ $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2:
 $(ARCHIVE)/curl-$(CURL_VER).tar.bz2:
 	$(WGET) http://curl.haxx.se/download/$(lastword $(subst /, ,$@))
 
-$(ARCHIVE)/libpng-$(PNG_VER).tar.xz:
-	$(WGET) http://download.sourceforge.net/libpng/$(notdir $@)
+$(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz:
+	$(WGET) http://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VER)/libpng-$(LIBPNG_VER).tar.xz
 
 $(ARCHIVE)/hotplug.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/hotplug.tar.gz
diff --git a/make/libraries.mk b/make/libraries.mk
index fd6b344..fa6584a 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -256,22 +256,23 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 	$(REMOVE)/.remove
 	$(TOUCH)
 
-$(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(PNG_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX)
 	$(START_BUILD)
-	$(UNTAR)/libpng-$(PNG_VER).tar.xz
-	pushd $(BUILD_TMP)/libpng-$(PNG_VER) && \
+	$(UNTAR)/libpng-$(LIBPNG_VER).tar.xz
+	pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER) && \
 		$(PATCH)/libpng-1.26.x-disable-tools.patch && \
-		$(PATCH)/libpng-1.26.30-fix-compile-on-arm.patch && \
 		$(CONFIGURE) \
 			--prefix=$(TARGETPREFIX) \
 			--build=$(BUILD) \
 			--host=$(TARGET) \
 			--bindir=$(HOSTPREFIX)/bin \
-			--mandir=$(BUILD_TMP)/.remove && \
+			--mandir=$(BUILD_TMP)/.remove \
+			--enable-silent-rules \
+			--disable-arm-neon \
+			--disable-static && \
 		ECHO=echo $(MAKE) all && \
-		$(MAKE) install
-	$(REMOVE)/.remove
-	$(REMOVE)/libpng-$(PNG_VER)
+		make install
+	$(REMOVE)/libpng-$(LIBPNG_VER)
 	$(TOUCH)
 
 $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX)
diff --git a/make/versions.mk b/make/versions.mk
index e3191c8..47093ea 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -69,7 +69,7 @@ JPEG_TURBO_VER = 1.5.2
 LIBDVBSI_GIT=ff57e5
 
 # libpng; reference library for reading and writing PNGs
-PNG_VER=1.6.30
+LIBPNG_VER=1.6.34
 
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.22
-- 
2.39.5