diff --git a/libpng-1.6.13-apng.patch b/libpng-1.6.14-apng.patch similarity index 93% rename from libpng-1.6.13-apng.patch rename to libpng-1.6.14-apng.patch index 0d2dad8..c168b02 100644 --- a/libpng-1.6.13-apng.patch +++ b/libpng-1.6.14-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h ---- libpng-1.6.13.org/png.h 2014-08-22 22:59:37.076529918 +0900 -+++ libpng-1.6.13/png.h 2014-08-22 22:59:37.152532707 +0900 -@@ -467,6 +467,10 @@ +diff -Naru libpng-1.6.14.org/png.h libpng-1.6.14/png.h +--- libpng-1.6.14.org/png.h 2014-10-23 23:57:22.656674917 +0900 ++++ libpng-1.6.14/png.h 2014-10-23 23:57:22.729677456 +0900 +@@ -470,6 +470,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -557,6 +561,17 @@ +@@ -560,6 +564,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -877,6 +892,10 @@ +@@ -880,6 +895,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.13.org/png.h libpng-1.6.13/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -914,6 +933,10 @@ +@@ -917,6 +936,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.13.org/png.h libpng-1.6.13/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 -@@ -3249,6 +3272,74 @@ +@@ -3255,6 +3278,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -125,10 +125,10 @@ diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ - /* Maintainer: Put new public prototypes here ^, in libpng.3, and project - * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt -@@ -3259,7 +3350,11 @@ - * scripts/symbols.def as well. + /* Maintainer: Put new public prototypes here ^, in libpng.3, in project + * defs, and in scripts/symbols.def. +@@ -3264,7 +3355,11 @@ + * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL +#ifdef PNG_APNG_SUPPORTED @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.13.org/pngget.c libpng-1.6.13/pngget.c ---- libpng-1.6.13.org/pngget.c 2014-08-22 22:59:37.077529955 +0900 -+++ libpng-1.6.13/pngget.c 2014-08-22 22:59:37.152532707 +0900 +diff -Naru libpng-1.6.14.org/pngget.c libpng-1.6.14/pngget.c +--- libpng-1.6.14.org/pngget.c 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pngget.c 2014-10-23 23:57:22.730677491 +0900 @@ -1195,4 +1195,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.13.org/pngget.c libpng-1.6.13/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.13.org/pnginfo.h libpng-1.6.13/pnginfo.h ---- libpng-1.6.13.org/pnginfo.h 2014-08-22 22:59:37.077529955 +0900 -+++ libpng-1.6.13/pnginfo.h 2014-08-22 22:59:37.153532744 +0900 +diff -Naru libpng-1.6.14.org/pnginfo.h libpng-1.6.14/pnginfo.h +--- libpng-1.6.14.org/pnginfo.h 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pnginfo.h 2014-10-23 23:57:22.730677491 +0900 @@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,10 +331,10 @@ diff -Naru libpng-1.6.13.org/pnginfo.h libpng-1.6.13/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c ---- libpng-1.6.13.org/pngpread.c 2014-08-22 22:59:37.077529955 +0900 -+++ libpng-1.6.13/pngpread.c 2014-08-22 22:59:37.153532744 +0900 -@@ -217,6 +217,109 @@ +diff -Naru libpng-1.6.14.org/pngpread.c libpng-1.6.14/pngpread.c +--- libpng-1.6.14.org/pngpread.c 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pngpread.c 2014-10-23 23:57:22.730677491 +0900 +@@ -219,6 +219,109 @@ chunk_name = png_ptr->chunk_name; @@ -444,7 +444,7 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c if (chunk_name == png_IDAT) { if (png_ptr->mode & PNG_AFTER_IDAT) -@@ -300,6 +403,9 @@ +@@ -283,6 +386,9 @@ else if (chunk_name == png_IDAT) { @@ -454,7 +454,7 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/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); -@@ -530,6 +636,30 @@ +@@ -428,6 +534,30 @@ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -485,19 +485,19 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c else { -@@ -732,7 +862,11 @@ +@@ -621,7 +751,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ +#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->buffer_size < 12) ++ PNG_PUSH_SAVE_BUFFER_IF_LT(12) +#else - if (png_ptr->buffer_size < 8) + PNG_PUSH_SAVE_BUFFER_IF_LT(8) +#endif - { - png_push_save_buffer(png_ptr); - return; -@@ -745,17 +879,64 @@ + 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); +@@ -629,17 +763,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; @@ -562,7 +562,7 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c } if (png_ptr->idat_size && png_ptr->save_buffer_size) -@@ -833,6 +1014,15 @@ +@@ -712,6 +893,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -578,7 +578,7 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/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. -@@ -1275,6 +1465,18 @@ +@@ -1154,6 +1344,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -597,9 +597,9 @@ diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.13.org/pngpriv.h libpng-1.6.13/pngpriv.h ---- libpng-1.6.13.org/pngpriv.h 2014-08-22 22:59:37.078529992 +0900 -+++ libpng-1.6.13/pngpriv.h 2014-08-22 22:59:37.154532781 +0900 +diff -Naru libpng-1.6.14.org/pngpriv.h libpng-1.6.14/pngpriv.h +--- libpng-1.6.14.org/pngpriv.h 2014-10-23 23:57:22.658674987 +0900 ++++ libpng-1.6.14/pngpriv.h 2014-10-23 23:57:22.731677525 +0900 @@ -555,6 +555,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -676,9 +676,9 @@ diff -Naru libpng-1.6.13.org/pngpriv.h libpng-1.6.13/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.13.org/pngread.c libpng-1.6.13/pngread.c ---- libpng-1.6.13.org/pngread.c 2014-08-22 22:59:37.079530029 +0900 -+++ libpng-1.6.13/pngread.c 2014-08-22 22:59:37.154532781 +0900 +diff -Naru libpng-1.6.14.org/pngread.c libpng-1.6.14/pngread.c +--- libpng-1.6.14.org/pngread.c 2014-10-23 23:57:22.659675022 +0900 ++++ libpng-1.6.14/pngread.c 2014-10-23 23:57:22.732677560 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,10 +780,10 @@ diff -Naru libpng-1.6.13.org/pngread.c libpng-1.6.13/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.13.org/pngrutil.c libpng-1.6.13/pngrutil.c ---- libpng-1.6.13.org/pngrutil.c 2014-08-22 22:59:37.081530102 +0900 -+++ libpng-1.6.13/pngrutil.c 2014-08-22 22:59:37.156532854 +0900 -@@ -818,6 +818,11 @@ +diff -Naru libpng-1.6.14.org/pngrutil.c libpng-1.6.14/pngrutil.c +--- libpng-1.6.14.org/pngrutil.c 2014-10-23 23:57:22.660675057 +0900 ++++ libpng-1.6.14/pngrutil.c 2014-10-23 23:57:22.735677664 +0900 +@@ -817,6 +817,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -795,7 +795,7 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2698,6 +2703,179 @@ +@@ -2697,6 +2702,179 @@ } #endif @@ -975,7 +975,7 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -3954,7 +4132,38 @@ +@@ -3953,7 +4131,38 @@ { uInt avail_in; png_bytep buffer; @@ -1014,7 +1014,7 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -3966,7 +4175,7 @@ +@@ -3965,7 +4174,7 @@ if (png_ptr->chunk_name != png_IDAT) png_error(png_ptr, "Not enough image data"); } @@ -1023,7 +1023,7 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4029,6 +4238,9 @@ +@@ -4028,6 +4237,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1033,7 +1033,7 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4466,4 +4678,80 @@ +@@ -4465,4 +4677,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Naru libpng-1.6.13.org/pngset.c libpng-1.6.13/pngset.c ---- libpng-1.6.13.org/pngset.c 2014-08-22 22:59:37.082530138 +0900 -+++ libpng-1.6.13/pngset.c 2014-08-22 22:59:37.157532891 +0900 +diff -Naru libpng-1.6.14.org/pngset.c libpng-1.6.14/pngset.c +--- libpng-1.6.14.org/pngset.c 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngset.c 2014-10-23 23:57:22.735677664 +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.13.org/pngset.c libpng-1.6.13/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.13.org/pngstruct.h libpng-1.6.13/pngstruct.h ---- libpng-1.6.13.org/pngstruct.h 2014-08-22 22:59:37.082530138 +0900 -+++ libpng-1.6.13/pngstruct.h 2014-08-22 22:59:37.157532891 +0900 +diff -Naru libpng-1.6.14.org/pngstruct.h libpng-1.6.14/pngstruct.h +--- libpng-1.6.14.org/pngstruct.h 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngstruct.h 2014-10-23 23:57:22.735677664 +0900 @@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.13.org/pngstruct.h libpng-1.6.13/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.13.org/pngtest.c libpng-1.6.13/pngtest.c ---- libpng-1.6.13.org/pngtest.c 2014-08-22 22:59:37.083530175 +0900 -+++ libpng-1.6.13/pngtest.c 2014-08-22 22:59:37.157532891 +0900 +diff -Naru libpng-1.6.14.org/pngtest.c libpng-1.6.14/pngtest.c +--- libpng-1.6.14.org/pngtest.c 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngtest.c 2014-10-23 23:57:22.736677699 +0900 @@ -848,6 +848,10 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.13.org/pngtest.c libpng-1.6.13/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.13.org/pngwrite.c libpng-1.6.13/pngwrite.c ---- libpng-1.6.13.org/pngwrite.c 2014-08-22 22:59:37.084530212 +0900 -+++ libpng-1.6.13/pngwrite.c 2014-08-22 22:59:37.158532928 +0900 +diff -Naru libpng-1.6.14.org/pngwrite.c libpng-1.6.14/pngwrite.c +--- libpng-1.6.14.org/pngwrite.c 2014-10-23 23:57:22.662675126 +0900 ++++ libpng-1.6.14/pngwrite.c 2014-10-23 23:57:22.737677734 +0900 @@ -127,6 +127,10 @@ * application continues writing the PNG. So check the 'invalid' flag here * too. @@ -1447,7 +1447,7 @@ diff -Naru libpng-1.6.13.org/pngwrite.c libpng-1.6.13/pngwrite.c #ifdef PNG_GAMMA_SUPPORTED # ifdef PNG_WRITE_gAMA_SUPPORTED if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && -@@ -357,6 +361,11 @@ +@@ -359,6 +363,11 @@ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); #endif @@ -1459,7 +1459,7 @@ diff -Naru libpng-1.6.13.org/pngwrite.c libpng-1.6.13/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1662,6 +1671,43 @@ +@@ -1665,6 +1674,43 @@ } #endif @@ -1503,10 +1503,10 @@ diff -Naru libpng-1.6.13.org/pngwrite.c libpng-1.6.13/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c ---- libpng-1.6.13.org/pngwutil.c 2014-08-22 22:59:37.084530212 +0900 -+++ libpng-1.6.13/pngwutil.c 2014-08-22 22:59:37.159532965 +0900 -@@ -898,6 +898,11 @@ +diff -Naru libpng-1.6.14.org/pngwutil.c libpng-1.6.14/pngwutil.c +--- libpng-1.6.14.org/pngwutil.c 2014-10-23 23:57:22.663675161 +0900 ++++ libpng-1.6.14/pngwutil.c 2014-10-23 23:57:22.738677769 +0900 +@@ -902,6 +902,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1518,7 +1518,7 @@ diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || -@@ -1076,7 +1081,14 @@ +@@ -1080,7 +1085,14 @@ optimize_cmf(data, png_image_size(png_ptr)); # endif @@ -1533,7 +1533,7 @@ diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->zstream.next_out = data; -@@ -1122,7 +1134,15 @@ +@@ -1126,7 +1138,15 @@ optimize_cmf(data, png_image_size(png_ptr)); # endif @@ -1549,7 +1549,7 @@ diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1936,6 +1956,82 @@ +@@ -1939,6 +1959,82 @@ } #endif @@ -1632,7 +1632,7 @@ diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -3023,4 +3119,39 @@ +@@ -3026,4 +3122,39 @@ } #endif } @@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.13.org/scripts/symbols.def libpng-1.6.13/scripts/symbols.def ---- libpng-1.6.13.org/scripts/symbols.def 2014-08-22 22:59:37.091530469 +0900 -+++ libpng-1.6.13/scripts/symbols.def 2014-08-22 22:59:37.163533111 +0900 +diff -Naru libpng-1.6.14.org/scripts/symbols.def libpng-1.6.14/scripts/symbols.def +--- libpng-1.6.14.org/scripts/symbols.def 2014-10-23 23:57:22.670675404 +0900 ++++ libpng-1.6.14/scripts/symbols.def 2014-10-23 23:57:22.746678047 +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 d51df66..3baab3a 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.13 +Version: 1.6.14 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 11 2014 Automatic Build System 1.6.14-1mamba +- automatic update by autodist + * Wed Sep 10 2014 Automatic Build System 1.6.13-1mamba - automatic version update by autodist