diff --git a/libpng-1.6.15-apng.patch b/libpng-1.6.16-apng.patch similarity index 95% rename from libpng-1.6.15-apng.patch rename to libpng-1.6.16-apng.patch index e783e76..76ba9cc 100644 --- a/libpng-1.6.15-apng.patch +++ b/libpng-1.6.16-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.15.org/png.h libpng-1.6.15/png.h ---- libpng-1.6.15.org/png.h 2014-11-21 22:01:00.976984872 +0900 -+++ libpng-1.6.15/png.h 2014-11-21 22:01:01.049987206 +0900 -@@ -473,6 +473,10 @@ +diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h +--- libpng-1.6.16.org/png.h 2014-12-23 13:43:20.602727303 +0900 ++++ libpng-1.6.16/png.h 2014-12-23 13:43:20.681729791 +0900 +@@ -476,6 +476,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.15.org/png.h libpng-1.6.15/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -563,6 +567,17 @@ +@@ -566,6 +570,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.15.org/png.h libpng-1.6.15/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -883,6 +898,10 @@ +@@ -886,6 +901,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.15.org/png.h libpng-1.6.15/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -920,6 +939,10 @@ +@@ -923,6 +942,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.15.org/png.h libpng-1.6.15/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 -@@ -3258,6 +3281,74 @@ +@@ -3261,6 +3284,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.15.org/png.h libpng-1.6.15/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3267,7 +3358,11 @@ +@@ -3270,7 +3361,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.15.org/png.h libpng-1.6.15/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.15.org/pngget.c libpng-1.6.15/pngget.c ---- libpng-1.6.15.org/pngget.c 2014-11-21 22:01:00.977984904 +0900 -+++ libpng-1.6.15/pngget.c 2014-11-21 22:01:01.050987238 +0900 +diff -Naru libpng-1.6.16.org/pngget.c libpng-1.6.16/pngget.c +--- libpng-1.6.16.org/pngget.c 2014-12-23 13:43:20.603727334 +0900 ++++ libpng-1.6.16/pngget.c 2014-12-23 13:43:20.682729822 +0900 @@ -1210,4 +1210,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.15.org/pngget.c libpng-1.6.15/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.15.org/pnginfo.h libpng-1.6.15/pnginfo.h ---- libpng-1.6.15.org/pnginfo.h 2014-11-21 22:01:00.977984904 +0900 -+++ libpng-1.6.15/pnginfo.h 2014-11-21 22:01:01.050987238 +0900 +diff -Naru libpng-1.6.16.org/pnginfo.h libpng-1.6.16/pnginfo.h +--- libpng-1.6.16.org/pnginfo.h 2014-12-23 13:43:20.603727334 +0900 ++++ libpng-1.6.16/pnginfo.h 2014-12-23 13:43:20.682729822 +0900 @@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.15.org/pnginfo.h libpng-1.6.15/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.15.org/pngpread.c libpng-1.6.15/pngpread.c ---- libpng-1.6.15.org/pngpread.c 2014-11-21 22:01:00.977984904 +0900 -+++ libpng-1.6.15/pngpread.c 2014-11-21 22:01:01.051987269 +0900 +diff -Naru libpng-1.6.16.org/pngpread.c libpng-1.6.16/pngpread.c +--- libpng-1.6.16.org/pngpread.c 2014-12-23 13:43:20.603727334 +0900 ++++ libpng-1.6.16/pngpread.c 2014-12-23 13:43:20.683729854 +0900 @@ -219,6 +219,109 @@ chunk_name = png_ptr->chunk_name; @@ -597,9 +597,9 @@ diff -Naru libpng-1.6.15.org/pngpread.c libpng-1.6.15/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.15.org/pngpriv.h libpng-1.6.15/pngpriv.h ---- libpng-1.6.15.org/pngpriv.h 2014-11-21 22:01:00.978984936 +0900 -+++ libpng-1.6.15/pngpriv.h 2014-11-21 22:01:01.051987269 +0900 +diff -Naru libpng-1.6.16.org/pngpriv.h libpng-1.6.16/pngpriv.h +--- libpng-1.6.16.org/pngpriv.h 2014-12-23 13:43:20.604727366 +0900 ++++ libpng-1.6.16/pngpriv.h 2014-12-23 13:43:20.683729854 +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.15.org/pngpriv.h libpng-1.6.15/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.15.org/pngread.c libpng-1.6.15/pngread.c ---- libpng-1.6.15.org/pngread.c 2014-11-21 22:01:00.979984968 +0900 -+++ libpng-1.6.15/pngread.c 2014-11-21 22:01:01.052987301 +0900 +diff -Naru libpng-1.6.16.org/pngread.c libpng-1.6.16/pngread.c +--- libpng-1.6.16.org/pngread.c 2014-12-23 13:43:20.605727397 +0900 ++++ libpng-1.6.16/pngread.c 2014-12-23 13:43:20.684729885 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,10 +780,10 @@ diff -Naru libpng-1.6.15.org/pngread.c libpng-1.6.15/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.15.org/pngrutil.c libpng-1.6.15/pngrutil.c ---- libpng-1.6.15.org/pngrutil.c 2014-11-21 22:01:00.980985000 +0900 -+++ libpng-1.6.15/pngrutil.c 2014-11-21 22:01:01.053987333 +0900 -@@ -818,6 +818,11 @@ +diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c +--- libpng-1.6.16.org/pngrutil.c 2014-12-23 13:43:20.607727460 +0900 ++++ libpng-1.6.16/pngrutil.c 2014-12-23 13:43:20.686729948 +0900 +@@ -819,6 +819,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.15.org/pngrutil.c libpng-1.6.15/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.15.org/pngset.c libpng-1.6.15/pngset.c ---- libpng-1.6.15.org/pngset.c 2014-11-21 22:01:00.980985000 +0900 -+++ libpng-1.6.15/pngset.c 2014-11-21 22:01:01.054987365 +0900 +diff -Naru libpng-1.6.16.org/pngset.c libpng-1.6.16/pngset.c +--- libpng-1.6.16.org/pngset.c 2014-12-23 13:43:20.607727460 +0900 ++++ libpng-1.6.16/pngset.c 2014-12-23 13:43:20.686729948 +0900 @@ -240,6 +240,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1277,9 +1277,9 @@ diff -Naru libpng-1.6.15.org/pngset.c libpng-1.6.15/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.15.org/pngstruct.h libpng-1.6.15/pngstruct.h ---- libpng-1.6.15.org/pngstruct.h 2014-11-21 22:01:00.981985032 +0900 -+++ libpng-1.6.15/pngstruct.h 2014-11-21 22:01:01.054987365 +0900 +diff -Naru libpng-1.6.16.org/pngstruct.h libpng-1.6.16/pngstruct.h +--- libpng-1.6.16.org/pngstruct.h 2014-12-23 13:43:20.608727492 +0900 ++++ libpng-1.6.16/pngstruct.h 2014-12-23 13:43:20.686729948 +0900 @@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.15.org/pngstruct.h libpng-1.6.15/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.15.org/pngtest.c libpng-1.6.15/pngtest.c ---- libpng-1.6.15.org/pngtest.c 2014-11-21 22:01:00.981985032 +0900 -+++ libpng-1.6.15/pngtest.c 2014-11-21 22:01:01.054987365 +0900 +diff -Naru libpng-1.6.16.org/pngtest.c libpng-1.6.16/pngtest.c +--- libpng-1.6.16.org/pngtest.c 2014-12-23 13:43:20.608727492 +0900 ++++ libpng-1.6.16/pngtest.c 2014-12-23 13:43:20.687729980 +0900 @@ -849,6 +849,10 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.15.org/pngtest.c libpng-1.6.15/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.15.org/pngwrite.c libpng-1.6.15/pngwrite.c ---- libpng-1.6.15.org/pngwrite.c 2014-11-21 22:01:00.982985064 +0900 -+++ libpng-1.6.15/pngwrite.c 2014-11-21 22:01:01.055987397 +0900 +diff -Naru libpng-1.6.16.org/pngwrite.c libpng-1.6.16/pngwrite.c +--- libpng-1.6.16.org/pngwrite.c 2014-12-23 13:43:20.609727523 +0900 ++++ libpng-1.6.16/pngwrite.c 2014-12-23 13:43:20.687729980 +0900 @@ -127,6 +127,10 @@ * application continues writing the PNG. So check the 'invalid' flag here * too. @@ -1503,9 +1503,9 @@ diff -Naru libpng-1.6.15.org/pngwrite.c libpng-1.6.15/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.15.org/pngwutil.c libpng-1.6.15/pngwutil.c ---- libpng-1.6.15.org/pngwutil.c 2014-11-21 22:01:00.982985064 +0900 -+++ libpng-1.6.15/pngwutil.c 2014-11-21 22:01:01.056987429 +0900 +diff -Naru libpng-1.6.16.org/pngwutil.c libpng-1.6.16/pngwutil.c +--- libpng-1.6.16.org/pngwutil.c 2014-12-23 13:43:20.610727555 +0900 ++++ libpng-1.6.16/pngwutil.c 2014-12-23 13:43:20.688730012 +0900 @@ -901,6 +901,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.15.org/pngwutil.c libpng-1.6.15/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.15.org/scripts/symbols.def libpng-1.6.15/scripts/symbols.def ---- libpng-1.6.15.org/scripts/symbols.def 2014-11-21 22:01:00.988985256 +0900 -+++ libpng-1.6.15/scripts/symbols.def 2014-11-21 22:01:01.062987621 +0900 +diff -Naru libpng-1.6.16.org/scripts/symbols.def libpng-1.6.16/scripts/symbols.def +--- libpng-1.6.16.org/scripts/symbols.def 2014-12-23 13:43:20.616727744 +0900 ++++ libpng-1.6.16/scripts/symbols.def 2014-12-23 13:43:20.693730169 +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 50eb7cf..5004116 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.15 +Version: 1.6.16 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 +* Wed Dec 24 2014 Automatic Build System 1.6.16-1mamba +- automatic version update by autodist + * Tue Nov 25 2014 Automatic Build System 1.6.15-1mamba - automatic version update by autodist