daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

libpng: updated to version 1.6.43

Browse Source
This commit is contained in:
Juergen Daubert 2024-02-24 10:50:27 +01:00
parent 3bdfdf61fe
commit 80c7eac2ac
4 changed files with 348 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpng/.footprint
View File

@ -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.41.0
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.41.0
-rwxr-xr-x root/root usr/lib/libpng16.so.16.41.0
lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.43.0
lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.43.0
-rwxr-xr-x root/root usr/lib/libpng16.so.16.43.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

10
libpng/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/aVE7CtSyNp9cmpbyyK6xxo3nfqfhDHt9GlsKKK85beEc2+AocdfiVwLi7sIqwbbV2Dlk2U8T2frKOxQeY9YeAU=
SHA256 (Pkgfile) = 66bb2e019b9202a1cca49ff02db4a37e909a1eb88602192e8917733cd7b1f166
SHA256 (.footprint) = 62ccf71b897ec2c3059522e68eb81368ecd97894b148c93469da1fd3e231c732
SHA256 (libpng-1.6.42.tar.xz) = c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450
SHA256 (libpng-apng.patch) = 2234b5138069824e30e84357a36bd725c2cb3fd589d5c2135ecbe60b0b4800d8
RWSE3ohX2g5d/aSNnlVgArh6gpZayuRsoxFU5vZD5dKwXuNdjVRqhbLSBZxlNYCeBZredKgIvj6WRvDDd7lSEI76Z53qY925LAs=
SHA256 (Pkgfile) = a20bf0cbff1a764111973211989ba22589582231b4cabd8a3d0b6a14263c99d5
SHA256 (.footprint) = fd3b45a97540f1420eb9f86499e507ec3850c1f7e7506582ef08e8750243139f
SHA256 (libpng-1.6.43.tar.xz) = 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c
SHA256 (libpng-apng.patch) = b351225f51e6080b1e91169968e7ad2f47cafc4ada77674e4c77a224d97c092f

2
libpng/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: zlib
name=libpng
version=1.6.42
version=1.6.43
release=1
source=(http://download.sourceforge.net/$name/$name-$version.tar.xz
$name-apng.patch)

419
libpng/libpng-apng.patch
View File

@ -1,7 +1,7 @@
diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
--- libpng-1.6.34.org/png.h 2017-09-29 18:55:30.653711999 +0900
+++ libpng-1.6.34/png.h 2017-09-29 18:56:30.306850103 +0900
@@ -361,6 +361,10 @@
diff -Nru libpng-1.6.43.orig/png.h libpng-1.6.43/png.h
--- libpng-1.6.43.orig/png.h 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/png.h 2024-02-24 10:42:18.501729536 +0100
@@ -329,6 +329,10 @@
# include "pnglibconf.h"
#endif
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
#ifndef PNG_VERSION_INFO_ONLY
/* Machine specific configuration. */
# include "pngconf.h"
@@ -456,6 +460,17 @@
@@ -424,6 +428,17 @@
* See pngconf.h for base types that vary by machine/system
*/
@ -30,7 +30,7 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
@@ -777,6 +792,10 @@
@@ -745,6 +760,10 @@
#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
@ -41,7 +41,7 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
@@ -814,6 +833,10 @@
@@ -782,6 +801,10 @@
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
@ -52,7 +52,7 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
/* The following callback receives png_uint_32 row_number, int pass for the
* png_bytep data of the row. When transforming an interlaced image the
@@ -3257,6 +3280,74 @@
@@ -3229,6 +3252,74 @@
/*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS
******************************************************************************/
@ -127,7 +127,7 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
* defs, and in scripts/symbols.def.
@@ -3266,7 +3357,11 @@
@@ -3238,7 +3329,11 @@
* one to use is one more than this.)
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
@ -139,10 +139,10 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
#endif
#ifdef __cplusplus
diff -Naru libpng-1.6.34.org/pngget.c libpng-1.6.34/pngget.c
--- libpng-1.6.34.org/pngget.c 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pngget.c 2017-09-29 18:56:30.286848380 +0900
@@ -1245,4 +1245,166 @@
diff -Nru libpng-1.6.43.orig/pngget.c libpng-1.6.43/pngget.c
--- libpng-1.6.43.orig/pngget.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngget.c 2024-02-24 10:42:18.501729536 +0100
@@ -1264,4 +1264,166 @@
# endif
#endif
@ -309,9 +309,9 @@ diff -Naru libpng-1.6.34.org/pngget.c libpng-1.6.34/pngget.c
+}
+#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */
diff -Naru libpng-1.6.34.org/pnginfo.h libpng-1.6.34/pnginfo.h
--- libpng-1.6.34.org/pnginfo.h 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pnginfo.h 2017-09-29 18:56:30.286848380 +0900
diff -Nru libpng-1.6.43.orig/pnginfo.h libpng-1.6.43/pnginfo.h
--- libpng-1.6.43.orig/pnginfo.h 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pnginfo.h 2024-02-24 10:42:18.501729536 +0100
@@ -263,5 +263,18 @@
png_bytepp row_pointers; /* the image bits */
#endif
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.34.org/pnginfo.h libpng-1.6.34/pnginfo.h
+
};
#endif /* PNGINFO_H */
diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
--- libpng-1.6.34.org/pngpread.c 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pngpread.c 2017-09-29 18:56:30.286848380 +0900
diff -Nru libpng-1.6.43.orig/pngpread.c libpng-1.6.43/pngpread.c
--- libpng-1.6.43.orig/pngpread.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngpread.c 2024-02-24 10:42:18.501729536 +0100
@@ -195,6 +195,106 @@
chunk_name = png_ptr->chunk_name;
@ -451,7 +451,7 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
png_ptr->idat_size = png_ptr->push_length;
png_ptr->process_mode = PNG_READ_IDAT_MODE;
png_push_have_info(png_ptr, info_ptr);
@@ -406,6 +509,30 @@
@@ -414,6 +517,30 @@
png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
@ -482,7 +482,7 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
else
{
@@ -539,7 +666,11 @@
@@ -547,7 +674,11 @@
png_byte chunk_tag[4];
/* TODO: this code can be commoned up with the same code in push_read */
@ -494,7 +494,7 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
png_push_fill_buffer(png_ptr, chunk_length, 4);
png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
png_reset_crc(png_ptr);
@@ -547,17 +678,64 @@
@@ -555,17 +686,64 @@
png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
@ -559,7 +559,7 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
}
if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
@@ -631,6 +809,15 @@
@@ -639,6 +817,15 @@
if (!(buffer_length > 0) || buffer == NULL)
png_error(png_ptr, "No IDAT data (internal error)");
@ -575,7 +575,7 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
/* This routine must process all the data it has been given
* before returning, calling the row callback as required to
* handle the uncompressed results.
@@ -1085,6 +1272,18 @@
@@ -1093,6 +1280,18 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@ -594,12 +594,12 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
{
diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/pngpriv.h
--- libpng-1.6.34.org/pngpriv.h 2017-09-29 18:53:22.699691754 +0900
+++ libpng-1.6.34/pngpriv.h 2017-09-29 18:56:30.286848380 +0900
@@ -628,6 +628,10 @@
diff -Nru libpng-1.6.43.orig/pngpriv.h libpng-1.6.43/pngpriv.h
--- libpng-1.6.43.orig/pngpriv.h 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngpriv.h 2024-02-24 10:42:18.501729536 +0100
@@ -662,6 +662,10 @@
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
/* 0x4000U (unused) */
#define PNG_WROTE_eXIf 0x4000U
#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
+#ifdef PNG_APNG_SUPPORTED
+#define PNG_HAVE_acTL 0x10000U
@ -608,7 +608,7 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001U
@@ -864,6 +868,16 @@
@@ -898,6 +902,16 @@
#define png_tRNS PNG_U32(116, 82, 78, 83)
#define png_zTXt PNG_U32(122, 84, 88, 116)
@ -625,7 +625,7 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/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.
*/
@@ -1635,6 +1649,47 @@
@@ -1703,6 +1717,47 @@
*/
#endif
@ -673,9 +673,9 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/pngpriv.h
/* Added at libpng version 1.4.0 */
#ifdef PNG_COLORSPACE_SUPPORTED
/* These internal functions are for maintaining the colorspace structure within
diff -Naru libpng-1.6.34.org/pngread.c libpng-1.6.34/pngread.c
--- libpng-1.6.34.org/pngread.c 2017-09-29 18:53:22.699691754 +0900
+++ libpng-1.6.34/pngread.c 2017-09-29 18:56:30.286848380 +0900
diff -Nru libpng-1.6.43.orig/pngread.c libpng-1.6.43/pngread.c
--- libpng-1.6.43.orig/pngread.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngread.c 2024-02-24 10:42:18.501729536 +0100
@@ -161,6 +161,9 @@
else if (chunk_name == png_IDAT)
@ -777,10 +777,10 @@ diff -Naru libpng-1.6.34.org/pngread.c libpng-1.6.34/pngread.c
/* Optional call to update the users info_ptr structure */
void PNGAPI
png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
--- libpng-1.6.34.org/pngrutil.c 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngrutil.c 2017-09-29 18:56:30.287848466 +0900
@@ -865,6 +865,11 @@
diff -Nru libpng-1.6.43.orig/pngrutil.c libpng-1.6.43/pngrutil.c
--- libpng-1.6.43.orig/pngrutil.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngrutil.c 2024-02-24 10:42:18.501729536 +0100
@@ -863,6 +863,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -792,7 +792,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2840,6 +2845,179 @@
@@ -2857,6 +2862,179 @@
}
#endif
@ -972,7 +972,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
static int
@@ -4145,7 +4323,38 @@
@@ -4165,7 +4343,38 @@
{
uInt avail_in;
png_bytep buffer;
@ -983,7 +983,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+ {
+ png_crc_finish(png_ptr, bytes_to_skip);
+ bytes_to_skip = 0;
+
+ png_ptr->idat_size = png_read_chunk_header(png_ptr);
+ if (png_ptr->num_frames_read == 0)
+ {
@ -1001,7 +1001,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+ bytes_to_skip = png_ptr->idat_size;
+ continue;
+ }
+
+ png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
+
+ png_ptr->idat_size -= 4;
@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
while (png_ptr->idat_size == 0)
{
png_crc_finish(png_ptr, 0);
@@ -4157,7 +4366,7 @@
@@ -4177,7 +4386,7 @@
if (png_ptr->chunk_name != png_IDAT)
png_error(png_ptr, "Not enough image data");
}
@ -1020,7 +1020,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
avail_in = png_ptr->IDAT_read_size;
if (avail_in > png_ptr->idat_size)
@@ -4220,6 +4429,9 @@
@@ -4240,6 +4449,9 @@
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
png_chunk_benign_error(png_ptr, "Extra compressed data");
@@ -4658,4 +4870,80 @@
@@ -4677,4 +4889,80 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1111,10 +1111,10 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */
diff -Naru libpng-1.6.34.org/pngset.c libpng-1.6.34/pngset.c
--- libpng-1.6.34.org/pngset.c 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngset.c 2017-09-29 18:56:30.292848897 +0900
@@ -288,6 +288,11 @@
diff -Nru libpng-1.6.43.orig/pngset.c libpng-1.6.43/pngset.c
--- libpng-1.6.43.orig/pngset.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngset.c 2024-02-24 10:42:18.501729536 +0100
@@ -280,6 +280,11 @@
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
@ -1126,7 +1126,7 @@ diff -Naru libpng-1.6.34.org/pngset.c libpng-1.6.34/pngset.c
}
#ifdef PNG_oFFs_SUPPORTED
@@ -1158,6 +1163,147 @@
@@ -1151,6 +1156,147 @@
}
#endif /* sPLT */
@ -1274,10 +1274,10 @@ diff -Naru libpng-1.6.34.org/pngset.c libpng-1.6.34/pngset.c
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
static png_byte
check_location(png_const_structrp png_ptr, int location)
diff -Naru libpng-1.6.34.org/pngstruct.h libpng-1.6.34/pngstruct.h
--- libpng-1.6.34.org/pngstruct.h 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngstruct.h 2017-09-29 18:56:30.287848466 +0900
@@ -403,6 +403,27 @@
diff -Nru libpng-1.6.43.orig/pngstruct.h libpng-1.6.43/pngstruct.h
--- libpng-1.6.43.orig/pngstruct.h 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngstruct.h 2024-02-24 10:42:18.505062868 +0100
@@ -399,6 +399,27 @@
png_byte filter_type;
#endif
@ -1305,13 +1305,13 @@ diff -Naru libpng-1.6.34.org/pngstruct.h libpng-1.6.34/pngstruct.h
/* New members added in libpng-1.2.0 */
/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
diff -Naru libpng-1.6.34.org/pngtest.c libpng-1.6.34/pngtest.c
--- libpng-1.6.34.org/pngtest.c 2017-09-29 18:55:30.654712085 +0900
+++ libpng-1.6.34/pngtest.c 2017-09-29 18:56:30.287848466 +0900
@@ -875,6 +875,10 @@
volatile int num_passes;
int pass;
diff -Nru libpng-1.6.43.orig/pngtest.c libpng-1.6.43/pngtest.c
--- libpng-1.6.43.orig/pngtest.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngtest.c 2024-02-24 10:42:46.448396344 +0100
@@ -882,6 +882,10 @@
int bit_depth, color_type;
user_chunk_info my_user_chunk_data;
int pass, num_passes;
+#ifdef PNG_APNG_SUPPORTED
+ png_uint_32 num_frames;
+ png_uint_32 num_plays;
@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.34.org/pngtest.c libpng-1.6.34/pngtest.c
row_buf = NULL;
error_parameters.file_name = inname;
@@ -1381,6 +1385,22 @@
@@ -1380,6 +1384,22 @@
}
}
#endif
@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.34.org/pngtest.c libpng-1.6.34/pngtest.c
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
{
png_unknown_chunkp unknowns;
@@ -1461,6 +1481,110 @@
@@ -1439,6 +1459,110 @@
t_misc += (t_stop - t_start);
t_start = t_stop;
#endif
@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.34.org/pngtest.c libpng-1.6.34/pngtest.c
for (pass = 0; pass < num_passes; pass++)
{
# ifdef calc_pass_height
diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
--- libpng-1.6.34.org/pngwrite.c 2017-09-29 18:53:22.702692013 +0900
+++ libpng-1.6.34/pngwrite.c 2017-09-29 18:56:30.288848552 +0900
diff -Nru libpng-1.6.43.orig/pngwrite.c libpng-1.6.43/pngwrite.c
--- libpng-1.6.43.orig/pngwrite.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngwrite.c 2024-02-24 10:42:18.505062868 +0100
@@ -128,6 +128,10 @@
* the application continues writing the PNG. So check the 'invalid'
* flag here too.
@ -1467,7 +1467,7 @@ diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
#ifdef PNG_GAMMA_SUPPORTED
# ifdef PNG_WRITE_gAMA_SUPPORTED
if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
@@ -370,6 +374,11 @@
@@ -374,6 +378,11 @@
png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
#endif
@ -1479,7 +1479,7 @@ diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
{
@@ -1461,6 +1470,43 @@
@@ -1484,6 +1493,43 @@
}
#endif
@ -1523,12 +1523,12 @@ diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
/* Initialize the write structure - general purpose utility. */
diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
--- libpng-1.6.34.org/pngwutil.c 2017-09-29 18:53:22.703692099 +0900
+++ libpng-1.6.34/pngwutil.c 2017-09-29 18:56:30.302849758 +0900
@@ -822,6 +822,11 @@
diff -Nru libpng-1.6.43.orig/pngwutil.c libpng-1.6.43/pngwutil.c
--- libpng-1.6.43.orig/pngwutil.c 2024-02-24 10:41:31.941729303 +0100
+++ libpng-1.6.43/pngwutil.c 2024-02-24 10:42:18.505062868 +0100
@@ -821,6 +821,11 @@
/* Write the chunk */
png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
png_write_complete_chunk(png_ptr, png_IHDR, buf, 13);
+#ifdef PNG_WRITE_APNG_SUPPORTED
+ png_ptr->first_frame_width = width;
@ -1538,7 +1538,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
if ((png_ptr->do_filter) == PNG_NO_FILTERS)
{
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
@@ -1003,8 +1008,17 @@
@@ -1002,8 +1007,17 @@
optimize_cmf(data, png_image_size(png_ptr));
#endif
@ -1558,7 +1558,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->zstream.next_out = data;
@@ -1051,7 +1065,17 @@
@@ -1050,7 +1064,17 @@
#endif
if (size > 0)
@ -1576,7 +1576,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
png_ptr->zstream.avail_out = 0;
png_ptr->zstream.next_out = NULL;
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
@@ -1887,6 +1911,82 @@
@@ -1885,6 +1909,82 @@
}
#endif
@ -1659,7 +1659,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structrp png_ptr)
@@ -2781,4 +2881,39 @@
@@ -2778,4 +2878,39 @@
}
#endif /* WRITE_FLUSH */
}
@ -1699,10 +1699,10 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
+}
+#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */
diff -Naru libpng-1.6.34.org/scripts/symbols.def libpng-1.6.34/scripts/symbols.def
--- libpng-1.6.34.org/scripts/symbols.def 2017-09-29 18:55:30.655712171 +0900
+++ libpng-1.6.34/scripts/symbols.def 2017-09-29 18:56:30.289848638 +0900
@@ -254,3 +254,23 @@
diff -Nru libpng-1.6.43.orig/scripts/symbols.def libpng-1.6.43/scripts/symbols.def
--- libpng-1.6.43.orig/scripts/symbols.def 2024-02-24 10:41:31.945062636 +0100
+++ libpng-1.6.43/scripts/symbols.def 2024-02-24 10:42:18.505062868 +0100
@@ -253,3 +253,23 @@
png_set_eXIf @247
png_get_eXIf_1 @248
png_set_eXIf_1 @249
@ -1726,3 +1726,262 @@ diff -Naru libpng-1.6.34.org/scripts/symbols.def libpng-1.6.34/scripts/symbols.d
+ png_set_progressive_frame_fn @267
+ png_write_frame_head @268
+ png_write_frame_tail @269
diff -Nru libpng-1.6.43.orig/scripts/symbols.def.orig libpng-1.6.43/scripts/symbols.def.orig
--- libpng-1.6.43.orig/scripts/symbols.def.orig 1970-01-01 01:00:00.000000000 +0100
+++ libpng-1.6.43/scripts/symbols.def.orig 2024-02-23 10:51:40.000000000 +0100
@@ -0,0 +1,255 @@
+;--------------------------------------------------------------
+; LIBPNG symbol list as a Win32 DEF file
+; Contains all the symbols that can be exported from libpng
+;--------------------------------------------------------------
+LIBRARY
+
+EXPORTS
+ png_access_version_number @1
+ png_set_sig_bytes @2
+ png_sig_cmp @3
+ png_create_read_struct @4
+ png_create_write_struct @5
+ png_get_compression_buffer_size @6
+ png_set_compression_buffer_size @7
+ png_set_longjmp_fn @8
+ png_longjmp @9
+ png_reset_zstream @10
+ png_create_read_struct_2 @11
+ png_create_write_struct_2 @12
+ png_write_sig @13
+ png_write_chunk @14
+ png_write_chunk_start @15
+ png_write_chunk_data @16
+ png_write_chunk_end @17
+ png_create_info_struct @18
+ png_info_init_3 @19
+ png_write_info_before_PLTE @20
+ png_write_info @21
+ png_read_info @22
+ png_convert_to_rfc1123 @23
+ png_convert_from_struct_tm @24
+ png_convert_from_time_t @25
+ png_set_expand @26
+ png_set_expand_gray_1_2_4_to_8 @27
+ png_set_palette_to_rgb @28
+ png_set_tRNS_to_alpha @29
+ png_set_bgr @30
+ png_set_gray_to_rgb @31
+ png_set_rgb_to_gray @32
+ png_set_rgb_to_gray_fixed @33
+ png_get_rgb_to_gray_status @34
+ png_build_grayscale_palette @35
+ png_set_strip_alpha @36
+ png_set_swap_alpha @37
+ png_set_invert_alpha @38
+ png_set_filler @39
+ png_set_add_alpha @40
+ png_set_swap @41
+ png_set_packing @42
+ png_set_packswap @43
+ png_set_shift @44
+ png_set_interlace_handling @45
+ png_set_invert_mono @46
+ png_set_background @47
+ png_set_strip_16 @48
+ png_set_quantize @49
+ png_set_gamma @50
+ png_set_flush @51
+ png_write_flush @52
+ png_start_read_image @53
+ png_read_update_info @54
+ png_read_rows @55
+ png_read_row @56
+ png_read_image @57
+ png_write_row @58
+ png_write_rows @59
+ png_write_image @60
+ png_write_end @61
+ png_read_end @62
+ png_destroy_info_struct @63
+ png_destroy_read_struct @64
+ png_destroy_write_struct @65
+ png_set_crc_action @66
+ png_set_filter @67
+ png_set_filter_heuristics @68
+ png_set_compression_level @69
+ png_set_compression_mem_level @70
+ png_set_compression_strategy @71
+ png_set_compression_window_bits @72
+ png_set_compression_method @73
+ png_init_io @74
+ png_set_error_fn @75
+ png_get_error_ptr @76
+ png_set_write_fn @77
+ png_set_read_fn @78
+ png_get_io_ptr @79
+ png_set_read_status_fn @80
+ png_set_write_status_fn @81
+ png_set_mem_fn @82
+ png_get_mem_ptr @83
+ png_set_read_user_transform_fn @84
+ png_set_write_user_transform_fn @85
+ png_set_user_transform_info @86
+ png_get_user_transform_ptr @87
+ png_set_read_user_chunk_fn @88
+ png_get_user_chunk_ptr @89
+ png_set_progressive_read_fn @90
+ png_get_progressive_ptr @91
+ png_process_data @92
+ png_progressive_combine_row @93
+ png_malloc @94
+ png_calloc @95
+ png_malloc_warn @96
+ png_free @97
+ png_free_data @98
+ png_data_freer @99
+ png_malloc_default @100
+ png_free_default @101
+ png_error @102
+ png_chunk_error @103
+ png_err @104
+ png_warning @105
+ png_chunk_warning @106
+ png_benign_error @107
+ png_chunk_benign_error @108
+ png_set_benign_errors @109
+ png_get_valid @110
+ png_get_rowbytes @111
+ png_get_rows @112
+ png_set_rows @113
+ png_get_channels @114
+ png_get_image_width @115
+ png_get_image_height @116
+ png_get_bit_depth @117
+ png_get_color_type @118
+ png_get_filter_type @119
+ png_get_interlace_type @120
+ png_get_compression_type @121
+ png_get_pixels_per_meter @122
+ png_get_x_pixels_per_meter @123
+ png_get_y_pixels_per_meter @124
+ png_get_pixel_aspect_ratio @125
+ png_get_x_offset_pixels @126
+ png_get_y_offset_pixels @127
+ png_get_x_offset_microns @128
+ png_get_y_offset_microns @129
+ png_get_signature @130
+ png_get_bKGD @131
+ png_set_bKGD @132
+ png_get_cHRM @133
+ png_get_cHRM_fixed @134
+ png_set_cHRM @135
+ png_set_cHRM_fixed @136
+ png_get_gAMA @137
+ png_get_gAMA_fixed @138
+ png_set_gAMA @139
+ png_set_gAMA_fixed @140
+ png_get_hIST @141
+ png_set_hIST @142
+ png_get_IHDR @143
+ png_set_IHDR @144
+ png_get_oFFs @145
+ png_set_oFFs @146
+ png_get_pCAL @147
+ png_set_pCAL @148
+ png_get_pHYs @149
+ png_set_pHYs @150
+ png_get_PLTE @151
+ png_set_PLTE @152
+ png_get_sBIT @153
+ png_set_sBIT @154
+ png_get_sRGB @155
+ png_set_sRGB @156
+ png_set_sRGB_gAMA_and_cHRM @157
+ png_get_iCCP @158
+ png_set_iCCP @159
+ png_get_sPLT @160
+ png_set_sPLT @161
+ png_get_text @162
+ png_set_text @163
+ png_get_tIME @164
+ png_set_tIME @165
+ png_get_tRNS @166
+ png_set_tRNS @167
+ png_get_sCAL @168
+ png_get_sCAL_s @169
+ png_set_sCAL @170
+ png_set_sCAL_s @171
+ png_set_keep_unknown_chunks @172
+ png_handle_as_unknown @173
+ png_set_unknown_chunks @174
+ png_set_unknown_chunk_location @175
+ png_get_unknown_chunks @176
+ png_set_invalid @177
+ png_read_png @178
+ png_write_png @179
+ png_get_copyright @180
+ png_get_header_ver @181
+ png_get_header_version @182
+ png_get_libpng_ver @183
+ png_permit_mng_features @184
+ png_set_strip_error_numbers @185
+ png_set_user_limits @186
+ png_get_user_width_max @187
+ png_get_user_height_max @188
+ png_set_chunk_cache_max @189
+ png_get_chunk_cache_max @190
+ png_set_chunk_malloc_max @191
+ png_get_chunk_malloc_max @192
+ png_get_pixels_per_inch @193
+ png_get_x_pixels_per_inch @194
+ png_get_y_pixels_per_inch @195
+ png_get_x_offset_inches @196
+ png_get_y_offset_inches @197
+ png_get_pHYs_dpi @198
+ png_get_io_state @199
+ png_get_uint_32 @201
+ png_get_uint_16 @202
+ png_get_int_32 @203
+ png_get_uint_31 @204
+ png_save_uint_32 @205
+ png_save_int_32 @206
+ png_save_uint_16 @207
+ png_set_gamma_fixed @208
+ png_set_filter_heuristics_fixed @209
+ png_get_pixel_aspect_ratio_fixed @210
+ png_get_x_offset_inches_fixed @211
+ png_get_y_offset_inches_fixed @212
+ png_set_sCAL_fixed @213
+ png_get_sCAL_fixed @214
+ png_set_background_fixed @215
+ png_get_io_chunk_type @216
+ png_get_current_row_number @217
+ png_get_current_pass_number @218
+ png_process_data_pause @219
+ png_process_data_skip @220
+ png_set_expand_16 @221
+ png_set_text_compression_level @222
+ png_set_text_compression_mem_level @223
+ png_set_text_compression_strategy @224
+ png_set_text_compression_window_bits @225
+ png_set_text_compression_method @226
+ png_set_alpha_mode @227
+ png_set_alpha_mode_fixed @228
+ png_set_scale_16 @229
+ png_get_cHRM_XYZ @230
+ png_get_cHRM_XYZ_fixed @231
+ png_set_cHRM_XYZ @232
+ png_set_cHRM_XYZ_fixed @233
+ png_image_begin_read_from_file @234
+ png_image_begin_read_from_stdio @235
+ png_image_begin_read_from_memory @236
+ png_image_finish_read @237
+ png_image_free @238
+ png_image_write_to_file @239
+ png_image_write_to_stdio @240
+ png_convert_to_rfc1123_buffer @241
+ png_set_check_for_invalid_index @242
+ png_get_palette_max @243
+ png_set_option @244
+ png_image_write_to_memory @245
+ png_get_eXIf @246
+ png_set_eXIf @247
+ png_get_eXIf_1 @248
+ png_set_eXIf_1 @249