From 3043fb81f7f392c89642343fd653a915ad6e611c Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 05:24:42 +0100 Subject: [PATCH] automatic version update by autodist [release 1.6.26-1mamba;Sat Oct 22 2016] --- ....25-apng.patch => libpng-1.6.26-apng.patch | 136 +++++++++--------- libpng.spec | 5 +- 2 files changed, 72 insertions(+), 69 deletions(-) rename libpng-1.6.25-apng.patch => libpng-1.6.26-apng.patch (93%) diff --git a/libpng-1.6.25-apng.patch b/libpng-1.6.26-apng.patch similarity index 93% rename from libpng-1.6.25-apng.patch rename to libpng-1.6.26-apng.patch index 78c05ec..5811c5a 100644 --- a/libpng-1.6.25-apng.patch +++ b/libpng-1.6.26-apng.patch @@ -1,6 +1,6 @@ -diff -Naru libpng-1.6.25.org/png.h libpng-1.6.25/png.h ---- libpng-1.6.25.org/png.h 2016-09-16 21:30:52.615790113 +0900 -+++ libpng-1.6.25/png.h 2016-09-16 21:30:52.664790257 +0900 +diff -Naru libpng-1.6.26.org/png.h libpng-1.6.26/png.h +--- libpng-1.6.26.org/png.h 2016-10-20 23:41:17.097162484 +0900 ++++ libpng-1.6.26/png.h 2016-10-20 23:55:10.025489293 +0900 @@ -366,6 +366,10 @@ # include "pnglibconf.h" #endif @@ -18,13 +18,13 @@ diff -Naru libpng-1.6.25.org/png.h libpng-1.6.25/png.h +#ifdef PNG_APNG_SUPPORTED +/* dispose_op flags from inside fcTL */ -+#define PNG_DISPOSE_OP_NONE 0x00 -+#define PNG_DISPOSE_OP_BACKGROUND 0x01 -+#define PNG_DISPOSE_OP_PREVIOUS 0x02 ++#define PNG_DISPOSE_OP_NONE 0x00U ++#define PNG_DISPOSE_OP_BACKGROUND 0x01U ++#define PNG_DISPOSE_OP_PREVIOUS 0x02U + +/* blend_op flags from inside fcTL */ -+#define PNG_BLEND_OP_SOURCE 0x00 -+#define PNG_BLEND_OP_OVER 0x01 ++#define PNG_BLEND_OP_SOURCE 0x00U ++#define PNG_BLEND_OP_OVER 0x01U +#endif /* PNG_APNG_SUPPORTED */ + /* This triggers a compiler error in png.c, if png.c and png.h @@ -35,8 +35,8 @@ diff -Naru libpng-1.6.25.org/png.h libpng-1.6.25/png.h #define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */ +#ifdef PNG_APNG_SUPPORTED -+#define PNG_INFO_acTL 0x10000 -+#define PNG_INFO_fcTL 0x20000 ++#define PNG_INFO_acTL 0x10000U ++#define PNG_INFO_fcTL 0x20000U +#endif /* This is used for the transformation routines, as some of them @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.25.org/png.h libpng-1.6.25/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.25.org/pngget.c libpng-1.6.25/pngget.c ---- libpng-1.6.25.org/pngget.c 2016-09-16 21:30:52.616790117 +0900 -+++ libpng-1.6.25/pngget.c 2016-09-16 21:30:52.665790260 +0900 +diff -Naru libpng-1.6.26.org/pngget.c libpng-1.6.26/pngget.c +--- libpng-1.6.26.org/pngget.c 2016-10-20 23:41:17.098162476 +0900 ++++ libpng-1.6.26/pngget.c 2016-10-20 23:40:14.452643290 +0900 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.25.org/pngget.c libpng-1.6.25/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.25.org/pnginfo.h libpng-1.6.25/pnginfo.h ---- libpng-1.6.25.org/pnginfo.h 2016-09-16 21:30:52.616790117 +0900 -+++ libpng-1.6.25/pnginfo.h 2016-09-16 21:30:52.665790260 +0900 +diff -Naru libpng-1.6.26.org/pnginfo.h libpng-1.6.26/pnginfo.h +--- libpng-1.6.26.org/pnginfo.h 2016-09-16 21:30:52.616790117 +0900 ++++ libpng-1.6.26/pnginfo.h 2016-10-20 23:40:14.432643443 +0900 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.25.org/pnginfo.h libpng-1.6.25/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.25.org/pngpread.c libpng-1.6.25/pngpread.c ---- libpng-1.6.25.org/pngpread.c 2016-09-16 21:30:52.616790117 +0900 -+++ libpng-1.6.25/pngpread.c 2016-09-16 21:30:52.665790260 +0900 +diff -Naru libpng-1.6.26.org/pngpread.c libpng-1.6.26/pngpread.c +--- libpng-1.6.26.org/pngpread.c 2016-10-20 23:41:17.098162476 +0900 ++++ libpng-1.6.26/pngpread.c 2016-10-20 23:40:14.451643298 +0900 @@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -575,7 +575,7 @@ diff -Naru libpng-1.6.25.org/pngpread.c libpng-1.6.25/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. -@@ -1079,6 +1266,18 @@ +@@ -1084,6 +1271,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -594,21 +594,21 @@ diff -Naru libpng-1.6.25.org/pngpread.c libpng-1.6.25/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.25.org/pngpriv.h libpng-1.6.25/pngpriv.h ---- libpng-1.6.25.org/pngpriv.h 2016-09-16 21:30:52.616790117 +0900 -+++ libpng-1.6.25/pngpriv.h 2016-09-16 21:30:52.666790263 +0900 -@@ -566,6 +566,10 @@ - #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ - /* 0x4000 (unused) */ - #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ +diff -Naru libpng-1.6.26.org/pngpriv.h libpng-1.6.26/pngpriv.h +--- libpng-1.6.26.org/pngpriv.h 2016-10-20 23:41:17.098162476 +0900 ++++ libpng-1.6.26/pngpriv.h 2016-10-20 23:48:56.011006323 +0900 +@@ -567,6 +567,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 */ +#ifdef PNG_APNG_SUPPORTED -+#define PNG_HAVE_acTL 0x10000 -+#define PNG_HAVE_fcTL 0x20000 ++#define PNG_HAVE_acTL 0x10000U ++#define PNG_HAVE_fcTL 0x20000U +#endif /* Flags for the transformations the PNG library does on the image data */ - #define PNG_BGR 0x0001 -@@ -783,6 +787,16 @@ + #define PNG_BGR 0x0001U +@@ -802,6 +806,16 @@ #define png_tRNS PNG_U32(116, 82, 78, 83) #define png_zTXt PNG_U32(122, 84, 88, 116) @@ -618,14 +618,14 @@ diff -Naru libpng-1.6.25.org/pngpriv.h libpng-1.6.25/pngpriv.h +#define png_fdAT PNG_U32(102, 100, 65, 84) + +/* For png_struct.apng_flags: */ -+#define PNG_FIRST_FRAME_HIDDEN 0x0001 -+#define PNG_APNG_APP 0x0002 ++#define PNG_FIRST_FRAME_HIDDEN 0x0001U ++#define PNG_APNG_APP 0x0002U +#endif + /* 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. */ -@@ -1509,6 +1523,47 @@ +@@ -1528,6 +1542,47 @@ */ #endif @@ -673,9 +673,9 @@ diff -Naru libpng-1.6.25.org/pngpriv.h libpng-1.6.25/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.25.org/pngread.c libpng-1.6.25/pngread.c ---- libpng-1.6.25.org/pngread.c 2016-09-16 21:30:52.617790119 +0900 -+++ libpng-1.6.25/pngread.c 2016-09-16 21:30:52.666790263 +0900 +diff -Naru libpng-1.6.26.org/pngread.c libpng-1.6.26/pngread.c +--- libpng-1.6.26.org/pngread.c 2016-10-20 23:41:17.099162468 +0900 ++++ libpng-1.6.26/pngread.c 2016-10-20 23:40:14.447643328 +0900 @@ -161,6 +161,9 @@ else if (chunk_name == png_IDAT) @@ -777,10 +777,10 @@ diff -Naru libpng-1.6.25.org/pngread.c libpng-1.6.25/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.25.org/pngrutil.c libpng-1.6.25/pngrutil.c ---- libpng-1.6.25.org/pngrutil.c 2016-09-16 21:30:52.618790122 +0900 -+++ libpng-1.6.25/pngrutil.c 2016-09-16 21:30:52.668790268 +0900 -@@ -857,6 +857,11 @@ +diff -Naru libpng-1.6.26.org/pngrutil.c libpng-1.6.26/pngrutil.c +--- libpng-1.6.26.org/pngrutil.c 2016-10-20 23:41:17.100162461 +0900 ++++ libpng-1.6.26/pngrutil.c 2016-10-20 23:40:14.444643351 +0900 +@@ -860,6 +860,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -792,7 +792,7 @@ diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2757,6 +2762,179 @@ +@@ -2760,6 +2765,179 @@ } #endif @@ -972,7 +972,7 @@ diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -4015,7 +4193,38 @@ +@@ -4021,7 +4199,38 @@ { uInt avail_in; png_bytep buffer; @@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -4027,7 +4236,7 @@ +@@ -4033,7 +4242,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.25.org/pngrutil.c libpng-1.6.25/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4090,6 +4299,9 @@ +@@ -4096,6 +4305,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4528,4 +4740,80 @@ +@@ -4542,4 +4754,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.25.org/pngset.c libpng-1.6.25/pngset.c ---- libpng-1.6.25.org/pngset.c 2016-09-16 21:30:52.618790122 +0900 -+++ libpng-1.6.25/pngset.c 2016-09-16 21:30:52.668790268 +0900 +diff -Naru libpng-1.6.26.org/pngset.c libpng-1.6.26/pngset.c +--- libpng-1.6.26.org/pngset.c 2016-10-20 23:41:17.101162453 +0900 ++++ libpng-1.6.26/pngset.c 2016-10-20 23:49:51.058637459 +0900 @@ -241,6 +241,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1126,7 +1126,7 @@ diff -Naru libpng-1.6.25.org/pngset.c libpng-1.6.25/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1096,6 +1101,147 @@ +@@ -1110,6 +1115,147 @@ } #endif /* sPLT */ @@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.25.org/pngset.c libpng-1.6.25/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.25.org/pngstruct.h libpng-1.6.25/pngstruct.h ---- libpng-1.6.25.org/pngstruct.h 2016-09-16 21:30:52.618790122 +0900 -+++ libpng-1.6.25/pngstruct.h 2016-09-16 21:30:52.668790268 +0900 +diff -Naru libpng-1.6.26.org/pngstruct.h libpng-1.6.26/pngstruct.h +--- libpng-1.6.26.org/pngstruct.h 2016-10-20 23:41:17.101162453 +0900 ++++ libpng-1.6.26/pngstruct.h 2016-10-20 23:40:14.439643390 +0900 @@ -403,6 +403,27 @@ png_byte filter_type; #endif @@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.25.org/pngstruct.h libpng-1.6.25/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.25.org/pngtest.c libpng-1.6.25/pngtest.c ---- libpng-1.6.25.org/pngtest.c 2016-09-16 21:30:52.618790122 +0900 -+++ libpng-1.6.25/pngtest.c 2016-09-16 21:30:52.668790268 +0900 -@@ -884,6 +884,10 @@ +diff -Naru libpng-1.6.26.org/pngtest.c libpng-1.6.26/pngtest.c +--- libpng-1.6.26.org/pngtest.c 2016-10-20 23:41:17.101162453 +0900 ++++ libpng-1.6.26/pngtest.c 2016-10-20 23:40:14.438643397 +0900 +@@ -874,6 +874,10 @@ volatile int num_passes; int pass; int bit_depth, color_type; @@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.25.org/pngtest.c libpng-1.6.25/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1363,6 +1367,22 @@ +@@ -1353,6 +1357,22 @@ } } #endif @@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.25.org/pngtest.c libpng-1.6.25/pngtest.c #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1434,6 +1454,110 @@ +@@ -1429,6 +1449,110 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.25.org/pngtest.c libpng-1.6.25/pngtest.c for (pass = 0; pass < num_passes; pass++) { # ifdef calc_pass_height -diff -Naru libpng-1.6.25.org/pngwrite.c libpng-1.6.25/pngwrite.c ---- libpng-1.6.25.org/pngwrite.c 2016-09-16 21:30:52.619790125 +0900 -+++ libpng-1.6.25/pngwrite.c 2016-09-16 21:30:52.669790271 +0900 +diff -Naru libpng-1.6.26.org/pngwrite.c libpng-1.6.26/pngwrite.c +--- libpng-1.6.26.org/pngwrite.c 2016-10-20 23:41:17.101162453 +0900 ++++ libpng-1.6.26/pngwrite.c 2016-10-20 23:40:14.437643405 +0900 @@ -128,6 +128,10 @@ * the application continues writing the PNG. So check the 'invalid' * flag here too. @@ -1523,9 +1523,9 @@ diff -Naru libpng-1.6.25.org/pngwrite.c libpng-1.6.25/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED /* Initialize the write structure - general purpose utility. */ -diff -Naru libpng-1.6.25.org/pngwutil.c libpng-1.6.25/pngwutil.c ---- libpng-1.6.25.org/pngwutil.c 2016-09-16 21:30:52.619790125 +0900 -+++ libpng-1.6.25/pngwutil.c 2016-09-16 21:30:52.669790271 +0900 +diff -Naru libpng-1.6.26.org/pngwutil.c libpng-1.6.26/pngwutil.c +--- libpng-1.6.26.org/pngwutil.c 2016-10-20 23:41:17.102162445 +0900 ++++ libpng-1.6.26/pngwutil.c 2016-10-20 23:40:14.435643420 +0900 @@ -817,6 +817,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1692,9 +1692,9 @@ diff -Naru libpng-1.6.25.org/pngwutil.c libpng-1.6.25/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.25.org/scripts/symbols.def libpng-1.6.25/scripts/symbols.def ---- libpng-1.6.25.org/scripts/symbols.def 2016-09-16 21:30:52.624790140 +0900 -+++ libpng-1.6.25/scripts/symbols.def 2016-09-16 21:30:52.674790286 +0900 +diff -Naru libpng-1.6.26.org/scripts/symbols.def libpng-1.6.26/scripts/symbols.def +--- libpng-1.6.26.org/scripts/symbols.def 2016-10-20 23:41:17.103162438 +0900 ++++ libpng-1.6.26/scripts/symbols.def 2016-10-20 23:40:14.433643436 +0900 @@ -250,3 +250,23 @@ png_get_palette_max @243 png_set_option @244 diff --git a/libpng.spec b/libpng.spec index e742dce..dbdcb84 100644 --- a/libpng.spec +++ b/libpng.spec @@ -1,6 +1,6 @@ %define apiver %(echo %version | cut -d. -f1-2 | tr -d .) Name: libpng -Version: 1.6.25 +Version: 1.6.26 Release: 1mamba Summary: A library of functions for manipulating PNG image format files Group: System/Libraries @@ -126,6 +126,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so %endif %changelog +* Sat Oct 22 2016 Automatic Build System 1.6.26-1mamba +- automatic version update by autodist + * Tue Oct 04 2016 Automatic Build System 1.6.25-1mamba - automatic version update by autodist