rpms/libpng
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 1.6.29-1mamba;Thu Mar 30 2017]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-06 05:24:43 +01:00
parent 4903f5dd87
commit b79ea79596
2 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
libpng-1.6.28-apng.patch → libpng-1.6.29-apng.patch
View File

@ -1,7 +1,7 @@
diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h diff -Naru libpng-1.6.29.org/png.h libpng-1.6.29/png.h
--- libpng-1.6.28.org/png.h 2017-01-06 07:54:14.001821909 +0900 --- libpng-1.6.29.org/png.h 2017-03-23 20:32:44.633865246 +0900
+++ libpng-1.6.28/png.h 2017-01-06 07:52:51.552368347 +0900 +++ libpng-1.6.29/png.h 2017-03-23 20:32:44.681864878 +0900
@@ -359,6 +359,10 @@ @@ -361,6 +361,10 @@
# include "pnglibconf.h" # include "pnglibconf.h"
#endif #endif
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
#ifndef PNG_VERSION_INFO_ONLY #ifndef PNG_VERSION_INFO_ONLY
/* Machine specific configuration. */ /* Machine specific configuration. */
# include "pngconf.h" # include "pngconf.h"
@@ -454,6 +458,17 @@ @@ -456,6 +460,17 @@
* See pngconf.h for base types that vary by machine/system * See pngconf.h for base types that vary by machine/system
*/ */
@ -30,7 +30,7 @@ diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
/* This triggers a compiler error in png.c, if png.c and png.h /* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number. * do not agree upon the version number.
*/ */
@@ -774,6 +789,10 @@ @@ -776,6 +791,10 @@
#define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */ #define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */
#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */ #define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
@ -41,7 +41,7 @@ diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
/* This is used for the transformation routines, as some of them /* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using * change these values for the row. It also should enable using
@@ -811,6 +830,10 @@ @@ -813,6 +832,10 @@
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
typedef PNG_CALLBACK(void, *png_progressive_end_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.28.org/png.h libpng-1.6.28/png.h
/* The following callback receives png_uint_32 row_number, int pass for the /* 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 * png_bytep data of the row. When transforming an interlaced image the
@@ -3239,6 +3262,74 @@ @@ -3244,6 +3267,74 @@
/******************************************************************************* /*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS * END OF HARDWARE AND SOFTWARE OPTIONS
******************************************************************************/ ******************************************************************************/
@ -127,7 +127,7 @@ diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project /* Maintainer: Put new public prototypes here ^, in libpng.3, in project
* defs, and in scripts/symbols.def. * defs, and in scripts/symbols.def.
@@ -3248,7 +3339,11 @@ @@ -3253,7 +3344,11 @@
* one to use is one more than this.) * one to use is one more than this.)
*/ */
#ifdef PNG_EXPORT_LAST_ORDINAL #ifdef PNG_EXPORT_LAST_ORDINAL
@ -139,9 +139,9 @@ diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
diff -Naru libpng-1.6.28.org/pngget.c libpng-1.6.28/pngget.c diff -Naru libpng-1.6.29.org/pngget.c libpng-1.6.29/pngget.c
--- libpng-1.6.28.org/pngget.c 2017-01-06 07:13:10.613993529 +0900 --- libpng-1.6.29.org/pngget.c 2017-03-23 20:32:44.633865246 +0900
+++ libpng-1.6.28/pngget.c 2017-01-06 07:52:51.542368413 +0900 +++ libpng-1.6.29/pngget.c 2017-03-23 20:32:44.681864878 +0900
@@ -1216,4 +1216,166 @@ @@ -1216,4 +1216,166 @@
# endif # endif
#endif #endif
@ -309,9 +309,9 @@ diff -Naru libpng-1.6.28.org/pngget.c libpng-1.6.28/pngget.c
+} +}
+#endif /* PNG_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */ #endif /* READ || WRITE */
diff -Naru libpng-1.6.28.org/pnginfo.h libpng-1.6.28/pnginfo.h diff -Naru libpng-1.6.29.org/pnginfo.h libpng-1.6.29/pnginfo.h
--- libpng-1.6.28.org/pnginfo.h 2017-01-06 07:13:10.613993529 +0900 --- libpng-1.6.29.org/pnginfo.h 2017-03-23 20:32:44.634865239 +0900
+++ libpng-1.6.28/pnginfo.h 2017-01-06 07:52:51.542368413 +0900 +++ libpng-1.6.29/pnginfo.h 2017-03-23 20:32:44.681864878 +0900
@@ -255,5 +255,18 @@ @@ -255,5 +255,18 @@
png_bytepp row_pointers; /* the image bits */ png_bytepp row_pointers; /* the image bits */
#endif #endif
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.28.org/pnginfo.h libpng-1.6.28/pnginfo.h
+ +
}; };
#endif /* PNGINFO_H */ #endif /* PNGINFO_H */
diff -Naru libpng-1.6.28.org/pngpread.c libpng-1.6.28/pngpread.c diff -Naru libpng-1.6.29.org/pngpread.c libpng-1.6.29/pngpread.c
--- libpng-1.6.28.org/pngpread.c 2017-01-06 07:13:10.614993523 +0900 --- libpng-1.6.29.org/pngpread.c 2017-03-23 20:32:44.634865239 +0900
+++ libpng-1.6.28/pngpread.c 2017-01-06 07:52:51.542368413 +0900 +++ libpng-1.6.29/pngpread.c 2017-03-23 20:32:44.682864871 +0900
@@ -194,6 +194,106 @@ @@ -194,6 +194,106 @@
chunk_name = png_ptr->chunk_name; chunk_name = png_ptr->chunk_name;
@ -594,10 +594,10 @@ diff -Naru libpng-1.6.28.org/pngpread.c libpng-1.6.28/pngpread.c
png_voidp PNGAPI png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr) png_get_progressive_ptr(png_const_structrp png_ptr)
{ {
diff -Naru libpng-1.6.28.org/pngpriv.h libpng-1.6.28/pngpriv.h diff -Naru libpng-1.6.29.org/pngpriv.h libpng-1.6.29/pngpriv.h
--- libpng-1.6.28.org/pngpriv.h 2017-01-06 07:13:10.614993523 +0900 --- libpng-1.6.29.org/pngpriv.h 2017-03-23 20:32:44.634865239 +0900
+++ libpng-1.6.28/pngpriv.h 2017-01-06 07:52:51.542368413 +0900 +++ libpng-1.6.29/pngpriv.h 2017-03-23 20:32:44.682864871 +0900
@@ -567,6 +567,10 @@ @@ -616,6 +616,10 @@
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
/* 0x4000U (unused) */ /* 0x4000U (unused) */
#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */ #define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
@ -608,7 +608,7 @@ diff -Naru libpng-1.6.28.org/pngpriv.h libpng-1.6.28/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */ /* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001U #define PNG_BGR 0x0001U
@@ -802,6 +806,16 @@ @@ -851,6 +855,16 @@
#define png_tRNS PNG_U32(116, 82, 78, 83) #define png_tRNS PNG_U32(116, 82, 78, 83)
#define png_zTXt PNG_U32(122, 84, 88, 116) #define png_zTXt PNG_U32(122, 84, 88, 116)
@ -625,7 +625,7 @@ diff -Naru libpng-1.6.28.org/pngpriv.h libpng-1.6.28/pngpriv.h
/* The following will work on (signed char*) strings, whereas the get_uint_32 /* 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. * macro will fail on top-bit-set values because of the sign extension.
*/ */
@@ -1528,6 +1542,47 @@ @@ -1609,6 +1623,47 @@
*/ */
#endif #endif
@ -673,9 +673,9 @@ diff -Naru libpng-1.6.28.org/pngpriv.h libpng-1.6.28/pngpriv.h
/* Added at libpng version 1.4.0 */ /* Added at libpng version 1.4.0 */
#ifdef PNG_COLORSPACE_SUPPORTED #ifdef PNG_COLORSPACE_SUPPORTED
/* These internal functions are for maintaining the colorspace structure within /* These internal functions are for maintaining the colorspace structure within
diff -Naru libpng-1.6.28.org/pngread.c libpng-1.6.28/pngread.c diff -Naru libpng-1.6.29.org/pngread.c libpng-1.6.29/pngread.c
--- libpng-1.6.28.org/pngread.c 2017-01-06 07:13:10.615993516 +0900 --- libpng-1.6.29.org/pngread.c 2017-03-23 20:32:44.635865231 +0900
+++ libpng-1.6.28/pngread.c 2017-01-06 07:52:51.543368407 +0900 +++ libpng-1.6.29/pngread.c 2017-03-23 20:32:44.683864863 +0900
@@ -161,6 +161,9 @@ @@ -161,6 +161,9 @@
else if (chunk_name == png_IDAT) else if (chunk_name == png_IDAT)
@ -777,9 +777,9 @@ diff -Naru libpng-1.6.28.org/pngread.c libpng-1.6.28/pngread.c
/* Optional call to update the users info_ptr structure */ /* Optional call to update the users info_ptr structure */
void PNGAPI void PNGAPI
png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
diff -Naru libpng-1.6.28.org/pngrutil.c libpng-1.6.28/pngrutil.c diff -Naru libpng-1.6.29.org/pngrutil.c libpng-1.6.29/pngrutil.c
--- libpng-1.6.28.org/pngrutil.c 2017-01-06 07:54:14.001821909 +0900 --- libpng-1.6.29.org/pngrutil.c 2017-03-23 20:32:44.636865223 +0900
+++ libpng-1.6.28/pngrutil.c 2017-01-06 07:52:51.543368407 +0900 +++ libpng-1.6.29/pngrutil.c 2017-03-23 20:32:44.684864855 +0900
@@ -861,6 +861,11 @@ @@ -861,6 +861,11 @@
filter_type = buf[11]; filter_type = buf[11];
interlace_type = buf[12]; interlace_type = buf[12];
@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.28.org/pngrutil.c libpng-1.6.28/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */ #endif /* READ */
diff -Naru libpng-1.6.28.org/pngset.c libpng-1.6.28/pngset.c diff -Naru libpng-1.6.29.org/pngset.c libpng-1.6.29/pngset.c
--- libpng-1.6.28.org/pngset.c 2017-01-06 07:13:10.617993502 +0900 --- libpng-1.6.29.org/pngset.c 2017-03-23 20:32:44.636865223 +0900
+++ libpng-1.6.28/pngset.c 2017-01-06 07:52:51.548368374 +0900 +++ libpng-1.6.29/pngset.c 2017-03-23 20:32:44.684864855 +0900
@@ -241,6 +241,11 @@ @@ -241,6 +241,11 @@
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.28.org/pngset.c libpng-1.6.28/pngset.c
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
static png_byte static png_byte
check_location(png_const_structrp png_ptr, int location) check_location(png_const_structrp png_ptr, int location)
diff -Naru libpng-1.6.28.org/pngstruct.h libpng-1.6.28/pngstruct.h diff -Naru libpng-1.6.29.org/pngstruct.h libpng-1.6.29/pngstruct.h
--- libpng-1.6.28.org/pngstruct.h 2017-01-06 07:54:14.002821902 +0900 --- libpng-1.6.29.org/pngstruct.h 2017-03-23 20:32:44.636865223 +0900
+++ libpng-1.6.28/pngstruct.h 2017-01-06 07:52:51.544368400 +0900 +++ libpng-1.6.29/pngstruct.h 2017-03-23 20:32:44.684864855 +0900
@@ -403,6 +403,27 @@ @@ -403,6 +403,27 @@
png_byte filter_type; png_byte filter_type;
#endif #endif
@ -1305,9 +1305,9 @@ diff -Naru libpng-1.6.28.org/pngstruct.h libpng-1.6.28/pngstruct.h
/* New members added in libpng-1.2.0 */ /* 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 */ /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
diff -Naru libpng-1.6.28.org/pngtest.c libpng-1.6.28/pngtest.c diff -Naru libpng-1.6.29.org/pngtest.c libpng-1.6.29/pngtest.c
--- libpng-1.6.28.org/pngtest.c 2017-01-06 07:54:14.002821902 +0900 --- libpng-1.6.29.org/pngtest.c 2017-03-23 20:32:44.637865216 +0900
+++ libpng-1.6.28/pngtest.c 2017-01-06 07:52:51.545368393 +0900 +++ libpng-1.6.29/pngtest.c 2017-03-23 20:32:44.684864855 +0900
@@ -874,6 +874,10 @@ @@ -874,6 +874,10 @@
volatile int num_passes; volatile int num_passes;
int pass; int pass;
@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.28.org/pngtest.c libpng-1.6.28/pngtest.c
for (pass = 0; pass < num_passes; pass++) for (pass = 0; pass < num_passes; pass++)
{ {
# ifdef calc_pass_height # ifdef calc_pass_height
diff -Naru libpng-1.6.28.org/pngwrite.c libpng-1.6.28/pngwrite.c diff -Naru libpng-1.6.29.org/pngwrite.c libpng-1.6.29/pngwrite.c
--- libpng-1.6.28.org/pngwrite.c 2017-01-06 07:13:10.618993495 +0900 --- libpng-1.6.29.org/pngwrite.c 2017-03-23 20:32:44.637865216 +0900
+++ libpng-1.6.28/pngwrite.c 2017-01-06 07:52:51.546368387 +0900 +++ libpng-1.6.29/pngwrite.c 2017-03-23 20:32:44.685864847 +0900
@@ -128,6 +128,10 @@ @@ -128,6 +128,10 @@
* the application continues writing the PNG. So check the 'invalid' * the application continues writing the PNG. So check the 'invalid'
* flag here too. * flag here too.
@ -1523,10 +1523,10 @@ diff -Naru libpng-1.6.28.org/pngwrite.c libpng-1.6.28/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
/* Initialize the write structure - general purpose utility. */ /* Initialize the write structure - general purpose utility. */
diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c diff -Naru libpng-1.6.29.org/pngwutil.c libpng-1.6.29/pngwutil.c
--- libpng-1.6.28.org/pngwutil.c 2017-01-06 07:13:10.619993488 +0900 --- libpng-1.6.29.org/pngwutil.c 2017-03-23 20:32:44.638865208 +0900
+++ libpng-1.6.28/pngwutil.c 2017-01-06 07:52:51.546368387 +0900 +++ libpng-1.6.29/pngwutil.c 2017-03-23 20:32:44.685864847 +0900
@@ -817,6 +817,11 @@ @@ -822,6 +822,11 @@
/* Write the chunk */ /* Write the chunk */
png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
@ -1538,7 +1538,7 @@ diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
if ((png_ptr->do_filter) == PNG_NO_FILTERS) if ((png_ptr->do_filter) == PNG_NO_FILTERS)
{ {
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
@@ -998,7 +1003,14 @@ @@ -1003,7 +1008,14 @@
optimize_cmf(data, png_image_size(png_ptr)); optimize_cmf(data, png_image_size(png_ptr));
#endif #endif
@ -1553,7 +1553,7 @@ diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->zstream.next_out = data; png_ptr->zstream.next_out = data;
@@ -1044,7 +1056,15 @@ @@ -1049,7 +1061,15 @@
optimize_cmf(data, png_image_size(png_ptr)); optimize_cmf(data, png_image_size(png_ptr));
#endif #endif
@ -1569,7 +1569,7 @@ diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
png_ptr->zstream.avail_out = 0; png_ptr->zstream.avail_out = 0;
png_ptr->zstream.next_out = NULL; png_ptr->zstream.next_out = NULL;
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
@@ -1858,6 +1878,82 @@ @@ -1863,6 +1883,82 @@
} }
#endif #endif
@ -1652,7 +1652,7 @@ diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
/* Initializes the row writing capability of libpng */ /* Initializes the row writing capability of libpng */
void /* PRIVATE */ void /* PRIVATE */
png_write_start_row(png_structrp png_ptr) png_write_start_row(png_structrp png_ptr)
@@ -2752,4 +2848,39 @@ @@ -2757,4 +2853,39 @@
} }
#endif /* WRITE_FLUSH */ #endif /* WRITE_FLUSH */
} }
@ -1692,9 +1692,9 @@ diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
+} +}
+#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */ #endif /* WRITE */
diff -Naru libpng-1.6.28.org/scripts/symbols.def libpng-1.6.28/scripts/symbols.def diff -Naru libpng-1.6.29.org/scripts/symbols.def libpng-1.6.29/scripts/symbols.def
--- libpng-1.6.28.org/scripts/symbols.def 2017-01-06 07:54:14.003821895 +0900 --- libpng-1.6.29.org/scripts/symbols.def 2017-03-23 20:32:44.642865177 +0900
+++ libpng-1.6.28/scripts/symbols.def 2017-01-06 07:52:51.546368387 +0900 +++ libpng-1.6.29/scripts/symbols.def 2017-03-23 20:32:44.690864809 +0900
@@ -250,3 +250,23 @@ @@ -250,3 +250,23 @@
png_get_palette_max @243 png_get_palette_max @243
png_set_option @244 png_set_option @244

5
libpng.spec
View File

@ -1,6 +1,6 @@
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .) %define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
Name: libpng Name: libpng
Version: 1.6.28 Version: 1.6.29
Release: 1mamba Release: 1mamba
Summary: A library of functions for manipulating PNG image format files Summary: A library of functions for manipulating PNG image format files
Group: System/Libraries Group: System/Libraries
@ -126,6 +126,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
%endif %endif
%changelog %changelog
* Thu Mar 30 2017 Automatic Build System <autodist@mambasoft.it> 1.6.29-1mamba
- automatic version update by autodist
* Sun Jan 08 2017 Automatic Build System <autodist@mambasoft.it> 1.6.28-1mamba * Sun Jan 08 2017 Automatic Build System <autodist@mambasoft.it> 1.6.28-1mamba
- automatic version update by autodist - automatic version update by autodist