diff --git a/libpng-1.6.19-apng.patch b/libpng-1.6.20-apng.patch similarity index 93% rename from libpng-1.6.19-apng.patch rename to libpng-1.6.20-apng.patch index fa4dca7..85c24d2 100644 --- a/libpng-1.6.19-apng.patch +++ b/libpng-1.6.20-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h ---- libpng-1.6.19.org/png.h 2015-11-15 22:34:42.407615478 +0900 -+++ libpng-1.6.19/png.h 2015-11-15 22:34:42.476617887 +0900 -@@ -334,6 +334,10 @@ +diff -Naru libpng-1.6.20.org/png.h libpng-1.6.20/png.h +--- libpng-1.6.20.org/png.h 2015-12-05 23:59:04.682178012 +0900 ++++ libpng-1.6.20/png.h 2015-12-05 23:59:04.771180535 +0900 +@@ -335,6 +335,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -429,6 +433,17 @@ +@@ -430,6 +434,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -750,6 +765,10 @@ +@@ -751,6 +766,10 @@ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ #if INT_MAX >= 0x8000 /* else this might break */ #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ @@ -41,7 +41,7 @@ diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h #endif /* This is used for the transformation routines, as some of them -@@ -788,6 +807,10 @@ +@@ -789,6 +808,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.19.org/png.h libpng-1.6.19/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 -@@ -3108,6 +3131,74 @@ +@@ -3109,6 +3132,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3117,7 +3208,11 @@ +@@ -3118,7 +3209,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.19.org/png.h libpng-1.6.19/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.19.org/pngget.c libpng-1.6.19/pngget.c ---- libpng-1.6.19.org/pngget.c 2015-11-15 22:34:42.408615513 +0900 -+++ libpng-1.6.19/pngget.c 2015-11-15 22:34:42.476617887 +0900 +diff -Naru libpng-1.6.20.org/pngget.c libpng-1.6.20/pngget.c +--- libpng-1.6.20.org/pngget.c 2015-12-05 23:59:04.682178012 +0900 ++++ libpng-1.6.20/pngget.c 2015-12-05 23:59:04.771180535 +0900 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.19.org/pngget.c libpng-1.6.19/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.19.org/pnginfo.h libpng-1.6.19/pnginfo.h ---- libpng-1.6.19.org/pnginfo.h 2015-11-15 22:34:42.408615513 +0900 -+++ libpng-1.6.19/pnginfo.h 2015-11-15 22:34:42.477617922 +0900 +diff -Naru libpng-1.6.20.org/pnginfo.h libpng-1.6.20/pnginfo.h +--- libpng-1.6.20.org/pnginfo.h 2015-12-05 23:59:04.683178041 +0900 ++++ libpng-1.6.20/pnginfo.h 2015-12-05 23:59:04.771180535 +0900 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.19.org/pnginfo.h libpng-1.6.19/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.19.org/pngpread.c libpng-1.6.19/pngpread.c ---- libpng-1.6.19.org/pngpread.c 2015-11-15 22:34:42.409615548 +0900 -+++ libpng-1.6.19/pngpread.c 2015-11-15 22:34:42.477617922 +0900 +diff -Naru libpng-1.6.20.org/pngpread.c libpng-1.6.20/pngpread.c +--- libpng-1.6.20.org/pngpread.c 2015-12-05 23:59:04.683178041 +0900 ++++ libpng-1.6.20/pngpread.c 2015-12-05 23:59:04.772180563 +0900 @@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -594,9 +594,9 @@ diff -Naru libpng-1.6.19.org/pngpread.c libpng-1.6.19/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.19.org/pngpriv.h libpng-1.6.19/pngpriv.h ---- libpng-1.6.19.org/pngpriv.h 2015-11-15 22:34:42.409615548 +0900 -+++ libpng-1.6.19/pngpriv.h 2015-11-15 22:34:42.477617922 +0900 +diff -Naru libpng-1.6.20.org/pngpriv.h libpng-1.6.20/pngpriv.h +--- libpng-1.6.20.org/pngpriv.h 2015-12-05 23:59:04.684178069 +0900 ++++ libpng-1.6.20/pngpriv.h 2015-12-05 23:59:04.772180563 +0900 @@ -537,6 +537,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -625,7 +625,7 @@ diff -Naru libpng-1.6.19.org/pngpriv.h libpng-1.6.19/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. */ -@@ -1453,6 +1467,47 @@ +@@ -1461,6 +1475,47 @@ */ #endif @@ -673,9 +673,9 @@ diff -Naru libpng-1.6.19.org/pngpriv.h libpng-1.6.19/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.19.org/pngread.c libpng-1.6.19/pngread.c ---- libpng-1.6.19.org/pngread.c 2015-11-15 22:34:42.410615583 +0900 -+++ libpng-1.6.19/pngread.c 2015-11-15 22:34:42.478617957 +0900 +diff -Naru libpng-1.6.20.org/pngread.c libpng-1.6.20/pngread.c +--- libpng-1.6.20.org/pngread.c 2015-12-05 23:59:04.685178097 +0900 ++++ libpng-1.6.20/pngread.c 2015-12-05 23:59:04.773180592 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -777,10 +777,10 @@ diff -Naru libpng-1.6.19.org/pngread.c libpng-1.6.19/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.19.org/pngrutil.c libpng-1.6.19/pngrutil.c ---- libpng-1.6.19.org/pngrutil.c 2015-11-15 22:34:42.412615653 +0900 -+++ libpng-1.6.19/pngrutil.c 2015-11-15 22:34:42.480618027 +0900 -@@ -824,6 +824,11 @@ +diff -Naru libpng-1.6.20.org/pngrutil.c libpng-1.6.20/pngrutil.c +--- libpng-1.6.20.org/pngrutil.c 2015-12-05 23:59:04.687178154 +0900 ++++ libpng-1.6.20/pngrutil.c 2015-12-05 23:59:04.775180648 +0900 +@@ -855,6 +855,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -792,7 +792,7 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2724,6 +2729,179 @@ +@@ -2755,6 +2760,179 @@ } #endif @@ -972,7 +972,7 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -3982,7 +4160,38 @@ +@@ -4013,7 +4191,38 @@ { uInt avail_in; png_bytep buffer; @@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -3994,7 +4203,7 @@ +@@ -4025,7 +4234,7 @@ if (png_ptr->chunk_name != png_IDAT) png_error(png_ptr, "Not enough image data"); } @@ -1020,7 +1020,7 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4057,6 +4266,9 @@ +@@ -4088,6 +4297,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4495,4 +4707,80 @@ +@@ -4526,4 +4738,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.19.org/pngrutil.c libpng-1.6.19/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.19.org/pngset.c libpng-1.6.19/pngset.c ---- libpng-1.6.19.org/pngset.c 2015-11-15 22:34:42.412615653 +0900 -+++ libpng-1.6.19/pngset.c 2015-11-15 22:34:42.480618027 +0900 +diff -Naru libpng-1.6.20.org/pngset.c libpng-1.6.20/pngset.c +--- libpng-1.6.20.org/pngset.c 2015-12-05 23:59:04.687178154 +0900 ++++ libpng-1.6.20/pngset.c 2015-12-05 23:59:04.775180648 +0900 @@ -241,6 +241,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1274,10 +1274,10 @@ diff -Naru libpng-1.6.19.org/pngset.c libpng-1.6.19/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.19.org/pngstruct.h libpng-1.6.19/pngstruct.h ---- libpng-1.6.19.org/pngstruct.h 2015-11-15 22:34:42.412615653 +0900 -+++ libpng-1.6.19/pngstruct.h 2015-11-15 22:34:42.480618027 +0900 -@@ -400,6 +400,27 @@ +diff -Naru libpng-1.6.20.org/pngstruct.h libpng-1.6.20/pngstruct.h +--- libpng-1.6.20.org/pngstruct.h 2015-12-05 23:59:04.688178183 +0900 ++++ libpng-1.6.20/pngstruct.h 2015-12-05 23:59:04.775180648 +0900 +@@ -403,6 +403,27 @@ png_byte filter_type; #endif @@ -1305,12 +1305,12 @@ diff -Naru libpng-1.6.19.org/pngstruct.h libpng-1.6.19/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.19.org/pngtest.c libpng-1.6.19/pngtest.c ---- libpng-1.6.19.org/pngtest.c 2015-11-15 22:34:42.413615688 +0900 -+++ libpng-1.6.19/pngtest.c 2015-11-15 22:34:42.481618062 +0900 -@@ -850,6 +850,10 @@ - png_uint_32 width, height; - int num_pass = 1, pass; +diff -Naru libpng-1.6.20.org/pngtest.c libpng-1.6.20/pngtest.c +--- libpng-1.6.20.org/pngtest.c 2015-12-05 23:59:04.688178183 +0900 ++++ libpng-1.6.20/pngtest.c 2015-12-05 23:59:04.776180677 +0900 +@@ -874,6 +874,10 @@ + volatile int num_passes; + int pass; int bit_depth, color_type; +#ifdef PNG_APNG_SUPPORTED + png_uint_32 num_frames; @@ -1319,10 +1319,11 @@ diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1345,6 +1349,21 @@ +@@ -1347,6 +1351,22 @@ + } } - #endif /* tRNS */ - + #endif ++ +#ifdef PNG_APNG_SUPPORTED + if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) + { @@ -1341,7 +1342,7 @@ diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1406,6 +1425,89 @@ +@@ -1418,6 +1438,110 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1386,17 +1387,38 @@ diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c + delay_num, delay_den, + dispose_op, blend_op); +#endif -+ for (pass = 0; pass < num_pass; pass++) ++ for (pass = 0; pass < num_passes; pass++) + { ++# ifdef calc_pass_height ++ png_uint_32 pass_height; ++ ++ if (num_passes == 7) /* interlaced */ ++ { ++ if (PNG_PASS_COLS(frame_width, pass) > 0) ++ pass_height = PNG_PASS_ROWS(frame_height, pass); ++ ++ else ++ pass_height = 0; ++ } ++ ++ else /* not interlaced */ ++ pass_height = frame_height; ++# else ++# define pass_height frame_height ++# endif ++ + pngtest_debug1("Writing row data for pass %d", pass); -+ for (y = 0; y < frame_height; y++) ++ for (y = 0; y < pass_height; y++) + { +#ifndef SINGLE_ROWBUF_ALLOC -+ pngtest_debug2("Allocating row buffer (pass %d, y = %ld)...", pass, y); ++ pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y); ++ + row_buf = (png_bytep)png_malloc(read_ptr, + png_get_rowbytes(read_ptr, read_info_ptr)); -+ pngtest_debug2("0x%08lx (%ld bytes)", (unsigned long)row_buf, -+ png_get_rowbytes(read_ptr, read_info_ptr)); ++ ++ pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf, ++ (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr)); ++ +#endif /* !SINGLE_ROWBUF_ALLOC */ + png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1); + @@ -1415,7 +1437,7 @@ diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c +#endif /* PNG_WRITE_SUPPORTED */ + +#ifndef SINGLE_ROWBUF_ALLOC -+ pngtest_debug2("Freeing row buffer (pass %d, y = %ld)", pass, y); ++ pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y); + png_free(read_ptr, row_buf); + row_buf = NULL; +#endif /* !SINGLE_ROWBUF_ALLOC */ @@ -1428,12 +1450,12 @@ diff -Naru libpng-1.6.19.org/pngtest.c libpng-1.6.19/pngtest.c + } + else +#endif - for (pass = 0; pass < num_pass; pass++) + for (pass = 0; pass < num_passes; pass++) { - pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.19.org/pngwrite.c libpng-1.6.19/pngwrite.c ---- libpng-1.6.19.org/pngwrite.c 2015-11-15 22:34:42.413615688 +0900 -+++ libpng-1.6.19/pngwrite.c 2015-11-15 22:34:42.481618062 +0900 + # ifdef calc_pass_height +diff -Naru libpng-1.6.20.org/pngwrite.c libpng-1.6.20/pngwrite.c +--- libpng-1.6.20.org/pngwrite.c 2015-12-05 23:59:04.689178211 +0900 ++++ libpng-1.6.20/pngwrite.c 2015-12-05 23:59:04.777180705 +0900 @@ -128,6 +128,10 @@ * the application continues writing the PNG. So check the 'invalid' * flag here too. @@ -1501,9 +1523,9 @@ diff -Naru libpng-1.6.19.org/pngwrite.c libpng-1.6.19/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED # ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.19.org/pngwutil.c libpng-1.6.19/pngwutil.c ---- libpng-1.6.19.org/pngwutil.c 2015-11-15 22:34:42.414615723 +0900 -+++ libpng-1.6.19/pngwutil.c 2015-11-15 22:34:42.482618096 +0900 +diff -Naru libpng-1.6.20.org/pngwutil.c libpng-1.6.20/pngwutil.c +--- libpng-1.6.20.org/pngwutil.c 2015-12-05 23:59:04.690178239 +0900 ++++ libpng-1.6.20/pngwutil.c 2015-12-05 23:59:04.777180705 +0900 @@ -901,6 +901,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1670,9 +1692,9 @@ diff -Naru libpng-1.6.19.org/pngwutil.c libpng-1.6.19/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.19.org/scripts/symbols.def libpng-1.6.19/scripts/symbols.def ---- libpng-1.6.19.org/scripts/symbols.def 2015-11-15 22:34:42.419615897 +0900 -+++ libpng-1.6.19/scripts/symbols.def 2015-11-15 22:34:42.486618236 +0900 +diff -Naru libpng-1.6.20.org/scripts/symbols.def libpng-1.6.20/scripts/symbols.def +--- libpng-1.6.20.org/scripts/symbols.def 2015-12-05 23:59:04.699178494 +0900 ++++ libpng-1.6.20/scripts/symbols.def 2015-12-05 23:59:04.784180903 +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 8405096..ac311eb 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.19 +Version: 1.6.20 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 +* Sun Dec 27 2015 Automatic Build System 1.6.20-1mamba +- automatic version update by autodist + * Tue Nov 17 2015 Automatic Build System 1.6.19-1mamba - automatic version update by autodist