diff --git a/libpng-1.6.17-apng.patch b/libpng-1.6.18-apng.patch similarity index 93% rename from libpng-1.6.17-apng.patch rename to libpng-1.6.18-apng.patch index 3dfd40c..f6ecc4d 100644 --- a/libpng-1.6.17-apng.patch +++ b/libpng-1.6.18-apng.patch @@ -1,6 +1,6 @@ -diff -Naru libpng-1.6.17.org/png.h libpng-1.6.17/png.h ---- libpng-1.6.17.org/png.h 2015-03-27 07:56:22.460189754 +0900 -+++ libpng-1.6.17/png.h 2015-03-27 07:56:22.536191843 +0900 +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 @@ # include "pnglibconf.h" #endif @@ -52,7 +52,7 @@ diff -Naru libpng-1.6.17.org/png.h libpng-1.6.17/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 -@@ -3271,6 +3294,74 @@ +@@ -3244,6 +3267,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.17.org/png.h libpng-1.6.17/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3280,7 +3371,11 @@ +@@ -3253,7 +3344,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.17.org/png.h libpng-1.6.17/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.17.org/pngget.c libpng-1.6.17/pngget.c ---- libpng-1.6.17.org/pngget.c 2015-03-27 07:56:22.461189782 +0900 -+++ libpng-1.6.17/pngget.c 2015-03-27 07:56:22.537191870 +0900 +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 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.17.org/pngget.c libpng-1.6.17/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.17.org/pnginfo.h libpng-1.6.17/pnginfo.h ---- libpng-1.6.17.org/pnginfo.h 2015-03-27 07:56:22.461189782 +0900 -+++ libpng-1.6.17/pnginfo.h 2015-03-27 07:56:22.537191870 +0900 +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 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,10 +331,10 @@ diff -Naru libpng-1.6.17.org/pnginfo.h libpng-1.6.17/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c ---- libpng-1.6.17.org/pngpread.c 2015-03-27 07:56:22.461189782 +0900 -+++ libpng-1.6.17/pngpread.c 2015-03-27 07:56:22.537191870 +0900 -@@ -219,6 +219,109 @@ +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 +@@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -354,7 +354,6 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c + return; + } + -+ png_push_crc_skip(png_ptr, png_ptr->push_length); + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; + return; + } @@ -380,7 +379,6 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c + return; + } + -+ png_push_crc_skip(png_ptr, png_ptr->push_length); + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; + return; + } @@ -432,7 +430,6 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c + } + png_warning(png_ptr, "Skipped (ignored) a chunk " + "between APNG chunks"); -+ png_push_crc_skip(png_ptr, png_ptr->push_length); + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; + return; + } @@ -444,7 +441,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c if (chunk_name == png_IDAT) { if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) -@@ -283,6 +386,9 @@ +@@ -258,6 +358,9 @@ else if (chunk_name == png_IDAT) { @@ -454,7 +451,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/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); -@@ -428,6 +534,30 @@ +@@ -403,6 +506,30 @@ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -485,7 +482,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c else { -@@ -623,7 +753,11 @@ +@@ -533,7 +660,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ @@ -497,7 +494,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/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); -@@ -631,17 +765,64 @@ +@@ -541,17 +672,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; @@ -562,7 +559,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c } if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) -@@ -714,6 +895,15 @@ +@@ -625,6 +803,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -578,7 +575,7 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/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. -@@ -1163,6 +1353,18 @@ +@@ -1074,6 +1261,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -597,10 +594,10 @@ diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.17.org/pngpriv.h libpng-1.6.17/pngpriv.h ---- libpng-1.6.17.org/pngpriv.h 2015-03-27 07:56:22.462189809 +0900 -+++ libpng-1.6.17/pngpriv.h 2015-03-27 07:56:22.538191898 +0900 -@@ -516,6 +516,10 @@ +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 +@@ -537,6 +537,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ @@ -611,7 +608,7 @@ diff -Naru libpng-1.6.17.org/pngpriv.h libpng-1.6.17/pngpriv.h /* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 -@@ -737,6 +741,16 @@ +@@ -758,6 +762,16 @@ #define png_tRNS PNG_U32(116, 82, 78, 83) #define png_zTXt PNG_U32(122, 84, 88, 116) @@ -628,7 +625,7 @@ diff -Naru libpng-1.6.17.org/pngpriv.h libpng-1.6.17/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. */ -@@ -1440,6 +1454,47 @@ +@@ -1457,6 +1471,47 @@ */ #endif @@ -676,9 +673,9 @@ diff -Naru libpng-1.6.17.org/pngpriv.h libpng-1.6.17/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.17.org/pngread.c libpng-1.6.17/pngread.c ---- libpng-1.6.17.org/pngread.c 2015-03-27 07:56:22.463189837 +0900 -+++ libpng-1.6.17/pngread.c 2015-03-27 07:56:22.539191925 +0900 +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 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,10 +777,10 @@ diff -Naru libpng-1.6.17.org/pngread.c libpng-1.6.17/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.17.org/pngrutil.c libpng-1.6.17/pngrutil.c ---- libpng-1.6.17.org/pngrutil.c 2015-03-27 07:56:22.469190002 +0900 -+++ libpng-1.6.17/pngrutil.c 2015-03-27 07:56:22.541191980 +0900 -@@ -819,6 +819,11 @@ +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 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -795,7 +792,7 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2702,6 +2707,179 @@ +@@ -2704,6 +2709,179 @@ } #endif @@ -975,7 +972,7 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -3960,7 +4138,38 @@ +@@ -3962,7 +4140,38 @@ { uInt avail_in; png_bytep buffer; @@ -1014,7 +1011,7 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -3972,7 +4181,7 @@ +@@ -3974,7 +4183,7 @@ if (png_ptr->chunk_name != png_IDAT) png_error(png_ptr, "Not enough image data"); } @@ -1023,7 +1020,7 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4035,6 +4244,9 @@ +@@ -4037,6 +4246,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1033,7 +1030,7 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4473,4 +4685,80 @@ +@@ -4475,4 +4687,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1114,9 +1111,9 @@ diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.17.org/pngset.c libpng-1.6.17/pngset.c ---- libpng-1.6.17.org/pngset.c 2015-03-27 07:56:22.469190002 +0900 -+++ libpng-1.6.17/pngset.c 2015-03-27 07:56:22.541191980 +0900 +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 @@ -241,6 +241,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1129,7 +1126,7 @@ diff -Naru libpng-1.6.17.org/pngset.c libpng-1.6.17/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1090,6 +1095,147 @@ +@@ -1089,6 +1094,147 @@ } #endif /* sPLT */ @@ -1277,10 +1274,10 @@ diff -Naru libpng-1.6.17.org/pngset.c libpng-1.6.17/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.17.org/pngstruct.h libpng-1.6.17/pngstruct.h ---- libpng-1.6.17.org/pngstruct.h 2015-03-27 07:56:22.470190029 +0900 -+++ libpng-1.6.17/pngstruct.h 2015-03-27 07:56:22.541191980 +0900 -@@ -408,6 +408,27 @@ +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 +@@ -400,6 +400,27 @@ png_byte filter_type; #endif @@ -1308,9 +1305,9 @@ diff -Naru libpng-1.6.17.org/pngstruct.h libpng-1.6.17/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.17.org/pngtest.c libpng-1.6.17/pngtest.c ---- libpng-1.6.17.org/pngtest.c 2015-03-27 07:56:22.470190029 +0900 -+++ libpng-1.6.17/pngtest.c 2015-03-27 07:56:22.541191980 +0900 +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 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,21 +1430,21 @@ diff -Naru libpng-1.6.17.org/pngtest.c libpng-1.6.17/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.17.org/pngwrite.c libpng-1.6.17/pngwrite.c ---- libpng-1.6.17.org/pngwrite.c 2015-03-27 07:56:22.471190057 +0900 -+++ libpng-1.6.17/pngwrite.c 2015-03-27 07:56:22.542192007 +0900 -@@ -127,6 +127,10 @@ - * application continues writing the PNG. So check the 'invalid' flag here - * too. - */ +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 +@@ -128,6 +128,10 @@ + * the application continues writing the PNG. So check the 'invalid' + * flag here too. + */ +#ifdef PNG_WRITE_APNG_SUPPORTED -+ if (info_ptr->valid & PNG_INFO_acTL) -+ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); ++ if (info_ptr->valid & PNG_INFO_acTL) ++ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); +#endif #ifdef PNG_GAMMA_SUPPORTED # ifdef PNG_WRITE_gAMA_SUPPORTED if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && -@@ -359,6 +363,11 @@ +@@ -365,6 +369,11 @@ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); #endif @@ -1459,7 +1456,7 @@ diff -Naru libpng-1.6.17.org/pngwrite.c libpng-1.6.17/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1680,6 +1689,43 @@ +@@ -1450,6 +1459,43 @@ } #endif @@ -1502,10 +1499,10 @@ diff -Naru libpng-1.6.17.org/pngwrite.c libpng-1.6.17/pngwrite.c +#endif /* PNG_WRITE_APNG_SUPPORTED */ #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED - #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.17.org/pngwutil.c libpng-1.6.17/pngwutil.c ---- libpng-1.6.17.org/pngwutil.c 2015-03-27 07:56:22.477190222 +0900 -+++ libpng-1.6.17/pngwutil.c 2015-03-27 07:56:22.543192035 +0900 + # 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 @@ -901,6 +901,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1632,7 +1629,7 @@ diff -Naru libpng-1.6.17.org/pngwutil.c libpng-1.6.17/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -3028,4 +3124,39 @@ +@@ -2704,4 +2800,39 @@ } #endif /* WRITE_FLUSH */ } @@ -1672,9 +1669,9 @@ diff -Naru libpng-1.6.17.org/pngwutil.c libpng-1.6.17/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.17.org/scripts/symbols.def libpng-1.6.17/scripts/symbols.def ---- libpng-1.6.17.org/scripts/symbols.def 2015-03-27 07:56:22.482190359 +0900 -+++ libpng-1.6.17/scripts/symbols.def 2015-03-27 07:56:22.548192172 +0900 +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 @@ -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 2368a77..84301be 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.17 +Version: 1.6.18 Release: 1mamba Summary: A library of functions for manipulating PNG image format files Group: System/Libraries @@ -63,7 +63,7 @@ gunzip -c %{SOURCE1} | patch -p1 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -%ifarch x86_64 +%ifarch x86_64_disabled make clean %configure \ --enable-shared \ @@ -113,7 +113,7 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so %doc ANNOUNCE CHANGES README TODO %doc pngbar.jpg pngbar.png pngnow.png -%ifarch x86_64 +%ifarch x86_64_disabled %files -n lib32-%{name} %defattr(-,root,root) %{_prefix}/lib/libpng%{apiver}.so.* @@ -125,6 +125,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so %endif %changelog +* Thu Aug 06 2015 Automatic Build System 1.6.18-1mamba +- automatic version update by autodist + * Wed Apr 15 2015 Automatic Build System 1.6.17-1mamba - automatic update by autodist