- libpng 1.6.32

archive-patches/libpng-Disable-pngfix-and-png-fix-itxt.patch

@@ -0,0 +1,47 @@
+From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Thu, 26 May 2016 16:26:18 -0300
+Subject: [PATCH] Disable pngfix and png-fix-itxt
+
+Disable the new pngfix and png-fix-itxt tools: they take up space, fail
+to build on some oddball toolchain configurations and aren't
+expected/needed in a non-interactive embedded system.
+
+[Julien: update for 1.6.25]
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7212951..3430dca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@ check_PROGRAMS += timepng
+ 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,
+diff --git a/Makefile.in b/Makefile.in
+index a66f6aa..4e67782 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \
+ 	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)
++bin_PROGRAMS =
+ @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\
+ @PNG_ARM_NEON_TRUE@	arm/filter_neon.S arm/filter_neon_intrinsics.c
+ 
+-- 
+2.7.3
+

make/archives.mk

@@ -134,7 +134,7 @@ ZLIB_VER=1.2.11
 $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz:
 	$(WGET) http://zlib.net/zlib-$(ZLIB_VER).tar.gz
 
-LIBPNG_VER=1.6.31
+LIBPNG_VER=1.6.32
 $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz:
 	$(WGET) http://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VER)/libpng-$(LIBPNG_VER).tar.xz
 

make/system-libs.mk

@@ -135,17 +135,17 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(
 $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGETPREFIX)
 	$(UNTAR)/libpng-$(LIBPNG_VER).tar.xz
 	pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER) && \
+		$(PATCH)/libpng-Disable-pngfix-and-png-fix-itxt.patch && \
 		$(CONFIGURE) \
 			--prefix=$(TARGETPREFIX) \
 			--bindir=$(HOSTPREFIX)/bin \
 			--mandir=$(BUILD_TMP)/.remove \
 			--enable-silent-rules \
+			--disable-arm-neon \
 			--disable-static && \
 		ECHO=echo $(MAKE) all && \
 		make install
 	$(REMOVE)/libpng-$(LIBPNG_VER)
-	rm -rf $(HOSTPREFIX)/bin/png-fix-itxt
-	rm -rf $(HOSTPREFIX)/bin/pngfix
 	touch $@
 
 $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGETPREFIX)