bump version libpng-1.26.34

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 (file)
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 89c8c613611cdf2a9d83f684ccdec7db10503488..bd655fa7088c8fd2f7ed63b774c3068dafc86547 100755 (executable)
--- 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 fd6b344b250f70aace1354490df2499a9686892c..fa6584a9fbef08caeefaddd4d2a8fc7011788e24 100755 (executable)
--- 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 e3191c89dbdcf17f745f4291425f105dcbde69d5..47093ea93bcf0395a51f78f34bdd53b185a616c7 100644 (file)
--- 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