diff --git a/libpng-1.6.21-apng.patch b/libpng-1.6.22-apng.patch similarity index 91% rename from libpng-1.6.21-apng.patch rename to libpng-1.6.22-apng.patch index c736853..b444ad1 100644 --- a/libpng-1.6.21-apng.patch +++ b/libpng-1.6.22-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.21.org/png.h libpng-1.6.21/png.h ---- libpng-1.6.21.org/png.h 2016-01-24 10:24:48.706471264 +0900 -+++ libpng-1.6.21/png.h 2016-01-24 10:23:01.113429997 +0900 -@@ -335,6 +335,10 @@ +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 +@@ -366,6 +366,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.21.org/png.h libpng-1.6.21/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -430,6 +434,17 @@ +@@ -461,6 +465,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,18 +30,18 @@ diff -Naru libpng-1.6.21.org/png.h libpng-1.6.21/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -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 */ +@@ -781,6 +796,10 @@ + #define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */ + #define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */ + #define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */ +#ifdef PNG_APNG_SUPPORTED +#define PNG_INFO_acTL 0x10000 +#define PNG_INFO_fcTL 0x20000 +#endif - #endif /* This is used for the transformation routines, as some of them -@@ -789,6 +808,10 @@ + * change these values for the row. It also should enable using +@@ -818,6 +837,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,96 +52,96 @@ diff -Naru libpng-1.6.21.org/png.h libpng-1.6.21/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 -@@ -3109,6 +3132,74 @@ +@@ -3236,6 +3259,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ +#ifdef PNG_APNG_SUPPORTED -+PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr, ++PNG_EXPORT(246, png_uint_32, png_get_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); + -+PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr, ++PNG_EXPORT(247, png_uint_32, png_set_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); + -+PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr, ++PNG_EXPORT(248, png_uint_32, png_get_num_frames, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr, ++PNG_EXPORT(249, png_uint_32, png_get_num_plays, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL, ++PNG_EXPORT(250, png_uint_32, png_get_next_frame_fcTL, + (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, + png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, + png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, + png_byte *blend_op)); + -+PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL, ++PNG_EXPORT(251, png_uint_32, png_set_next_frame_fcTL, + (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, + png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op)); + -+PNG_EXPORT(251, png_uint_32, png_get_next_frame_width, ++PNG_EXPORT(252, png_uint_32, png_get_next_frame_width, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(252, png_uint_32, png_get_next_frame_height, ++PNG_EXPORT(253, png_uint_32, png_get_next_frame_height, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset, ++PNG_EXPORT(254, png_uint_32, png_get_next_frame_x_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset, ++PNG_EXPORT(255, png_uint_32, png_get_next_frame_y_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num, ++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_num, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den, ++PNG_EXPORT(257, png_uint_16, png_get_next_frame_delay_den, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op, ++PNG_EXPORT(258, png_byte, png_get_next_frame_dispose_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op, ++PNG_EXPORT(259, png_byte, png_get_next_frame_blend_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(259, png_byte, png_get_first_frame_is_hidden, ++PNG_EXPORT(260, png_byte, png_get_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(260, png_uint_32, png_set_first_frame_is_hidden, ++PNG_EXPORT(261, png_uint_32, png_set_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); + +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(261, void, png_read_frame_head, (png_structp png_ptr, ++PNG_EXPORT(262, void, png_read_frame_head, (png_structp png_ptr, + png_infop info_ptr)); +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_EXPORT(262, void, png_set_progressive_frame_fn, (png_structp png_ptr, ++PNG_EXPORT(263, void, png_set_progressive_frame_fn, (png_structp png_ptr, + png_progressive_frame_ptr frame_info_fn, + png_progressive_frame_ptr frame_end_fn)); +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ + +#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXPORT(263, void, png_write_frame_head, (png_structp png_ptr, ++PNG_EXPORT(264, void, png_write_frame_head, (png_structp png_ptr, + png_infop info_ptr, png_bytepp row_pointers, + png_uint_32 width, png_uint_32 height, + png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op)); + -+PNG_EXPORT(264, void, png_write_frame_tail, (png_structp png_ptr, ++PNG_EXPORT(265, void, png_write_frame_tail, (png_structp png_ptr, + png_infop info_ptr)); +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3118,7 +3209,11 @@ +@@ -3245,7 +3336,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL +#ifdef PNG_APNG_SUPPORTED -+ PNG_EXPORT_LAST_ORDINAL(264); ++ PNG_EXPORT_LAST_ORDINAL(265); +#else - PNG_EXPORT_LAST_ORDINAL(244); + PNG_EXPORT_LAST_ORDINAL(245); +#endif /* PNG_APNG_SUPPORTED */ #endif #ifdef __cplusplus -diff -Naru libpng-1.6.21.org/pngget.c libpng-1.6.21/pngget.c ---- libpng-1.6.21.org/pngget.c 2016-01-24 10:20:33.756887423 +0900 -+++ libpng-1.6.21/pngget.c 2016-01-24 10:23:01.115430072 +0900 +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 @@ -1216,4 +1216,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.21.org/pngget.c libpng-1.6.21/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.21.org/pnginfo.h libpng-1.6.21/pnginfo.h ---- libpng-1.6.21.org/pnginfo.h 2016-01-24 10:20:33.756887423 +0900 -+++ libpng-1.6.21/pnginfo.h 2016-01-24 10:23:01.116430110 +0900 +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 @@ -255,5 +255,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.21.org/pnginfo.h libpng-1.6.21/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.21.org/pngpread.c libpng-1.6.21/pngpread.c ---- libpng-1.6.21.org/pngpread.c 2016-01-24 10:20:33.756887423 +0900 -+++ libpng-1.6.21/pngpread.c 2016-01-24 10:23:01.116430110 +0900 +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 @@ -194,6 +194,106 @@ chunk_name = png_ptr->chunk_name; @@ -594,9 +594,9 @@ diff -Naru libpng-1.6.21.org/pngpread.c libpng-1.6.21/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.21.org/pngpriv.h libpng-1.6.21/pngpriv.h ---- libpng-1.6.21.org/pngpriv.h 2016-01-24 10:24:48.707471302 +0900 -+++ libpng-1.6.21/pngpriv.h 2016-01-24 10:23:01.117430148 +0900 +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 @@ -537,6 +537,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ @@ -673,9 +673,9 @@ diff -Naru libpng-1.6.21.org/pngpriv.h libpng-1.6.21/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.21.org/pngread.c libpng-1.6.21/pngread.c ---- libpng-1.6.21.org/pngread.c 2016-01-24 10:20:33.757887461 +0900 -+++ libpng-1.6.21/pngread.c 2016-01-24 10:23:01.118430185 +0900 +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 @@ else if (chunk_name == png_IDAT) @@ -777,9 +777,9 @@ diff -Naru libpng-1.6.21.org/pngread.c libpng-1.6.21/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.21.org/pngrutil.c libpng-1.6.21/pngrutil.c ---- libpng-1.6.21.org/pngrutil.c 2016-01-24 10:24:48.708471339 +0900 -+++ libpng-1.6.21/pngrutil.c 2016-01-24 10:23:01.120430260 +0900 +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 @@ -855,6 +855,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.21.org/pngrutil.c libpng-1.6.21/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.21.org/pngset.c libpng-1.6.21/pngset.c ---- libpng-1.6.21.org/pngset.c 2016-01-24 10:24:48.708471339 +0900 -+++ libpng-1.6.21/pngset.c 2016-01-24 10:23:01.123430373 +0900 +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 @@ -241,6 +241,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.21.org/pngset.c libpng-1.6.21/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.21.org/pngstruct.h libpng-1.6.21/pngstruct.h ---- libpng-1.6.21.org/pngstruct.h 2016-01-24 10:20:33.760887574 +0900 -+++ libpng-1.6.21/pngstruct.h 2016-01-24 10:23:01.124430411 +0900 +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 @@ -403,6 +403,27 @@ png_byte filter_type; #endif @@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.21.org/pngstruct.h libpng-1.6.21/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.21.org/pngtest.c libpng-1.6.21/pngtest.c ---- libpng-1.6.21.org/pngtest.c 2016-01-24 10:24:48.709471377 +0900 -+++ libpng-1.6.21/pngtest.c 2016-01-24 10:23:01.406441009 +0900 -@@ -874,6 +874,10 @@ +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 +@@ -883,6 +883,10 @@ volatile int num_passes; int pass; int bit_depth, color_type; @@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.21.org/pngtest.c libpng-1.6.21/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1347,6 +1351,22 @@ +@@ -1356,6 +1360,22 @@ } } #endif @@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.21.org/pngtest.c libpng-1.6.21/pngtest.c #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1418,6 +1438,110 @@ +@@ -1427,6 +1447,110 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.21.org/pngtest.c libpng-1.6.21/pngtest.c for (pass = 0; pass < num_passes; pass++) { # ifdef calc_pass_height -diff -Naru libpng-1.6.21.org/pngwrite.c libpng-1.6.21/pngwrite.c ---- libpng-1.6.21.org/pngwrite.c 2016-01-24 10:20:33.761887612 +0900 -+++ libpng-1.6.21/pngwrite.c 2016-01-24 10:23:01.408441084 +0900 +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 @@ -128,6 +128,10 @@ * the application continues writing the PNG. So check the 'invalid' * flag here too. @@ -1522,10 +1522,10 @@ diff -Naru libpng-1.6.21.org/pngwrite.c libpng-1.6.21/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.21.org/pngwutil.c libpng-1.6.21/pngwutil.c ---- libpng-1.6.21.org/pngwutil.c 2016-01-24 10:24:48.711471452 +0900 -+++ libpng-1.6.21/pngwutil.c 2016-01-24 10:23:01.410441159 +0900 + /* 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 @@ -817,6 +817,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1692,30 +1692,30 @@ diff -Naru libpng-1.6.21.org/pngwutil.c libpng-1.6.21/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.21.org/scripts/symbols.def libpng-1.6.21/scripts/symbols.def ---- libpng-1.6.21.org/scripts/symbols.def 2016-01-24 10:24:48.712471489 +0900 -+++ libpng-1.6.21/scripts/symbols.def 2016-01-24 10:23:01.412441235 +0900 -@@ -249,3 +249,23 @@ - png_set_check_for_invalid_index @242 +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 +@@ -250,3 +250,23 @@ png_get_palette_max @243 png_set_option @244 -+ png_get_acTL @245 -+ png_set_acTL @246 -+ png_get_num_frames @247 -+ png_get_num_plays @248 -+ png_get_next_frame_fcTL @249 -+ png_set_next_frame_fcTL @250 -+ png_get_next_frame_width @251 -+ png_get_next_frame_height @252 -+ png_get_next_frame_x_offset @253 -+ png_get_next_frame_y_offset @254 -+ png_get_next_frame_delay_num @255 -+ png_get_next_frame_delay_den @256 -+ png_get_next_frame_dispose_op @257 -+ png_get_next_frame_blend_op @258 -+ png_get_first_frame_is_hidden @259 -+ png_set_first_frame_is_hidden @260 -+ png_read_frame_head @261 -+ png_set_progressive_frame_fn @262 -+ png_write_frame_head @263 -+ png_write_frame_tail @264 + png_image_write_to_memory @245 ++ png_get_acTL @246 ++ png_set_acTL @247 ++ png_get_num_frames @248 ++ png_get_num_plays @249 ++ png_get_next_frame_fcTL @250 ++ png_set_next_frame_fcTL @251 ++ png_get_next_frame_width @252 ++ png_get_next_frame_height @253 ++ png_get_next_frame_x_offset @254 ++ png_get_next_frame_y_offset @255 ++ png_get_next_frame_delay_num @256 ++ png_get_next_frame_delay_den @257 ++ png_get_next_frame_dispose_op @258 ++ png_get_next_frame_blend_op @259 ++ png_get_first_frame_is_hidden @260 ++ png_set_first_frame_is_hidden @261 ++ png_read_frame_head @262 ++ png_set_progressive_frame_fn @263 ++ png_write_frame_head @264 ++ png_write_frame_tail @265 diff --git a/libpng.spec b/libpng.spec index 8b99429..89a5e29 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.21 +Version: 1.6.22 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 May 31 2016 Automatic Build System 1.6.22-1mamba +- automatic version update by autodist + * Mon Jan 25 2016 Automatic Build System 1.6.21-1mamba - automatic version update by autodist