libpng: updated to 1.6.21
This commit is contained in:
Fredrik Rinnestam
parent
3d5bcc7491
commit
0e9623589d
@ -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.20.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.20.0
|
||||
-rwxr-xr-x root/root usr/lib/libpng16.so.16.20.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.21.0
|
||||
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.21.0
|
||||
-rwxr-xr-x root/root usr/lib/libpng16.so.16.21.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 @@
|
||||
935fa62557ba6f547ccad74d261d11c4 libpng-1.6.20-apng.patch
|
||||
3968acb7c66ef81a9dab867f35d0eb4b libpng-1.6.20.tar.xz
|
||||
8d3fc58da3c32fefe253cd531e013632 libpng-1.6.21-apng.patch
|
||||
3bacb4728f6694a64ad9052769d6a4ce libpng-1.6.21.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib
|
||||
|
||||
name=libpng
|
||||
version=1.6.20
|
||||
version=1.6.21
|
||||
release=1
|
||||
source=(http://download.sourceforge.net/$name/$name-$version.tar.xz \
|
||||
$name-$version-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.20, December 3, 2015, are
|
||||
libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
|
||||
Index: pngread.c
|
||||
===================================================================
|
||||
--- pngread.c
|
||||
@ -295,13 +295,14 @@ Index: png.c
|
||||
===================================================================
|
||||
--- png.c
|
||||
+++ png.c
|
||||
@@ -775,16 +775,20 @@
|
||||
@@ -775,17 +775,21 @@
|
||||
#else
|
||||
# ifdef __STDC__
|
||||
return PNG_STRING_NEWLINE \
|
||||
- "libpng version 1.6.20 - December 3, 2015" PNG_STRING_NEWLINE \
|
||||
+ "libpng version 1.6.20+apng - December 3, 2015" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||
- "libpng version 1.6.21 - January 15, 2016" PNG_STRING_NEWLINE \
|
||||
+ "libpng version 1.6.21+apng - January 15, 2016" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
|
||||
PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||
- PNG_STRING_NEWLINE;
|
||||
@ -309,9 +310,9 @@ Index: png.c
|
||||
+ "Portions Copyright (c) 2006-2007 Andrew Smith" PNG_STRING_NEWLINE \
|
||||
+ "Portions Copyright (c) 2008-2015 Max Stepin" PNG_STRING_NEWLINE ;
|
||||
# else
|
||||
- return "libpng version 1.6.20 - December 3, 2015\
|
||||
+ return "libpng version 1.6.20+apng - December 3, 2015\
|
||||
Copyright (c) 1998-2015 Glenn Randers-Pehrson\
|
||||
- return "libpng version 1.6.21 - January 15, 2016\
|
||||
+ return "libpng version 1.6.21+apng - January 15, 2016\
|
||||
Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
|
||||
Copyright (c) 1996-1997 Andreas Dilger\
|
||||
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
||||
+ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\
|
||||
@ -336,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.20, December 3, 2015, are
|
||||
* libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
|
||||
@@ -282,9 +288,9 @@
|
||||
*/
|
||||
|
||||
/* Version information for png.h - this should match the version in png.c */
|
||||
-#define PNG_LIBPNG_VER_STRING "1.6.20"
|
||||
+#define PNG_LIBPNG_VER_STRING "1.6.20+apng"
|
||||
-#define PNG_LIBPNG_VER_STRING "1.6.21"
|
||||
+#define PNG_LIBPNG_VER_STRING "1.6.21+apng"
|
||||
#define PNG_HEADER_VERSION_STRING \
|
||||
- " libpng version 1.6.20 - December 3, 2015\n"
|
||||
+ " libpng version 1.6.20+apng - December 3, 2015\n"
|
||||
- " libpng version 1.6.21 - January 15, 2016\n"
|
||||
+ " libpng version 1.6.21+apng - January 15, 2016\n"
|
||||
|
||||
#define PNG_LIBPNG_VER_SONUM 16
|
||||
#define PNG_LIBPNG_VER_DLLNUM 16
|
||||
@ -1431,7 +1432,7 @@ Index: pngwutil.c
|
||||
===================================================================
|
||||
--- pngwutil.c
|
||||
+++ pngwutil.c
|
||||
@@ -901,6 +901,11 @@
|
||||
@@ -817,6 +817,11 @@
|
||||
/* Write the chunk */
|
||||
png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
|
||||
|
||||
@ -1443,7 +1444,7 @@ Index: pngwutil.c
|
||||
if ((png_ptr->do_filter) == PNG_NO_FILTERS)
|
||||
{
|
||||
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
|
||||
@@ -1082,7 +1087,15 @@
|
||||
@@ -998,7 +1003,15 @@
|
||||
optimize_cmf(data, png_image_size(png_ptr));
|
||||
#endif
|
||||
|
||||
@ -1459,7 +1460,7 @@ Index: pngwutil.c
|
||||
png_ptr->mode |= PNG_HAVE_IDAT;
|
||||
|
||||
png_ptr->zstream.next_out = data;
|
||||
@@ -1128,7 +1141,15 @@
|
||||
@@ -1044,7 +1057,15 @@
|
||||
optimize_cmf(data, png_image_size(png_ptr));
|
||||
#endif
|
||||
|
||||
@ -1475,7 +1476,7 @@ Index: pngwutil.c
|
||||
png_ptr->zstream.avail_out = 0;
|
||||
png_ptr->zstream.next_out = NULL;
|
||||
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
|
||||
@@ -1941,6 +1962,82 @@
|
||||
@@ -1857,6 +1878,82 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1558,7 +1559,7 @@ Index: pngwutil.c
|
||||
/* Initializes the row writing capability of libpng */
|
||||
void /* PRIVATE */
|
||||
png_write_start_row(png_structrp png_ptr)
|
||||
@@ -2706,4 +2803,39 @@
|
||||
@@ -2622,4 +2719,39 @@
|
||||
}
|
||||
#endif /* WRITE_FLUSH */
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user