From ad05fb86e045d85ce4dfb5664585543443cd12b0 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 05:24:41 +0100 Subject: [PATCH] automatic version update by autodist [release 1.6.12-1mamba;Tue Jul 01 2014] --- ....10-apng.patch => libpng-1.6.12-apng.patch | 106 +++++++++--------- libpng.spec | 5 +- 2 files changed, 57 insertions(+), 54 deletions(-) rename libpng-1.6.10-apng.patch => libpng-1.6.12-apng.patch (94%) diff --git a/libpng-1.6.10-apng.patch b/libpng-1.6.12-apng.patch similarity index 94% rename from libpng-1.6.10-apng.patch rename to libpng-1.6.12-apng.patch index e4f79b7..910ee46 100644 --- a/libpng-1.6.10-apng.patch +++ b/libpng-1.6.12-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h ---- libpng-1.6.10.org/png.h 2014-03-08 13:00:52.521104794 +0900 -+++ libpng-1.6.10/png.h 2014-03-08 13:03:06.451467252 +0900 -@@ -457,6 +457,10 @@ +diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h +--- libpng-1.6.12.org/png.h 2014-06-12 20:50:55.236436493 +0900 ++++ libpng-1.6.12/png.h 2014-06-12 20:50:55.301438712 +0900 +@@ -464,6 +464,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -547,6 +551,17 @@ +@@ -554,6 +558,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -867,6 +882,10 @@ +@@ -874,6 +889,10 @@ #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ @@ -41,7 +41,7 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -904,6 +923,10 @@ +@@ -911,6 +930,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,9 +52,9 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/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 -@@ -3240,6 +3263,74 @@ +@@ -3246,6 +3269,74 @@ /******************************************************************************* - * END OF HARDWARE OPTIONS + * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ +#ifdef PNG_APNG_SUPPORTED +PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr, @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, and project * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt -@@ -3250,7 +3341,11 @@ +@@ -3256,7 +3347,11 @@ * scripts/symbols.def as well. */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,10 +139,10 @@ diff -Naru libpng-1.6.10.org/png.h libpng-1.6.10/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.10.org/pngget.c libpng-1.6.10/pngget.c ---- libpng-1.6.10.org/pngget.c 2014-03-08 13:00:52.521104794 +0900 -+++ libpng-1.6.10/pngget.c 2014-03-08 13:03:06.451467252 +0900 -@@ -1174,4 +1174,166 @@ +diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c +--- libpng-1.6.12.org/pngget.c 2014-06-12 20:50:55.237436527 +0900 ++++ libpng-1.6.12/pngget.c 2014-06-12 20:50:55.302438746 +0900 +@@ -1195,4 +1195,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.10.org/pngget.c libpng-1.6.10/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.10.org/pnginfo.h libpng-1.6.10/pnginfo.h ---- libpng-1.6.10.org/pnginfo.h 2014-03-08 13:00:52.522104827 +0900 -+++ libpng-1.6.10/pnginfo.h 2014-03-08 13:03:06.451467252 +0900 +diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h +--- libpng-1.6.12.org/pnginfo.h 2014-06-12 20:50:55.237436527 +0900 ++++ libpng-1.6.12/pnginfo.h 2014-06-12 20:50:55.302438746 +0900 @@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.10.org/pnginfo.h libpng-1.6.10/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.10.org/pngpread.c libpng-1.6.10/pngpread.c ---- libpng-1.6.10.org/pngpread.c 2014-03-08 13:00:52.522104827 +0900 -+++ libpng-1.6.10/pngpread.c 2014-03-08 13:03:06.452467284 +0900 +diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c +--- libpng-1.6.12.org/pngpread.c 2014-06-12 20:50:55.237436527 +0900 ++++ libpng-1.6.12/pngpread.c 2014-06-12 20:50:55.302438746 +0900 @@ -217,6 +217,109 @@ chunk_name = png_ptr->chunk_name; @@ -578,7 +578,7 @@ diff -Naru libpng-1.6.10.org/pngpread.c libpng-1.6.10/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. -@@ -1281,6 +1471,18 @@ +@@ -1275,6 +1465,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -597,9 +597,9 @@ diff -Naru libpng-1.6.10.org/pngpread.c libpng-1.6.10/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.10.org/pngpriv.h libpng-1.6.10/pngpriv.h ---- libpng-1.6.10.org/pngpriv.h 2014-03-08 13:00:52.523104860 +0900 -+++ libpng-1.6.10/pngpriv.h 2014-03-08 13:03:06.452467284 +0900 +diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h +--- libpng-1.6.12.org/pngpriv.h 2014-06-12 20:50:55.238436561 +0900 ++++ libpng-1.6.12/pngpriv.h 2014-06-12 20:50:55.303438780 +0900 @@ -551,6 +551,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -676,9 +676,9 @@ diff -Naru libpng-1.6.10.org/pngpriv.h libpng-1.6.10/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.10.org/pngread.c libpng-1.6.10/pngread.c ---- libpng-1.6.10.org/pngread.c 2014-03-08 13:00:52.524104892 +0900 -+++ libpng-1.6.10/pngread.c 2014-03-08 13:03:06.453467317 +0900 +diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/pngread.c +--- libpng-1.6.12.org/pngread.c 2014-06-12 20:50:55.238436561 +0900 ++++ libpng-1.6.12/pngread.c 2014-06-12 20:50:55.304438815 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,9 +780,9 @@ diff -Naru libpng-1.6.10.org/pngread.c libpng-1.6.10/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.10.org/pngrutil.c libpng-1.6.10/pngrutil.c ---- libpng-1.6.10.org/pngrutil.c 2014-03-08 13:00:52.526104957 +0900 -+++ libpng-1.6.10/pngrutil.c 2014-03-08 13:03:06.454467349 +0900 +diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c +--- libpng-1.6.12.org/pngrutil.c 2014-06-12 20:50:55.240436630 +0900 ++++ libpng-1.6.12/pngrutil.c 2014-06-12 20:50:55.305438849 +0900 @@ -818,6 +818,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -1033,7 +1033,7 @@ diff -Naru libpng-1.6.10.org/pngrutil.c libpng-1.6.10/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4474,4 +4686,80 @@ +@@ -4466,4 +4678,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.10.org/pngrutil.c libpng-1.6.10/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Naru libpng-1.6.10.org/pngset.c libpng-1.6.10/pngset.c ---- libpng-1.6.10.org/pngset.c 2014-03-08 13:00:52.526104957 +0900 -+++ libpng-1.6.10/pngset.c 2014-03-08 13:03:06.454467349 +0900 +diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c +--- libpng-1.6.12.org/pngset.c 2014-06-12 20:50:55.240436630 +0900 ++++ libpng-1.6.12/pngset.c 2014-06-12 20:50:55.306438883 +0900 @@ -239,6 +239,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1277,9 +1277,9 @@ diff -Naru libpng-1.6.10.org/pngset.c libpng-1.6.10/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.10.org/pngstruct.h libpng-1.6.10/pngstruct.h ---- libpng-1.6.10.org/pngstruct.h 2014-03-08 13:00:52.526104957 +0900 -+++ libpng-1.6.10/pngstruct.h 2014-03-08 13:03:06.455467382 +0900 +diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/pngstruct.h +--- libpng-1.6.12.org/pngstruct.h 2014-06-12 20:50:55.240436630 +0900 ++++ libpng-1.6.12/pngstruct.h 2014-06-12 20:50:55.306438883 +0900 @@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.10.org/pngstruct.h libpng-1.6.10/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.10.org/pngtest.c libpng-1.6.10/pngtest.c ---- libpng-1.6.10.org/pngtest.c 2014-03-08 13:00:52.527104990 +0900 -+++ libpng-1.6.10/pngtest.c 2014-03-08 13:03:06.455467382 +0900 +diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c +--- libpng-1.6.12.org/pngtest.c 2014-06-12 20:50:55.241436664 +0900 ++++ libpng-1.6.12/pngtest.c 2014-06-12 20:50:55.306438883 +0900 @@ -848,6 +848,10 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.10.org/pngtest.c libpng-1.6.10/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.10.org/pngwrite.c libpng-1.6.10/pngwrite.c ---- libpng-1.6.10.org/pngwrite.c 2014-03-08 13:00:52.528105023 +0900 -+++ libpng-1.6.10/pngwrite.c 2014-03-08 13:03:06.456467415 +0900 +diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c +--- libpng-1.6.12.org/pngwrite.c 2014-06-12 20:50:55.241436664 +0900 ++++ libpng-1.6.12/pngwrite.c 2014-06-12 20:50:55.307438917 +0900 @@ -127,6 +127,10 @@ * application continues writing the PNG. So check the 'invalid' flag here * too. @@ -1459,7 +1459,7 @@ diff -Naru libpng-1.6.10.org/pngwrite.c libpng-1.6.10/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1661,6 +1670,43 @@ +@@ -1662,6 +1671,43 @@ } #endif @@ -1503,9 +1503,9 @@ diff -Naru libpng-1.6.10.org/pngwrite.c libpng-1.6.10/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.10.org/pngwutil.c libpng-1.6.10/pngwutil.c ---- libpng-1.6.10.org/pngwutil.c 2014-03-08 13:00:52.529105055 +0900 -+++ libpng-1.6.10/pngwutil.c 2014-03-08 13:03:06.456467415 +0900 +diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c +--- libpng-1.6.12.org/pngwutil.c 2014-06-12 20:50:55.242436698 +0900 ++++ libpng-1.6.12/pngwutil.c 2014-06-12 20:50:55.307438917 +0900 @@ -898,6 +898,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1515,7 +1515,7 @@ diff -Naru libpng-1.6.10.org/pngwutil.c libpng-1.6.10/pngwutil.c + png_ptr->first_frame_height = height; +#endif + - if (!(png_ptr->do_filter)) + if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || @@ -1076,7 +1081,14 @@ @@ -1549,7 +1549,7 @@ diff -Naru libpng-1.6.10.org/pngwutil.c libpng-1.6.10/pngwutil.c png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1934,6 +1954,82 @@ +@@ -1936,6 +1956,82 @@ } #endif @@ -1632,7 +1632,7 @@ diff -Naru libpng-1.6.10.org/pngwutil.c libpng-1.6.10/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -3021,4 +3117,39 @@ +@@ -3023,4 +3119,39 @@ } #endif } @@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.10.org/pngwutil.c libpng-1.6.10/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.10.org/scripts/symbols.def libpng-1.6.10/scripts/symbols.def ---- libpng-1.6.10.org/scripts/symbols.def 2014-03-08 13:00:52.534105218 +0900 -+++ libpng-1.6.10/scripts/symbols.def 2014-03-08 13:03:06.456467415 +0900 +diff -Naru libpng-1.6.12.org/scripts/symbols.def libpng-1.6.12/scripts/symbols.def +--- libpng-1.6.12.org/scripts/symbols.def 2014-06-12 20:50:55.248436903 +0900 ++++ libpng-1.6.12/scripts/symbols.def 2014-06-12 20:50:55.314439156 +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 b54b5bc..84673d8 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.10 +Version: 1.6.12 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 Jul 01 2014 Automatic Build System 1.6.12-1mamba +- automatic version update by autodist + * Sun Mar 09 2014 Automatic Build System 1.6.10-1mamba - automatic version update by autodist