bump version libpng-1.6.21

diff --git a/make/archives.mk b/make/archives.mk
index b39cc921839ed03eb6c4f9a3429de3b274e73616..766ca9057c7ff83acfaba08a767ac8b5418e94e7 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-1.6.8.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libpng-1.6.8.tar.gz
+$(ARCHIVE)/libpng-$(PNG_VER).tar.xz:
+       $(WGET) http://download.sourceforge.net/libpng/$(notdir $@)
 
 $(ARCHIVE)/hotplug.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/hotplug.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 99bc18df3f0e0a359ee213c026f600a9613c0d25..4258ccbaba700b11dfa6bd1f5346db2c05254980 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -218,13 +218,18 @@ $(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGE
        $(REMOVE)/freetype-$(FREETYPE_VER)
        touch $@
 
-$(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-1.6.8.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/libpng-1.6.8.tar.gz
-       pushd $(BUILD_TMP)/libpng-1.6.8 && \
-               $(CONFIGURE) --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) --bindir=$(HOSTPREFIX)/bin --mandir=$(BUILD_TMP)/libpng-1.6.8/tmpman && \
+$(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(PNG_VER).tar.xz | $(TARGETPREFIX)
+       $(UNTAR)/libpng-$(PNG_VER).tar.xz
+       pushd $(BUILD_TMP)/libpng-$(PNG_VER) && \
+               $(CONFIGURE) \
+                       --prefix=$(TARGETPREFIX) \
+                       --build=$(BUILD) \
+                       --host=$(TARGET) \
+                       --bindir=$(HOSTPREFIX)/bin \
+                       --mandir=$(BUILD_TMP)/libpng-$(PNG_VER)/tmpman && \
                ECHO=echo $(MAKE) all && \
                $(MAKE) install
-       $(REMOVE)/libpng-1.6.8
+       $(REMOVE)/libpng-$(PNG_VER)
        touch $@
 
 $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index b7ac46b3661bf6a304541b03724a637d25b6066c..94b643f34055c2a10dab2a56fd2aa2cb5df6ea8d 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -50,6 +50,9 @@ JPEG_TURBO_VER = 1.4.2
 # libdvbsi++; libdvbsi++ is a open source C++ library for parsing DVB Service Information and MPEG-2 Program Specific Information.
 LIBDVBSI_VER=0.3.7
 
+# libpng; reference library for reading and writing PNGs
+PNG_VER=1.6.21
+
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.19