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

automatic version update by autodist [release 1.6.35-1mamba;Sat Sep 15 2018]

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

112
libpng-1.6.34-apng.patch → libpng-1.6.35-apng.patch
View File

@ -1,6 +1,6 @@
diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
--- libpng-1.6.34.org/png.h 2017-09-29 18:55:30.653711999 +0900
+++ libpng-1.6.34/png.h 2017-09-29 18:56:30.306850103 +0900
diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
--- libpng-1.6.35.org/png.h 2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/png.h 2018-07-21 19:16:16.327364638 +0900
@@ -361,6 +361,10 @@
# include "pnglibconf.h"
#endif
@ -139,10 +139,10 @@ diff -Naru libpng-1.6.34.org/png.h libpng-1.6.34/png.h
#endif
#ifdef __cplusplus
diff -Naru libpng-1.6.34.org/pngget.c libpng-1.6.34/pngget.c
--- libpng-1.6.34.org/pngget.c 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pngget.c 2017-09-29 18:56:30.286848380 +0900
@@ -1245,4 +1245,166 @@
diff -Naru libpng-1.6.35.org/pngget.c libpng-1.6.35/pngget.c
--- libpng-1.6.35.org/pngget.c 2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngget.c 2018-07-21 19:16:16.229356281 +0900
@@ -1246,4 +1246,166 @@
# endif
#endif
@ -309,9 +309,9 @@ diff -Naru libpng-1.6.34.org/pngget.c libpng-1.6.34/pngget.c
+}
+#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */
diff -Naru libpng-1.6.34.org/pnginfo.h libpng-1.6.34/pnginfo.h
--- libpng-1.6.34.org/pnginfo.h 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pnginfo.h 2017-09-29 18:56:30.286848380 +0900
diff -Naru libpng-1.6.35.org/pnginfo.h libpng-1.6.35/pnginfo.h
--- libpng-1.6.35.org/pnginfo.h 2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pnginfo.h 2018-07-21 19:16:16.228356197 +0900
@@ -263,5 +263,18 @@
png_bytepp row_pointers; /* the image bits */
#endif
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.34.org/pnginfo.h libpng-1.6.34/pnginfo.h
+
};
#endif /* PNGINFO_H */
diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
--- libpng-1.6.34.org/pngpread.c 2017-09-29 18:53:22.698691668 +0900
+++ libpng-1.6.34/pngpread.c 2017-09-29 18:56:30.286848380 +0900
diff -Naru libpng-1.6.35.org/pngpread.c libpng-1.6.35/pngpread.c
--- libpng-1.6.35.org/pngpread.c 2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngpread.c 2018-07-21 19:16:16.228356197 +0900
@@ -195,6 +195,106 @@
chunk_name = png_ptr->chunk_name;
@ -594,10 +594,10 @@ diff -Naru libpng-1.6.34.org/pngpread.c libpng-1.6.34/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
{
diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/pngpriv.h
--- libpng-1.6.34.org/pngpriv.h 2017-09-29 18:53:22.699691754 +0900
+++ libpng-1.6.34/pngpriv.h 2017-09-29 18:56:30.286848380 +0900
@@ -628,6 +628,10 @@
diff -Naru libpng-1.6.35.org/pngpriv.h libpng-1.6.35/pngpriv.h
--- libpng-1.6.35.org/pngpriv.h 2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngpriv.h 2018-07-21 19:16:16.226356026 +0900
@@ -634,6 +634,10 @@
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
/* 0x4000U (unused) */
#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
@ -608,7 +608,7 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001U
@@ -864,6 +868,16 @@
@@ -870,6 +874,16 @@
#define png_tRNS PNG_U32(116, 82, 78, 83)
#define png_zTXt PNG_U32(122, 84, 88, 116)
@ -625,7 +625,7 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/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.
*/
@@ -1635,6 +1649,47 @@
@@ -1641,6 +1655,47 @@
*/
#endif
@ -673,9 +673,9 @@ diff -Naru libpng-1.6.34.org/pngpriv.h libpng-1.6.34/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.34.org/pngread.c libpng-1.6.34/pngread.c
--- libpng-1.6.34.org/pngread.c 2017-09-29 18:53:22.699691754 +0900
+++ libpng-1.6.34/pngread.c 2017-09-29 18:56:30.286848380 +0900
diff -Naru libpng-1.6.35.org/pngread.c libpng-1.6.35/pngread.c
--- libpng-1.6.35.org/pngread.c 2018-07-21 19:16:37.186143016 +0900
+++ libpng-1.6.35/pngread.c 2018-07-21 19:16:16.224355855 +0900
@@ -161,6 +161,9 @@
else if (chunk_name == png_IDAT)
@ -777,9 +777,9 @@ diff -Naru libpng-1.6.34.org/pngread.c libpng-1.6.34/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.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
--- libpng-1.6.34.org/pngrutil.c 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngrutil.c 2017-09-29 18:56:30.287848466 +0900
diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
--- libpng-1.6.35.org/pngrutil.c 2018-07-21 19:16:37.187143101 +0900
+++ libpng-1.6.35/pngrutil.c 2018-07-21 19:16:16.220355514 +0900
@@ -865,6 +865,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -792,7 +792,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2840,6 +2845,179 @@
@@ -2858,6 +2863,179 @@
}
#endif
@ -972,7 +972,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
static int
@@ -4145,7 +4323,38 @@
@@ -4166,7 +4344,38 @@
{
uInt avail_in;
png_bytep buffer;
@ -983,7 +983,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+ {
+ png_crc_finish(png_ptr, bytes_to_skip);
+ bytes_to_skip = 0;
+
+ png_ptr->idat_size = png_read_chunk_header(png_ptr);
+ if (png_ptr->num_frames_read == 0)
+ {
@ -1001,7 +1001,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+ bytes_to_skip = png_ptr->idat_size;
+ continue;
+ }
+
+ png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
+
+ png_ptr->idat_size -= 4;
@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
while (png_ptr->idat_size == 0)
{
png_crc_finish(png_ptr, 0);
@@ -4157,7 +4366,7 @@
@@ -4178,7 +4387,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.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
avail_in = png_ptr->IDAT_read_size;
if (avail_in > png_ptr->idat_size)
@@ -4220,6 +4429,9 @@
@@ -4241,6 +4450,9 @@
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
png_chunk_benign_error(png_ptr, "Extra compressed data");
@@ -4658,4 +4870,80 @@
@@ -4679,4 +4891,80 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.34.org/pngrutil.c libpng-1.6.34/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */
diff -Naru libpng-1.6.34.org/pngset.c libpng-1.6.34/pngset.c
--- libpng-1.6.34.org/pngset.c 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngset.c 2017-09-29 18:56:30.292848897 +0900
diff -Naru libpng-1.6.35.org/pngset.c libpng-1.6.35/pngset.c
--- libpng-1.6.35.org/pngset.c 2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngset.c 2018-07-21 19:16:16.256358584 +0900
@@ -288,6 +288,11 @@
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.34.org/pngset.c libpng-1.6.34/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.34.org/pngstruct.h libpng-1.6.34/pngstruct.h
--- libpng-1.6.34.org/pngstruct.h 2017-09-29 18:53:22.701691926 +0900
+++ libpng-1.6.34/pngstruct.h 2017-09-29 18:56:30.287848466 +0900
diff -Naru libpng-1.6.35.org/pngstruct.h libpng-1.6.35/pngstruct.h
--- libpng-1.6.35.org/pngstruct.h 2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngstruct.h 2018-07-21 19:16:16.214355003 +0900
@@ -403,6 +403,27 @@
png_byte filter_type;
#endif
@ -1305,9 +1305,9 @@ diff -Naru libpng-1.6.34.org/pngstruct.h libpng-1.6.34/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.34.org/pngtest.c libpng-1.6.34/pngtest.c
--- libpng-1.6.34.org/pngtest.c 2017-09-29 18:55:30.654712085 +0900
+++ libpng-1.6.34/pngtest.c 2017-09-29 18:56:30.287848466 +0900
diff -Naru libpng-1.6.35.org/pngtest.c libpng-1.6.35/pngtest.c
--- libpng-1.6.35.org/pngtest.c 2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngtest.c 2018-07-21 19:16:16.213354917 +0900
@@ -875,6 +875,10 @@
volatile int num_passes;
int pass;
@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.34.org/pngtest.c libpng-1.6.34/pngtest.c
for (pass = 0; pass < num_passes; pass++)
{
# ifdef calc_pass_height
diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
--- libpng-1.6.34.org/pngwrite.c 2017-09-29 18:53:22.702692013 +0900
+++ libpng-1.6.34/pngwrite.c 2017-09-29 18:56:30.288848552 +0900
diff -Naru libpng-1.6.35.org/pngwrite.c libpng-1.6.35/pngwrite.c
--- libpng-1.6.35.org/pngwrite.c 2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngwrite.c 2018-07-21 19:16:16.211354747 +0900
@@ -128,6 +128,10 @@
* the application continues writing the PNG. So check the 'invalid'
* flag here too.
@ -1523,12 +1523,12 @@ diff -Naru libpng-1.6.34.org/pngwrite.c libpng-1.6.34/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
/* Initialize the write structure - general purpose utility. */
diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
--- libpng-1.6.34.org/pngwutil.c 2017-09-29 18:53:22.703692099 +0900
+++ libpng-1.6.34/pngwutil.c 2017-09-29 18:56:30.302849758 +0900
@@ -822,6 +822,11 @@
diff -Naru libpng-1.6.35.org/pngwutil.c libpng-1.6.35/pngwutil.c
--- libpng-1.6.35.org/pngwutil.c 2018-07-21 19:16:37.189143271 +0900
+++ libpng-1.6.35/pngwutil.c 2018-07-21 19:16:16.303362592 +0900
@@ -821,6 +821,11 @@
/* 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, 13);
+#ifdef PNG_WRITE_APNG_SUPPORTED
+ png_ptr->first_frame_width = width;
@ -1538,7 +1538,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
if ((png_ptr->do_filter) == PNG_NO_FILTERS)
{
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
@@ -1003,8 +1008,17 @@
@@ -1002,8 +1007,17 @@
optimize_cmf(data, png_image_size(png_ptr));
#endif
@ -1558,7 +1558,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->zstream.next_out = data;
@@ -1051,7 +1065,17 @@
@@ -1050,7 +1064,17 @@
#endif
if (size > 0)
@ -1576,7 +1576,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
png_ptr->zstream.avail_out = 0;
png_ptr->zstream.next_out = NULL;
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
@@ -1887,6 +1911,82 @@
@@ -1885,6 +1909,82 @@
}
#endif
@ -1659,7 +1659,7 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structrp png_ptr)
@@ -2781,4 +2881,39 @@
@@ -2778,4 +2878,39 @@
}
#endif /* WRITE_FLUSH */
}
@ -1699,9 +1699,9 @@ diff -Naru libpng-1.6.34.org/pngwutil.c libpng-1.6.34/pngwutil.c
+}
+#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */
diff -Naru libpng-1.6.34.org/scripts/symbols.def libpng-1.6.34/scripts/symbols.def
--- libpng-1.6.34.org/scripts/symbols.def 2017-09-29 18:55:30.655712171 +0900
+++ libpng-1.6.34/scripts/symbols.def 2017-09-29 18:56:30.289848638 +0900
diff -Naru libpng-1.6.35.org/scripts/symbols.def libpng-1.6.35/scripts/symbols.def
--- libpng-1.6.35.org/scripts/symbols.def 2018-07-21 19:16:37.192143527 +0900
+++ libpng-1.6.35/scripts/symbols.def 2018-07-21 19:16:16.206354321 +0900
@@ -254,3 +254,23 @@
png_set_eXIf @247
png_get_eXIf_1 @248

5
libpng.spec
View File

@ -1,6 +1,6 @@
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
Name: libpng
Version: 1.6.34
Version: 1.6.35
Release: 1mamba
Summary: A library of functions for manipulating PNG image format files
Group: System/Libraries
@ -126,6 +126,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
%endif
%changelog
* Sat Sep 15 2018 Automatic Build System <autodist@mambasoft.it> 1.6.35-1mamba
- automatic version update by autodist
* Tue Oct 03 2017 Automatic Build System <autodist@mambasoft.it> 1.6.34-1mamba
- automatic version update by autodist