From 60f109c361e47b293adfbcb4a5d277c46392f7b3 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 05:24:41 +0100 Subject: [PATCH] automatic version update by autodist [release 1.6.13-1mamba;Wed Sep 10 2014] --- ....12-apng.patch => libpng-1.6.13-apng.patch | 96 +++++++++---------- libpng.spec | 5 +- 2 files changed, 52 insertions(+), 49 deletions(-) rename libpng-1.6.12-apng.patch => libpng-1.6.13-apng.patch (95%) diff --git a/libpng-1.6.12-apng.patch b/libpng-1.6.13-apng.patch similarity index 95% rename from libpng-1.6.12-apng.patch rename to libpng-1.6.13-apng.patch index 910ee46..0d2dad8 100644 --- a/libpng-1.6.12-apng.patch +++ b/libpng-1.6.13-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h ---- libpng-1.6.12.org/png.h 2014-06-12 20:50:55.236436493 +0900 -+++ libpng-1.6.12/png.h 2014-06-12 20:50:55.301438712 +0900 -@@ -464,6 +464,10 @@ +diff -Naru libpng-1.6.13.org/png.h libpng-1.6.13/png.h +--- libpng-1.6.13.org/png.h 2014-08-22 22:59:37.076529918 +0900 ++++ libpng-1.6.13/png.h 2014-08-22 22:59:37.152532707 +0900 +@@ -467,6 +467,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -554,6 +558,17 @@ +@@ -557,6 +561,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -874,6 +889,10 @@ +@@ -877,6 +892,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.12.org/png.h libpng-1.6.12/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -911,6 +930,10 @@ +@@ -914,6 +933,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.12.org/png.h libpng-1.6.12/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 -@@ -3246,6 +3269,74 @@ +@@ -3249,6 +3272,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -127,7 +127,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h /* Maintainer: Put new public prototypes here ^, in libpng.3, and project * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt -@@ -3256,7 +3347,11 @@ +@@ -3259,7 +3350,11 @@ * scripts/symbols.def as well. */ #ifdef PNG_EXPORT_LAST_ORDINAL @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c ---- libpng-1.6.12.org/pngget.c 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pngget.c 2014-06-12 20:50:55.302438746 +0900 +diff -Naru libpng-1.6.13.org/pngget.c libpng-1.6.13/pngget.c +--- libpng-1.6.13.org/pngget.c 2014-08-22 22:59:37.077529955 +0900 ++++ libpng-1.6.13/pngget.c 2014-08-22 22:59:37.152532707 +0900 @@ -1195,4 +1195,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h ---- libpng-1.6.12.org/pnginfo.h 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pnginfo.h 2014-06-12 20:50:55.302438746 +0900 +diff -Naru libpng-1.6.13.org/pnginfo.h libpng-1.6.13/pnginfo.h +--- libpng-1.6.13.org/pnginfo.h 2014-08-22 22:59:37.077529955 +0900 ++++ libpng-1.6.13/pnginfo.h 2014-08-22 22:59:37.153532744 +0900 @@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,9 +331,9 @@ diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c ---- libpng-1.6.12.org/pngpread.c 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pngpread.c 2014-06-12 20:50:55.302438746 +0900 +diff -Naru libpng-1.6.13.org/pngpread.c libpng-1.6.13/pngpread.c +--- libpng-1.6.13.org/pngpread.c 2014-08-22 22:59:37.077529955 +0900 ++++ libpng-1.6.13/pngpread.c 2014-08-22 22:59:37.153532744 +0900 @@ -217,6 +217,109 @@ chunk_name = png_ptr->chunk_name; @@ -597,10 +597,10 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h ---- libpng-1.6.12.org/pngpriv.h 2014-06-12 20:50:55.238436561 +0900 -+++ libpng-1.6.12/pngpriv.h 2014-06-12 20:50:55.303438780 +0900 -@@ -551,6 +551,10 @@ +diff -Naru libpng-1.6.13.org/pngpriv.h libpng-1.6.13/pngpriv.h +--- libpng-1.6.13.org/pngpriv.h 2014-08-22 22:59:37.078529992 +0900 ++++ libpng-1.6.13/pngpriv.h 2014-08-22 22:59:37.154532781 +0900 +@@ -555,6 +555,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 +611,7 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h /* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 -@@ -772,6 +776,16 @@ +@@ -776,6 +780,16 @@ #define png_tRNS PNG_U32(116, 82, 78, 83) #define png_zTXt PNG_U32(122, 84, 88, 116) @@ -628,7 +628,7 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/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. */ -@@ -1472,6 +1486,47 @@ +@@ -1476,6 +1490,47 @@ */ #endif @@ -676,9 +676,9 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/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.12.org/pngread.c libpng-1.6.12/pngread.c ---- libpng-1.6.12.org/pngread.c 2014-06-12 20:50:55.238436561 +0900 -+++ libpng-1.6.12/pngread.c 2014-06-12 20:50:55.304438815 +0900 +diff -Naru libpng-1.6.13.org/pngread.c libpng-1.6.13/pngread.c +--- libpng-1.6.13.org/pngread.c 2014-08-22 22:59:37.079530029 +0900 ++++ libpng-1.6.13/pngread.c 2014-08-22 22:59:37.154532781 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,9 +780,9 @@ diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/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.12.org/pngrutil.c libpng-1.6.12/pngrutil.c ---- libpng-1.6.12.org/pngrutil.c 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngrutil.c 2014-06-12 20:50:55.305438849 +0900 +diff -Naru libpng-1.6.13.org/pngrutil.c libpng-1.6.13/pngrutil.c +--- libpng-1.6.13.org/pngrutil.c 2014-08-22 22:59:37.081530102 +0900 ++++ libpng-1.6.13/pngrutil.c 2014-08-22 22:59:37.156532854 +0900 @@ -818,6 +818,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c ---- libpng-1.6.12.org/pngset.c 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngset.c 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.13.org/pngset.c libpng-1.6.13/pngset.c +--- libpng-1.6.13.org/pngset.c 2014-08-22 22:59:37.082530138 +0900 ++++ libpng-1.6.13/pngset.c 2014-08-22 22:59:37.157532891 +0900 @@ -239,6 +239,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1277,9 +1277,9 @@ diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/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.12.org/pngstruct.h libpng-1.6.12/pngstruct.h ---- libpng-1.6.12.org/pngstruct.h 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngstruct.h 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.13.org/pngstruct.h libpng-1.6.13/pngstruct.h +--- libpng-1.6.13.org/pngstruct.h 2014-08-22 22:59:37.082530138 +0900 ++++ libpng-1.6.13/pngstruct.h 2014-08-22 22:59:37.157532891 +0900 @@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/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.12.org/pngtest.c libpng-1.6.12/pngtest.c ---- libpng-1.6.12.org/pngtest.c 2014-06-12 20:50:55.241436664 +0900 -+++ libpng-1.6.12/pngtest.c 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.13.org/pngtest.c libpng-1.6.13/pngtest.c +--- libpng-1.6.13.org/pngtest.c 2014-08-22 22:59:37.083530175 +0900 ++++ libpng-1.6.13/pngtest.c 2014-08-22 22:59:37.157532891 +0900 @@ -848,6 +848,10 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c ---- libpng-1.6.12.org/pngwrite.c 2014-06-12 20:50:55.241436664 +0900 -+++ libpng-1.6.12/pngwrite.c 2014-06-12 20:50:55.307438917 +0900 +diff -Naru libpng-1.6.13.org/pngwrite.c libpng-1.6.13/pngwrite.c +--- libpng-1.6.13.org/pngwrite.c 2014-08-22 22:59:37.084530212 +0900 ++++ libpng-1.6.13/pngwrite.c 2014-08-22 22:59:37.158532928 +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.12.org/pngwrite.c libpng-1.6.12/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c ---- libpng-1.6.12.org/pngwutil.c 2014-06-12 20:50:55.242436698 +0900 -+++ libpng-1.6.12/pngwutil.c 2014-06-12 20:50:55.307438917 +0900 +diff -Naru libpng-1.6.13.org/pngwutil.c libpng-1.6.13/pngwutil.c +--- libpng-1.6.13.org/pngwutil.c 2014-08-22 22:59:37.084530212 +0900 ++++ libpng-1.6.13/pngwutil.c 2014-08-22 22:59:37.159532965 +0900 @@ -898,6 +898,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.12.org/pngwutil.c libpng-1.6.12/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.12.org/scripts/symbols.def libpng-1.6.12/scripts/symbols.def ---- libpng-1.6.12.org/scripts/symbols.def 2014-06-12 20:50:55.248436903 +0900 -+++ libpng-1.6.12/scripts/symbols.def 2014-06-12 20:50:55.314439156 +0900 +diff -Naru libpng-1.6.13.org/scripts/symbols.def libpng-1.6.13/scripts/symbols.def +--- libpng-1.6.13.org/scripts/symbols.def 2014-08-22 22:59:37.091530469 +0900 ++++ libpng-1.6.13/scripts/symbols.def 2014-08-22 22:59:37.163533111 +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 84673d8..d51df66 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.12 +Version: 1.6.13 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 Sep 10 2014 Automatic Build System 1.6.13-1mamba +- automatic version update by autodist + * Tue Jul 01 2014 Automatic Build System 1.6.12-1mamba - automatic version update by autodist