From 45ad37b31b37ed7a67e08043071979b6e7b0916d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 16 May 2016 16:14:12 -0500 Subject: [PATCH] [libpng16] Removed contrib/timepng from default build; it does not build on platforms that don't supply clock_gettime(). --- ANNOUNCE | 22 +++++++++++++--------- CHANGES | 4 ++++ Makefile.am | 6 +----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8bc7994dc..681017d00 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.22rc01 - May 14, 2016 +Libpng 1.6.22rc02 - May 16, 2016 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.22rc01.tar.xz (LZMA-compressed, recommended) - 1.6.22rc01.tar.gz + 1.6.22rc02.tar.xz (LZMA-compressed, recommended) + 1.6.22rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1622r01.7z (LZMA-compressed, recommended) - lp1622r01.zip + lp1622r02.7z (LZMA-compressed, recommended) + lp1622r02.zip Other information: - 1.6.22rc01-README.txt - 1.6.22rc01-LICENSE.txt - libpng-1.6.22rc01-*.asc (armored detached GPG signatures) + 1.6.22rc02-README.txt + 1.6.22rc02-LICENSE.txt + libpng-1.6.22rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.21): @@ -99,9 +99,13 @@ Version 1.6.22beta06 [May 5, 2016] Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC, Fixed pnglibconf.c compilation on OS X including the sysroot path. -Version 1.6.22rcp1 [May 14, 2016] +Version 1.6.22rc01 [May 14, 2016] No changes. +Version 1.6.22rc02 [May 16, 2016] + Removed contrib/timepng from default build; it does not build on platforms + that don't supply clock_gettime(). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index e6f39191f..2a6aefa28 100644 --- a/CHANGES +++ b/CHANGES @@ -5562,6 +5562,10 @@ Version 1.6.22beta06 [May 5, 2016] Version 1.6.22rc01 [May 14, 2016] No changes. +Version 1.6.22rc02 [May 16, 2016] + Removed contrib/timepng from default build; it does not build on platforms + that don't supply clock_gettime(). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/Makefile.am b/Makefile.am index 51685ce8d..54f8d638a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ ACLOCAL_AMFLAGS = -I scripts # test programs - run on make check, make distcheck -check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage timepng +check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage # Utilities - installed bin_PROGRAMS= pngfix png-fix-itxt @@ -42,9 +42,6 @@ pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngimage_SOURCES = contrib/libtests/pngimage.c pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la -timepng_SOURCES = contrib/libtests/timepng.c -timepng_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - pngfix_SOURCES = contrib/tools/pngfix.c pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la @@ -223,7 +220,6 @@ contrib/libtests/pngimage.o: pnglibconf.h contrib/libtests/pngvalid.o: pnglibconf.h contrib/libtests/readpng.o: pnglibconf.h contrib/libtests/tarith.o: pnglibconf.h -contrib/libtests/timepng.o: pnglibconf.h contrib/tools/makesRGB.o: pnglibconf.h contrib/tools/pngfix.o: pnglibconf.h