bump version libpng-1.26.30

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
new file mode 100644 (file)
index 0000000..6b75665
--- /dev/null
+++ b/archive-patches/libpng-1.26.30-fix-compile-on-arm.patch
@@ -0,0 +1,11 @@
+--- 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/libraries.mk b/make/libraries.mk
index a86c90d880eaa697be4608423c0ceeef0aa21e66..d1e7ae8f0ca80a6b21dd5fcd302b00d9c4edda33 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -248,6 +248,7 @@ $(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 && \
+               $(PATCH)/libpng-1.26.30-fix-compile-on-arm.patch && \
                $(CONFIGURE) \
                        --prefix=$(TARGETPREFIX) \
                        --build=$(BUILD) \

diff --git a/make/versions.mk b/make/versions.mk
index eaadc3b119bd9fcf753a40375e53356376348351..11f707e996e22db20b65f63570a6c59cfd85606c 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -69,7 +69,7 @@ JPEG_TURBO_VER = 1.4.2
 LIBDVBSI_GIT=ff57e5
 
 # libpng; reference library for reading and writing PNGs
-PNG_VER=1.6.29
+PNG_VER=1.6.30
 
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.22