libpng: updated to 1.6.30
This commit is contained in:
Fredrik Rinnestam
parent
0435d625d1
commit
81724dde88
@ -18,9 +18,9 @@ lrwxrwxrwx root/root usr/lib/libpng.la -> libpng16.la
|
||||
lrwxrwxrwx root/root usr/lib/libpng.so -> libpng16.so
|
||||
-rw-r--r-- root/root usr/lib/libpng16.a
|
||||
-rwxr-xr-x root/root usr/lib/libpng16.la
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.29.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.29.0
|
||||
-rwxr-xr-x root/root usr/lib/libpng16.so.16.29.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.30.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.30.0
|
||||
-rwxr-xr-x root/root usr/lib/libpng16.so.16.30.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng16.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libpng16.pc
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
3245dbd76ea91e1437507357b858ec97 libpng-1.6.29.tar.xz
|
||||
495d62ffdf23207d1530b7c53b7d94db libpng-apng.patch
|
||||
88a729d47eaf880d61a0ef90f4bd5e8f libpng-1.6.30.tar.xz
|
||||
6b5a7e5006cb2878a5e02253b1232f01 libpng-apng.patch
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/b8rt0a+4HrtZxBiE2r4fIfDG+WMHoswx8WIknFCUEnTZG/p7Jw4RqQyBwrnl1Dkfnmq5vr9FazYeXL8ubaOXAc=
|
||||
SHA256 (Pkgfile) = 7eaa8e58bf72a587875b2cc2dde7d2a53d7fcfb12871229a862d0ae2c36fe99c
|
||||
RWSE3ohX2g5d/TABSNrGdEeegHpX4ci3TxZC6YB+6m3cGwCQqcRQD6LBHvapBXSXAflt+IJqFZvtHI05rAvwPVi6Uwdcwj/cnQQ=
|
||||
SHA256 (Pkgfile) = 4d076940c7f5fb2e09a1277f549df9fd293c3ad1e61926a2abb21a15270cd956
|
||||
SHA256 (.footprint) = 11d94c8d15a3de68f815702be02afe26e43da9a02d31d58f1adc588af95935e0
|
||||
SHA256 (libpng-1.6.29.tar.xz) = 4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239
|
||||
SHA256 (libpng-apng.patch) = 55e6e5a0a7d5087fbd86a925b06706ee03e0586b18324b9473b89f779dccb567
|
||||
SHA256 (libpng-1.6.30.tar.xz) = 267c332ffff70cc599d3929207869f698798f1df143aa5f9597b007c14353666
|
||||
SHA256 (libpng-apng.patch) = dcd06e28aa87bccab074bd10207e1d0b0bc3502d7e3def5643e3eae7b72f003d
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib
|
||||
|
||||
name=libpng
|
||||
version=1.6.29
|
||||
version=1.6.30
|
||||
release=1
|
||||
source=(http://download.sourceforge.net/$name/$name-$version.tar.xz \
|
||||
$name-apng.patch)
|
||||
|
||||
@ -14,7 +14,7 @@ Index: LICENSE
|
||||
+
|
||||
This code is released under the libpng license.
|
||||
|
||||
libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are
|
||||
libpng versions 1.0.7, July 1, 2000 through 1.6.30, June 28, 2017 are
|
||||
Index: pngread.c
|
||||
===================================================================
|
||||
--- pngread.c
|
||||
@ -299,8 +299,8 @@ Index: png.c
|
||||
#else
|
||||
# ifdef __STDC__
|
||||
return PNG_STRING_NEWLINE \
|
||||
- "libpng version 1.6.29 - March 16, 2017" PNG_STRING_NEWLINE \
|
||||
+ "libpng version 1.6.29+apng - March 16, 2017" PNG_STRING_NEWLINE \
|
||||
- "libpng version 1.6.30 - June 28, 2017" PNG_STRING_NEWLINE \
|
||||
+ "libpng version 1.6.30+apng - June 28, 2017" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
|
||||
PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||
@ -310,8 +310,8 @@ Index: png.c
|
||||
+ "Portions Copyright (c) 2006-2007 Andrew Smith" PNG_STRING_NEWLINE \
|
||||
+ "Portions Copyright (c) 2008-2017 Max Stepin" PNG_STRING_NEWLINE ;
|
||||
# else
|
||||
- return "libpng version 1.6.29 - March 16, 2017\
|
||||
+ return "libpng version 1.6.29+apng - March 16, 2017\
|
||||
- return "libpng version 1.6.30 - June 28, 2017\
|
||||
+ return "libpng version 1.6.30+apng - June 28, 2017\
|
||||
Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
|
||||
Copyright (c) 1996-1997 Andreas Dilger\
|
||||
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
||||
@ -337,16 +337,16 @@ Index: png.h
|
||||
+ *
|
||||
* This code is released under the libpng license.
|
||||
*
|
||||
* libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are
|
||||
* libpng versions 1.0.7, July 1, 2000 through 1.6.30, June 28, 2017 are
|
||||
@@ -309,8 +315,9 @@
|
||||
*/
|
||||
|
||||
/* Version information for png.h - this should match the version in png.c */
|
||||
-#define PNG_LIBPNG_VER_STRING "1.6.29"
|
||||
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29 - March 16, 2017\n"
|
||||
+#define PNG_LIBPNG_VER_STRING "1.6.29+apng"
|
||||
-#define PNG_LIBPNG_VER_STRING "1.6.30"
|
||||
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30 - June 28, 2017\n"
|
||||
+#define PNG_LIBPNG_VER_STRING "1.6.30+apng"
|
||||
+#define PNG_HEADER_VERSION_STRING \
|
||||
+ " libpng version 1.6.29+apng - March 16, 2017\n"
|
||||
+ " libpng version 1.6.30+apng - June 28, 2017\n"
|
||||
|
||||
#define PNG_LIBPNG_VER_SONUM 16
|
||||
#define PNG_LIBPNG_VER_DLLNUM 16
|
||||
@ -493,7 +493,7 @@ Index: pngpriv.h
|
||||
===================================================================
|
||||
--- pngpriv.h
|
||||
+++ pngpriv.h
|
||||
@@ -616,6 +616,10 @@
|
||||
@@ -625,6 +625,10 @@
|
||||
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
|
||||
/* 0x4000U (unused) */
|
||||
#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
|
||||
@ -504,7 +504,7 @@ Index: pngpriv.h
|
||||
|
||||
/* Flags for the transformations the PNG library does on the image data */
|
||||
#define PNG_BGR 0x0001U
|
||||
@@ -851,6 +855,16 @@
|
||||
@@ -860,6 +864,16 @@
|
||||
#define png_tRNS PNG_U32(116, 82, 78, 83)
|
||||
#define png_zTXt PNG_U32(122, 84, 88, 116)
|
||||
|
||||
@ -521,7 +521,7 @@ Index: pngpriv.h
|
||||
/* The following will work on (signed char*) strings, whereas the get_uint_32
|
||||
* macro will fail on top-bit-set values because of the sign extension.
|
||||
*/
|
||||
@@ -1589,6 +1603,49 @@
|
||||
@@ -1598,6 +1612,49 @@
|
||||
|
||||
#endif /* PROGRESSIVE_READ */
|
||||
|
||||
@ -946,7 +946,7 @@ Index: pngset.c
|
||||
}
|
||||
|
||||
#ifdef PNG_oFFs_SUPPORTED
|
||||
@@ -1110,6 +1115,146 @@
|
||||
@@ -1111,6 +1116,146 @@
|
||||
}
|
||||
#endif /* sPLT */
|
||||
|
||||
@ -1109,7 +1109,7 @@ Index: pngrutil.c
|
||||
/* Set internal variables */
|
||||
png_ptr->width = width;
|
||||
png_ptr->height = height;
|
||||
@@ -2761,6 +2766,180 @@
|
||||
@@ -2764,6 +2769,180 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1290,7 +1290,7 @@ Index: pngrutil.c
|
||||
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
|
||||
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
|
||||
static int
|
||||
@@ -4023,6 +4202,38 @@
|
||||
@@ -4032,6 +4211,38 @@
|
||||
uInt avail_in;
|
||||
png_bytep buffer;
|
||||
|
||||
@ -1329,7 +1329,7 @@ Index: pngrutil.c
|
||||
while (png_ptr->idat_size == 0)
|
||||
{
|
||||
png_crc_finish(png_ptr, 0);
|
||||
@@ -4034,6 +4245,7 @@
|
||||
@@ -4043,6 +4254,7 @@
|
||||
if (png_ptr->chunk_name != png_IDAT)
|
||||
png_error(png_ptr, "Not enough image data");
|
||||
}
|
||||
@ -1337,7 +1337,7 @@ Index: pngrutil.c
|
||||
|
||||
avail_in = png_ptr->IDAT_read_size;
|
||||
|
||||
@@ -4097,6 +4309,9 @@
|
||||
@@ -4106,6 +4318,9 @@
|
||||
|
||||
png_ptr->mode |= PNG_AFTER_IDAT;
|
||||
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
|
||||
@ -1347,7 +1347,7 @@ Index: pngrutil.c
|
||||
|
||||
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
|
||||
png_chunk_benign_error(png_ptr, "Extra compressed data");
|
||||
@@ -4535,4 +4750,80 @@
|
||||
@@ -4544,4 +4759,80 @@
|
||||
|
||||
png_ptr->flags |= PNG_FLAG_ROW_INIT;
|
||||
}
|
||||
@ -1444,39 +1444,43 @@ Index: pngwutil.c
|
||||
if ((png_ptr->do_filter) == PNG_NO_FILTERS)
|
||||
{
|
||||
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
|
||||
@@ -1003,7 +1008,15 @@
|
||||
optimize_cmf(data, png_image_size(png_ptr));
|
||||
@@ -1004,7 +1009,17 @@
|
||||
#endif
|
||||
|
||||
if (size > 0)
|
||||
+#ifdef PNG_WRITE_APNG_SUPPORTED
|
||||
+ if (png_ptr->num_frames_written == 0)
|
||||
+ {
|
||||
+ if (png_ptr->num_frames_written == 0)
|
||||
+#endif
|
||||
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
|
||||
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
|
||||
+#ifdef PNG_WRITE_APNG_SUPPORTED
|
||||
+ else
|
||||
+ png_write_fdAT(png_ptr, data, size);
|
||||
+ else
|
||||
+ png_write_fdAT(png_ptr, data, size);
|
||||
+ }
|
||||
+#endif /* WRITE_APNG */
|
||||
+
|
||||
png_ptr->mode |= PNG_HAVE_IDAT;
|
||||
|
||||
png_ptr->zstream.next_out = data;
|
||||
@@ -1049,7 +1062,15 @@
|
||||
optimize_cmf(data, png_image_size(png_ptr));
|
||||
@@ -1051,7 +1066,17 @@
|
||||
#endif
|
||||
|
||||
if (size > 0)
|
||||
+#ifdef PNG_WRITE_APNG_SUPPORTED
|
||||
+ if (png_ptr->num_frames_written == 0)
|
||||
+ {
|
||||
+ if (png_ptr->num_frames_written == 0)
|
||||
+#endif
|
||||
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
|
||||
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
|
||||
+#ifdef PNG_WRITE_APNG_SUPPORTED
|
||||
+ else
|
||||
+ png_write_fdAT(png_ptr, data, size);
|
||||
+ else
|
||||
+ png_write_fdAT(png_ptr, data, size);
|
||||
+ }
|
||||
+#endif /* WRITE_APNG */
|
||||
+
|
||||
png_ptr->zstream.avail_out = 0;
|
||||
png_ptr->zstream.next_out = NULL;
|
||||
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
|
||||
@@ -1863,6 +1884,82 @@
|
||||
@@ -1865,6 +1890,82 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1559,7 +1563,7 @@ Index: pngwutil.c
|
||||
/* Initializes the row writing capability of libpng */
|
||||
void /* PRIVATE */
|
||||
png_write_start_row(png_structrp png_ptr)
|
||||
@@ -2757,4 +2854,39 @@
|
||||
@@ -2759,4 +2860,39 @@
|
||||
}
|
||||
#endif /* WRITE_FLUSH */
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user