FPII-2034: DO NOT MERGE Update libpng to 1.6.20
DO NOT MERGE Update libpng to 1.6.20
BUG:23265085
Change-Id: I2fc2106965c789a54f04412e9c63a0901b0c1e71
(cherry picked from commit 0b39f202aaedd3029e4270d2af7d58ba6634f9cd)
diff --git a/Makefile.am b/Makefile.am
index 052e596..73097db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,23 +51,17 @@
tests/pngvalid-gamma-expand16-background\
tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\
tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\
- tests/pngvalid-progressive-interlace-size\
+ tests/pngvalid-progressive-size\
tests/pngvalid-progressive-interlace-standard\
- tests/pngvalid-progressive-interlace-transform\
+ tests/pngvalid-transform\
tests/pngvalid-progressive-standard tests/pngvalid-standard\
- tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\
- tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\
- tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\
- tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\
- tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\
- tests/pngstest-error tests/pngunknown-IDAT\
+ tests/pngstest-1.8 tests/pngstest-1.8-alpha tests/pngstest-linear\
+ tests/pngstest-linear-alpha tests/pngstest-none tests/pngstest-none-alpha\
+ tests/pngstest-sRGB tests/pngstest-sRGB-alpha tests/pngunknown-IDAT\
tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\
tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg\
tests/pngimage-quick tests/pngimage-full
-# These tests are expected, and required, to fail:
-XFAIL_TESTS = tests/pngstest-error
-
# man pages
dist_man_MANS= libpng.3 libpngpf.3 png.5
@@ -129,11 +123,12 @@
$(TESTS) $(XFAIL_TESTS) tests/pngstest \
CMakeLists.txt example.c libpng-manual.txt
-SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
+SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk
CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
- check.new pnglibconf.* pngprefix.h symbols.new pngtest-log.txt \
+ check.new pnglibconf.h pngprefix.h symbols.new pngtest-log.txt \
+ pnglibconf.out pnglibconf.c pnglibconf.pre pnglibconf.dfn \
$(SCRIPT_CLEANFILES)
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
@@ -152,7 +147,7 @@
# checks for this and sets DFNCPP appropriately.
DFNCPP = @DFNCPP@
-SUFFIXES = .chk .dfn .out
+SUFFIXES = .chk .out
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -237,18 +232,17 @@
SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
endif
-.dfn.out:
- rm -f $@ $*.c $*.tf[12]
+.c.out:
+ rm -f $@ $*.tf[12]
test -d scripts || mkdir scripts || test -d scripts
- echo '#include "$<"' >$*.c
$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
- $(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1
+ $(CPPFLAGS) $(SYMBOL_CFLAGS) $< > $*.tf1
$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
- rm -f $*.c $*.tf1
+ rm -f $*.tf1
mv $*.tf2 $@
-# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
+# The .c file for pnglibconf.h is machine generated
+pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ $*.tf[45]
$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
@@ -268,7 +262,7 @@
# used on demand to regenerate the standard header, CPPFLAGS should
# be empty - no non-standard defines
-scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+scripts/pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
rm -f $@ pnglibconf.tf[67]
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\