From 223c41faef6bfe55370b4b37e830a3e34c8add75 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.19-1mamba;Tue Nov 17 2015] --- ....18-apng.patch => libpng-1.6.19-apng.patch | 131 +++++++++--------- libpng.spec | 5 +- 2 files changed, 70 insertions(+), 66 deletions(-) rename libpng-1.6.18-apng.patch => libpng-1.6.19-apng.patch (94%) diff --git a/libpng-1.6.18-apng.patch b/libpng-1.6.19-apng.patch similarity index 94% rename from libpng-1.6.18-apng.patch rename to libpng-1.6.19-apng.patch index f6ecc4d..fa4dca7 100644 --- a/libpng-1.6.18-apng.patch +++ b/libpng-1.6.19-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.18.org/png.h libpng-1.6.18/png.h ---- libpng-1.6.18.org/png.h 2015-07-25 14:20:34.435400010 +0900 -+++ libpng-1.6.18/png.h 2015-07-25 14:20:34.514402795 +0900 -@@ -480,6 +480,10 @@ +diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h +--- libpng-1.6.19.org/png.h 2015-11-15 22:34:42.407615478 +0900 ++++ libpng-1.6.19/png.h 2015-11-15 22:34:42.476617887 +0900 +@@ -334,6 +334,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.18.org/png.h libpng-1.6.18/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -570,6 +574,17 @@ +@@ -429,6 +433,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,18 +30,18 @@ diff -Naru libpng-1.6.18.org/png.h libpng-1.6.18/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -890,6 +905,10 @@ - #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ +@@ -750,6 +765,10 @@ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ + #if INT_MAX >= 0x8000 /* else this might break */ #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ +#ifdef PNG_APNG_SUPPORTED +#define PNG_INFO_acTL 0x10000 +#define PNG_INFO_fcTL 0x20000 +#endif + #endif /* This is used for the transformation routines, as some of them - * change these values for the row. It also should enable using -@@ -927,6 +946,10 @@ +@@ -788,6 +807,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.18.org/png.h libpng-1.6.18/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 -@@ -3244,6 +3267,74 @@ +@@ -3108,6 +3131,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.18.org/png.h libpng-1.6.18/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3253,7 +3344,11 @@ +@@ -3117,7 +3208,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.18.org/png.h libpng-1.6.18/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.18.org/pngget.c libpng-1.6.18/pngget.c ---- libpng-1.6.18.org/pngget.c 2015-07-25 14:20:34.436400046 +0900 -+++ libpng-1.6.18/pngget.c 2015-07-25 14:20:34.515402830 +0900 +diff -Naru libpng-1.6.19.org/pngget.c libpng-1.6.19/pngget.c +--- libpng-1.6.19.org/pngget.c 2015-11-15 22:34:42.408615513 +0900 ++++ libpng-1.6.19/pngget.c 2015-11-15 22:34:42.476617887 +0900 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.18.org/pngget.c libpng-1.6.18/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.18.org/pnginfo.h libpng-1.6.18/pnginfo.h ---- libpng-1.6.18.org/pnginfo.h 2015-07-25 14:20:34.436400046 +0900 -+++ libpng-1.6.18/pnginfo.h 2015-07-25 14:20:34.515402830 +0900 +diff -Naru libpng-1.6.19.org/pnginfo.h libpng-1.6.19/pnginfo.h +--- libpng-1.6.19.org/pnginfo.h 2015-11-15 22:34:42.408615513 +0900 ++++ libpng-1.6.19/pnginfo.h 2015-11-15 22:34:42.477617922 +0900 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.18.org/pnginfo.h libpng-1.6.18/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.18.org/pngpread.c libpng-1.6.18/pngpread.c ---- libpng-1.6.18.org/pngpread.c 2015-07-25 14:20:34.436400046 +0900 -+++ libpng-1.6.18/pngpread.c 2015-07-25 14:20:34.516402866 +0900 +diff -Naru libpng-1.6.19.org/pngpread.c libpng-1.6.19/pngpread.c +--- libpng-1.6.19.org/pngpread.c 2015-11-15 22:34:42.409615548 +0900 ++++ libpng-1.6.19/pngpread.c 2015-11-15 22:34:42.477617922 +0900 @@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -594,9 +594,9 @@ diff -Naru libpng-1.6.18.org/pngpread.c libpng-1.6.18/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.18.org/pngpriv.h libpng-1.6.18/pngpriv.h ---- libpng-1.6.18.org/pngpriv.h 2015-07-25 14:20:34.437400081 +0900 -+++ libpng-1.6.18/pngpriv.h 2015-07-25 14:20:34.516402866 +0900 +diff -Naru libpng-1.6.19.org/pngpriv.h libpng-1.6.19/pngpriv.h +--- libpng-1.6.19.org/pngpriv.h 2015-11-15 22:34:42.409615548 +0900 ++++ libpng-1.6.19/pngpriv.h 2015-11-15 22:34:42.477617922 +0900 @@ -537,6 +537,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -608,7 +608,7 @@ diff -Naru libpng-1.6.18.org/pngpriv.h libpng-1.6.18/pngpriv.h /* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 -@@ -758,6 +762,16 @@ +@@ -754,6 +758,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.18.org/pngpriv.h libpng-1.6.18/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. */ -@@ -1457,6 +1471,47 @@ +@@ -1453,6 +1467,47 @@ */ #endif @@ -673,9 +673,9 @@ diff -Naru libpng-1.6.18.org/pngpriv.h libpng-1.6.18/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.18.org/pngread.c libpng-1.6.18/pngread.c ---- libpng-1.6.18.org/pngread.c 2015-07-25 14:20:34.438400116 +0900 -+++ libpng-1.6.18/pngread.c 2015-07-25 14:20:34.517402901 +0900 +diff -Naru libpng-1.6.19.org/pngread.c libpng-1.6.19/pngread.c +--- libpng-1.6.19.org/pngread.c 2015-11-15 22:34:42.410615583 +0900 ++++ libpng-1.6.19/pngread.c 2015-11-15 22:34:42.478617957 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -777,10 +777,10 @@ diff -Naru libpng-1.6.18.org/pngread.c libpng-1.6.18/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.18.org/pngrutil.c libpng-1.6.18/pngrutil.c ---- libpng-1.6.18.org/pngrutil.c 2015-07-25 14:20:34.441400222 +0900 -+++ libpng-1.6.18/pngrutil.c 2015-07-25 14:20:34.519402971 +0900 -@@ -818,6 +818,11 @@ +diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c +--- libpng-1.6.19.org/pngrutil.c 2015-11-15 22:34:42.412615653 +0900 ++++ libpng-1.6.19/pngrutil.c 2015-11-15 22:34:42.480618027 +0900 +@@ -824,6 +824,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -792,7 +792,7 @@ diff -Naru libpng-1.6.18.org/pngrutil.c libpng-1.6.18/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2704,6 +2709,179 @@ +@@ -2724,6 +2729,179 @@ } #endif @@ -972,7 +972,7 @@ diff -Naru libpng-1.6.18.org/pngrutil.c libpng-1.6.18/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -3962,7 +4140,38 @@ +@@ -3982,7 +4160,38 @@ { uInt avail_in; png_bytep buffer; @@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.18.org/pngrutil.c libpng-1.6.18/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -3974,7 +4183,7 @@ +@@ -3994,7 +4203,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.18.org/pngrutil.c libpng-1.6.18/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4037,6 +4246,9 @@ +@@ -4057,6 +4266,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.18.org/pngrutil.c libpng-1.6.18/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4475,4 +4687,80 @@ +@@ -4495,4 +4707,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.18.org/pngrutil.c libpng-1.6.18/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.18.org/pngset.c libpng-1.6.18/pngset.c ---- libpng-1.6.18.org/pngset.c 2015-07-25 14:20:34.441400222 +0900 -+++ libpng-1.6.18/pngset.c 2015-07-25 14:20:34.519402971 +0900 +diff -Naru libpng-1.6.19.org/pngset.c libpng-1.6.19/pngset.c +--- libpng-1.6.19.org/pngset.c 2015-11-15 22:34:42.412615653 +0900 ++++ libpng-1.6.19/pngset.c 2015-11-15 22:34:42.480618027 +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.18.org/pngset.c libpng-1.6.18/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1089,6 +1094,147 @@ +@@ -1094,6 +1099,147 @@ } #endif /* sPLT */ @@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.18.org/pngset.c libpng-1.6.18/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.18.org/pngstruct.h libpng-1.6.18/pngstruct.h ---- libpng-1.6.18.org/pngstruct.h 2015-07-25 14:20:34.441400222 +0900 -+++ libpng-1.6.18/pngstruct.h 2015-07-25 14:20:34.519402971 +0900 +diff -Naru libpng-1.6.19.org/pngstruct.h libpng-1.6.19/pngstruct.h +--- libpng-1.6.19.org/pngstruct.h 2015-11-15 22:34:42.412615653 +0900 ++++ libpng-1.6.19/pngstruct.h 2015-11-15 22:34:42.480618027 +0900 @@ -400,6 +400,27 @@ png_byte filter_type; #endif @@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.18.org/pngstruct.h libpng-1.6.18/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.18.org/pngtest.c libpng-1.6.18/pngtest.c ---- libpng-1.6.18.org/pngtest.c 2015-07-25 14:20:34.442400257 +0900 -+++ libpng-1.6.18/pngtest.c 2015-07-25 14:20:34.520403007 +0900 -@@ -849,6 +849,10 @@ +diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c +--- libpng-1.6.19.org/pngtest.c 2015-11-15 22:34:42.413615688 +0900 ++++ libpng-1.6.19/pngtest.c 2015-11-15 22:34:42.481618062 +0900 +@@ -850,6 +850,10 @@ png_uint_32 width, height; int num_pass = 1, pass; int bit_depth, color_type; @@ -1319,10 +1319,10 @@ diff -Naru libpng-1.6.18.org/pngtest.c libpng-1.6.18/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1316,6 +1320,20 @@ - } +@@ -1345,6 +1349,21 @@ } - #endif + #endif /* tRNS */ + +#ifdef PNG_APNG_SUPPORTED + if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) + { @@ -1337,10 +1337,11 @@ diff -Naru libpng-1.6.18.org/pngtest.c libpng-1.6.18/pngtest.c + } + } +#endif ++ #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1377,6 +1395,89 @@ +@@ -1406,6 +1425,89 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1430,9 +1431,9 @@ diff -Naru libpng-1.6.18.org/pngtest.c libpng-1.6.18/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.18.org/pngwrite.c libpng-1.6.18/pngwrite.c ---- libpng-1.6.18.org/pngwrite.c 2015-07-25 14:20:34.443400292 +0900 -+++ libpng-1.6.18/pngwrite.c 2015-07-25 14:20:34.520403007 +0900 +diff -Naru libpng-1.6.19.org/pngwrite.c libpng-1.6.19/pngwrite.c +--- libpng-1.6.19.org/pngwrite.c 2015-11-15 22:34:42.413615688 +0900 ++++ libpng-1.6.19/pngwrite.c 2015-11-15 22:34:42.481618062 +0900 @@ -128,6 +128,10 @@ * the application continues writing the PNG. So check the 'invalid' * flag here too. @@ -1500,9 +1501,9 @@ diff -Naru libpng-1.6.18.org/pngwrite.c libpng-1.6.18/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED # ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c ---- libpng-1.6.18.org/pngwutil.c 2015-07-25 14:20:34.444400328 +0900 -+++ libpng-1.6.18/pngwutil.c 2015-07-25 14:20:34.521403042 +0900 +diff -Naru libpng-1.6.19.org/pngwutil.c libpng-1.6.19/pngwutil.c +--- libpng-1.6.19.org/pngwutil.c 2015-11-15 22:34:42.414615723 +0900 ++++ libpng-1.6.19/pngwutil.c 2015-11-15 22:34:42.482618096 +0900 @@ -901,6 +901,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1515,7 +1516,7 @@ diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || -@@ -1079,7 +1084,14 @@ +@@ -1082,7 +1087,14 @@ optimize_cmf(data, png_image_size(png_ptr)); #endif @@ -1530,7 +1531,7 @@ diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->zstream.next_out = data; -@@ -1125,7 +1137,15 @@ +@@ -1128,7 +1140,15 @@ optimize_cmf(data, png_image_size(png_ptr)); #endif @@ -1546,7 +1547,7 @@ diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1938,6 +1958,82 @@ +@@ -1941,6 +1961,82 @@ } #endif @@ -1629,7 +1630,7 @@ diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -2704,4 +2800,39 @@ +@@ -2706,4 +2802,39 @@ } #endif /* WRITE_FLUSH */ } @@ -1669,9 +1670,9 @@ diff -Naru libpng-1.6.18.org/pngwutil.c libpng-1.6.18/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.18.org/scripts/symbols.def libpng-1.6.18/scripts/symbols.def ---- libpng-1.6.18.org/scripts/symbols.def 2015-07-25 14:20:34.451400574 +0900 -+++ libpng-1.6.18/scripts/symbols.def 2015-07-25 14:20:34.526403218 +0900 +diff -Naru libpng-1.6.19.org/scripts/symbols.def libpng-1.6.19/scripts/symbols.def +--- libpng-1.6.19.org/scripts/symbols.def 2015-11-15 22:34:42.419615897 +0900 ++++ libpng-1.6.19/scripts/symbols.def 2015-11-15 22:34:42.486618236 +0900 @@ -249,3 +249,23 @@ png_set_check_for_invalid_index @242 png_get_palette_max @243 diff --git a/libpng.spec b/libpng.spec index 84301be..8405096 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.18 +Version: 1.6.19 Release: 1mamba Summary: A library of functions for manipulating PNG image format files Group: System/Libraries @@ -125,6 +125,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so %endif %changelog +* Tue Nov 17 2015 Automatic Build System 1.6.19-1mamba +- automatic version update by autodist + * Thu Aug 06 2015 Automatic Build System 1.6.18-1mamba - automatic version update by autodist