diff --git a/libpng-1.6.22-apng.patch b/libpng-1.6.23-apng.patch similarity index 95% rename from libpng-1.6.22-apng.patch rename to libpng-1.6.23-apng.patch index b444ad1..74d0cad 100644 --- a/libpng-1.6.22-apng.patch +++ b/libpng-1.6.23-apng.patch @@ -1,6 +1,6 @@ -diff -Naru libpng-1.6.22.org/png.h libpng-1.6.22/png.h ---- libpng-1.6.22.org/png.h 2016-05-28 23:46:58.838127877 +0900 -+++ libpng-1.6.22/png.h 2016-05-29 08:32:27.595634941 +0900 +diff -Naru libpng-1.6.23.org/png.h libpng-1.6.23/png.h +--- libpng-1.6.23.org/png.h 2016-06-09 22:23:09.753041866 +0900 ++++ libpng-1.6.23/png.h 2016-06-09 22:23:39.282106366 +0900 @@ -366,6 +366,10 @@ # include "pnglibconf.h" #endif @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.22.org/png.h libpng-1.6.22/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.22.org/pngget.c libpng-1.6.22/pngget.c ---- libpng-1.6.22.org/pngget.c 2016-05-28 23:46:45.201640861 +0900 -+++ libpng-1.6.22/pngget.c 2016-05-29 08:32:27.595634941 +0900 +diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c +--- libpng-1.6.23.org/pngget.c 2016-06-09 22:21:54.199319849 +0900 ++++ libpng-1.6.23/pngget.c 2016-06-09 22:23:39.230104491 +0900 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.22.org/pngget.c libpng-1.6.22/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.22.org/pnginfo.h libpng-1.6.22/pnginfo.h ---- libpng-1.6.22.org/pnginfo.h 2016-05-28 23:46:43.159567939 +0900 -+++ libpng-1.6.22/pnginfo.h 2016-05-29 08:32:27.595634941 +0900 +diff -Naru libpng-1.6.23.org/pnginfo.h libpng-1.6.23/pnginfo.h +--- libpng-1.6.23.org/pnginfo.h 2016-06-09 22:21:54.200319885 +0900 ++++ libpng-1.6.23/pnginfo.h 2016-06-09 22:23:39.230104491 +0900 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.22.org/pnginfo.h libpng-1.6.22/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c ---- libpng-1.6.22.org/pngpread.c 2016-05-28 23:46:43.159567939 +0900 -+++ libpng-1.6.22/pngpread.c 2016-05-29 08:32:27.596634977 +0900 +diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c +--- libpng-1.6.23.org/pngpread.c 2016-06-09 22:23:09.754041902 +0900 ++++ libpng-1.6.23/pngpread.c 2016-06-09 22:23:39.230104491 +0900 @@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -441,7 +441,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c if (chunk_name == png_IDAT) { if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) -@@ -258,6 +358,9 @@ +@@ -260,6 +360,9 @@ else if (chunk_name == png_IDAT) { @@ -451,7 +451,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/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); -@@ -403,6 +506,30 @@ +@@ -405,6 +508,30 @@ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -482,7 +482,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c else { -@@ -533,7 +660,11 @@ +@@ -538,7 +665,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ @@ -494,7 +494,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c 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); -@@ -541,17 +672,64 @@ +@@ -546,17 +677,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; @@ -559,7 +559,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c } if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) -@@ -625,6 +803,15 @@ +@@ -630,6 +808,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -575,7 +575,7 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/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. -@@ -1074,6 +1261,18 @@ +@@ -1079,6 +1266,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -594,9 +594,9 @@ diff -Naru libpng-1.6.22.org/pngpread.c libpng-1.6.22/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.22.org/pngpriv.h libpng-1.6.22/pngpriv.h ---- libpng-1.6.22.org/pngpriv.h 2016-05-28 23:46:45.202640897 +0900 -+++ libpng-1.6.22/pngpriv.h 2016-05-29 08:32:27.597635012 +0900 +diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h +--- libpng-1.6.23.org/pngpriv.h 2016-06-09 22:23:09.754041902 +0900 ++++ libpng-1.6.23/pngpriv.h 2016-06-09 22:23:39.245105032 +0900 @@ -537,6 +537,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -673,10 +673,10 @@ diff -Naru libpng-1.6.22.org/pngpriv.h libpng-1.6.22/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.22.org/pngread.c libpng-1.6.22/pngread.c ---- libpng-1.6.22.org/pngread.c 2016-05-28 23:46:45.203640933 +0900 -+++ libpng-1.6.22/pngread.c 2016-05-29 08:32:27.598635048 +0900 -@@ -158,6 +158,9 @@ +diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c +--- libpng-1.6.23.org/pngread.c 2016-06-09 22:23:09.755041938 +0900 ++++ libpng-1.6.23/pngread.c 2016-06-09 22:23:39.247105104 +0900 +@@ -161,6 +161,9 @@ else if (chunk_name == png_IDAT) { @@ -686,7 +686,7 @@ diff -Naru libpng-1.6.22.org/pngread.c libpng-1.6.22/pngread.c png_ptr->idat_size = length; break; } -@@ -247,6 +250,17 @@ +@@ -250,6 +253,17 @@ png_handle_iTXt(png_ptr, info_ptr, length); #endif @@ -704,7 +704,7 @@ diff -Naru libpng-1.6.22.org/pngread.c libpng-1.6.22/pngread.c else png_handle_unknown(png_ptr, info_ptr, length, PNG_HANDLE_CHUNK_AS_DEFAULT); -@@ -254,6 +268,72 @@ +@@ -257,6 +271,72 @@ } #endif /* SEQUENTIAL_READ */ @@ -777,9 +777,9 @@ diff -Naru libpng-1.6.22.org/pngread.c libpng-1.6.22/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.22.org/pngrutil.c libpng-1.6.22/pngrutil.c ---- libpng-1.6.22.org/pngrutil.c 2016-05-28 23:46:45.205641004 +0900 -+++ libpng-1.6.22/pngrutil.c 2016-05-29 08:32:27.599635084 +0900 +diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c +--- libpng-1.6.23.org/pngrutil.c 2016-06-09 22:21:54.210320245 +0900 ++++ libpng-1.6.23/pngrutil.c 2016-06-09 22:23:39.249105176 +0900 @@ -855,6 +855,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.22.org/pngrutil.c libpng-1.6.22/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.22.org/pngset.c libpng-1.6.22/pngset.c ---- libpng-1.6.22.org/pngset.c 2016-05-28 23:46:58.839127913 +0900 -+++ libpng-1.6.22/pngset.c 2016-05-29 08:32:27.600635119 +0900 +diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c +--- libpng-1.6.23.org/pngset.c 2016-06-09 22:23:09.756041974 +0900 ++++ libpng-1.6.23/pngset.c 2016-06-09 22:23:39.249105176 +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.22.org/pngset.c libpng-1.6.22/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1094,6 +1099,147 @@ +@@ -1096,6 +1101,147 @@ } #endif /* sPLT */ @@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.22.org/pngset.c libpng-1.6.22/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.22.org/pngstruct.h libpng-1.6.22/pngstruct.h ---- libpng-1.6.22.org/pngstruct.h 2016-05-28 23:46:43.164568117 +0900 -+++ libpng-1.6.22/pngstruct.h 2016-05-29 08:32:27.600635119 +0900 +diff -Naru libpng-1.6.23.org/pngstruct.h libpng-1.6.23/pngstruct.h +--- libpng-1.6.23.org/pngstruct.h 2016-06-09 22:21:54.210320245 +0900 ++++ libpng-1.6.23/pngstruct.h 2016-06-09 22:23:39.250105212 +0900 @@ -403,6 +403,27 @@ png_byte filter_type; #endif @@ -1305,9 +1305,9 @@ diff -Naru libpng-1.6.22.org/pngstruct.h libpng-1.6.22/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.22.org/pngtest.c libpng-1.6.22/pngtest.c ---- libpng-1.6.22.org/pngtest.c 2016-05-28 23:46:58.839127913 +0900 -+++ libpng-1.6.22/pngtest.c 2016-05-29 08:32:27.601635155 +0900 +diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c +--- libpng-1.6.23.org/pngtest.c 2016-06-09 22:23:09.756041974 +0900 ++++ libpng-1.6.23/pngtest.c 2016-06-09 22:23:39.250105212 +0900 @@ -883,6 +883,10 @@ volatile int num_passes; int pass; @@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.22.org/pngtest.c libpng-1.6.22/pngtest.c for (pass = 0; pass < num_passes; pass++) { # ifdef calc_pass_height -diff -Naru libpng-1.6.22.org/pngwrite.c libpng-1.6.22/pngwrite.c ---- libpng-1.6.22.org/pngwrite.c 2016-05-28 23:46:45.206641040 +0900 -+++ libpng-1.6.22/pngwrite.c 2016-05-29 08:32:27.602635191 +0900 +diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c +--- libpng-1.6.23.org/pngwrite.c 2016-06-09 22:21:54.212320317 +0900 ++++ libpng-1.6.23/pngwrite.c 2016-06-09 22:23:39.251105248 +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.22.org/pngwrite.c libpng-1.6.22/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED /* Initialize the write structure - general purpose utility. */ -diff -Naru libpng-1.6.22.org/pngwutil.c libpng-1.6.22/pngwutil.c ---- libpng-1.6.22.org/pngwutil.c 2016-05-28 23:46:45.207641076 +0900 -+++ libpng-1.6.22/pngwutil.c 2016-05-29 08:32:27.603635226 +0900 +diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c +--- libpng-1.6.23.org/pngwutil.c 2016-06-09 22:21:54.213320353 +0900 ++++ libpng-1.6.23/pngwutil.c 2016-06-09 22:23:39.251105248 +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.22.org/pngwutil.c libpng-1.6.22/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.22.org/scripts/symbols.def libpng-1.6.22/scripts/symbols.def ---- libpng-1.6.22.org/scripts/symbols.def 2016-05-28 23:46:58.841127984 +0900 -+++ libpng-1.6.22/scripts/symbols.def 2016-05-29 08:32:27.603635226 +0900 +diff -Naru libpng-1.6.23.org/scripts/symbols.def libpng-1.6.23/scripts/symbols.def +--- libpng-1.6.23.org/scripts/symbols.def 2016-06-09 22:23:09.757042011 +0900 ++++ libpng-1.6.23/scripts/symbols.def 2016-06-09 22:23:39.251105248 +0900 @@ -250,3 +250,23 @@ png_get_palette_max @243 png_set_option @244 diff --git a/libpng.spec b/libpng.spec index 89a5e29..7630954 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.22 +Version: 1.6.23 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 Jun 15 2016 Automatic Build System 1.6.23-1mamba +- automatic version update by autodist + * Tue May 31 2016 Automatic Build System 1.6.22-1mamba - automatic version update by autodist