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

automatic version update by autodist [release 1.6.36-1mamba;Tue Dec 25 2018]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-06 05:24:43 +01:00
parent efa2bbd188
commit 8654846ca5
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.35-apng.patch → libpng-1.6.36-apng.patch
View File

@ -1,7 +1,7 @@
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 @@
diff -Naru libpng-1.6.36.org/png.h libpng-1.6.36/png.h
--- libpng-1.6.36.org/png.h 2018-12-02 22:43:57.309906480 +0900
+++ libpng-1.6.36/png.h 2018-12-02 22:43:57.355905745 +0900
@@ -330,6 +330,10 @@
# include "pnglibconf.h"
#endif
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
#ifndef PNG_VERSION_INFO_ONLY
/* Machine specific configuration. */
# include "pngconf.h"
@@ -456,6 +460,17 @@
@@ -425,6 +429,17 @@
* See pngconf.h for base types that vary by machine/system
*/
@ -30,7 +30,7 @@ diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
@@ -777,6 +792,10 @@
@@ -746,6 +761,10 @@
#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
@ -41,7 +41,7 @@ diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
@@ -814,6 +833,10 @@
@@ -783,6 +802,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.35.org/png.h libpng-1.6.35/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
@@ -3257,6 +3280,74 @@
@@ -3226,6 +3249,74 @@
/*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS
******************************************************************************/
@ -127,7 +127,7 @@ diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
* defs, and in scripts/symbols.def.
@@ -3266,7 +3357,11 @@
@@ -3235,7 +3326,11 @@
* one to use is one more than this.)
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
@ -139,9 +139,9 @@ diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
#endif
#ifdef __cplusplus
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
diff -Naru libpng-1.6.36.org/pngget.c libpng-1.6.36/pngget.c
--- libpng-1.6.36.org/pngget.c 2018-12-02 22:43:57.309906480 +0900
+++ libpng-1.6.36/pngget.c 2018-12-02 22:43:57.355905745 +0900
@@ -1246,4 +1246,166 @@
# endif
#endif
@ -309,9 +309,9 @@ diff -Naru libpng-1.6.35.org/pngget.c libpng-1.6.35/pngget.c
+}
+#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */
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
diff -Naru libpng-1.6.36.org/pnginfo.h libpng-1.6.36/pnginfo.h
--- libpng-1.6.36.org/pnginfo.h 2018-12-02 22:43:57.309906480 +0900
+++ libpng-1.6.36/pnginfo.h 2018-12-02 22:43:57.355905745 +0900
@@ -263,5 +263,18 @@
png_bytepp row_pointers; /* the image bits */
#endif
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.35.org/pnginfo.h libpng-1.6.35/pnginfo.h
+
};
#endif /* PNGINFO_H */
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
diff -Naru libpng-1.6.36.org/pngpread.c libpng-1.6.36/pngpread.c
--- libpng-1.6.36.org/pngpread.c 2018-12-02 22:43:57.309906480 +0900
+++ libpng-1.6.36/pngpread.c 2018-12-02 22:43:57.356905729 +0900
@@ -195,6 +195,106 @@
chunk_name = png_ptr->chunk_name;
@ -594,10 +594,10 @@ diff -Naru libpng-1.6.35.org/pngpread.c libpng-1.6.35/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
{
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 @@
diff -Naru libpng-1.6.36.org/pngpriv.h libpng-1.6.36/pngpriv.h
--- libpng-1.6.36.org/pngpriv.h 2018-12-02 22:43:57.310906464 +0900
+++ libpng-1.6.36/pngpriv.h 2018-12-02 22:43:57.356905729 +0900
@@ -637,6 +637,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.35.org/pngpriv.h libpng-1.6.35/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001U
@@ -870,6 +874,16 @@
@@ -873,6 +877,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.35.org/pngpriv.h libpng-1.6.35/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.
*/
@@ -1641,6 +1655,47 @@
@@ -1644,6 +1658,47 @@
*/
#endif
@ -673,9 +673,9 @@ diff -Naru libpng-1.6.35.org/pngpriv.h libpng-1.6.35/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.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
diff -Naru libpng-1.6.36.org/pngread.c libpng-1.6.36/pngread.c
--- libpng-1.6.36.org/pngread.c 2018-12-02 22:43:57.310906464 +0900
+++ libpng-1.6.36/pngread.c 2018-12-02 22:43:57.356905729 +0900
@@ -161,6 +161,9 @@
else if (chunk_name == png_IDAT)
@ -777,9 +777,9 @@ diff -Naru libpng-1.6.35.org/pngread.c libpng-1.6.35/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.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
diff -Naru libpng-1.6.36.org/pngrutil.c libpng-1.6.36/pngrutil.c
--- libpng-1.6.36.org/pngrutil.c 2018-12-02 22:43:57.311906448 +0900
+++ libpng-1.6.36/pngrutil.c 2018-12-02 22:43:57.358905697 +0900
@@ -865,6 +865,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -792,7 +792,7 @@ diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2858,6 +2863,179 @@
@@ -2857,6 +2862,179 @@
}
#endif
@ -972,7 +972,7 @@ diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
static int
@@ -4166,7 +4344,38 @@
@@ -4165,7 +4343,38 @@
{
uInt avail_in;
png_bytep buffer;
@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
while (png_ptr->idat_size == 0)
{
png_crc_finish(png_ptr, 0);
@@ -4178,7 +4387,7 @@
@@ -4177,7 +4386,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.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
avail_in = png_ptr->IDAT_read_size;
if (avail_in > png_ptr->idat_size)
@@ -4241,6 +4450,9 @@
@@ -4240,6 +4449,9 @@
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
png_chunk_benign_error(png_ptr, "Extra compressed data");
@@ -4679,4 +4891,80 @@
@@ -4678,4 +4890,80 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */
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
diff -Naru libpng-1.6.36.org/pngset.c libpng-1.6.36/pngset.c
--- libpng-1.6.36.org/pngset.c 2018-12-02 22:43:57.312906432 +0900
+++ libpng-1.6.36/pngset.c 2018-12-02 22:43:57.358905697 +0900
@@ -288,6 +288,11 @@
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
@ -1274,10 +1274,10 @@ diff -Naru libpng-1.6.35.org/pngset.c libpng-1.6.35/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.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 @@
diff -Naru libpng-1.6.36.org/pngstruct.h libpng-1.6.36/pngstruct.h
--- libpng-1.6.36.org/pngstruct.h 2018-12-02 22:43:57.312906432 +0900
+++ libpng-1.6.36/pngstruct.h 2018-12-02 22:43:57.358905697 +0900
@@ -407,6 +407,27 @@
png_byte filter_type;
#endif
@ -1305,9 +1305,9 @@ diff -Naru libpng-1.6.35.org/pngstruct.h libpng-1.6.35/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.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
diff -Naru libpng-1.6.36.org/pngtest.c libpng-1.6.36/pngtest.c
--- libpng-1.6.36.org/pngtest.c 2018-12-02 22:43:57.312906432 +0900
+++ libpng-1.6.36/pngtest.c 2018-12-02 22:43:57.358905697 +0900
@@ -875,6 +875,10 @@
volatile int num_passes;
int pass;
@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.35.org/pngtest.c libpng-1.6.35/pngtest.c
for (pass = 0; pass < num_passes; pass++)
{
# ifdef calc_pass_height
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
diff -Naru libpng-1.6.36.org/pngwrite.c libpng-1.6.36/pngwrite.c
--- libpng-1.6.36.org/pngwrite.c 2018-12-02 22:43:57.313906416 +0900
+++ libpng-1.6.36/pngwrite.c 2018-12-02 22:43:57.359905681 +0900
@@ -128,6 +128,10 @@
* the application continues writing the PNG. So check the 'invalid'
* flag here too.
@ -1479,7 +1479,7 @@ diff -Naru libpng-1.6.35.org/pngwrite.c libpng-1.6.35/pngwrite.c
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
{
@@ -1461,6 +1470,43 @@
@@ -1465,6 +1474,43 @@
}
#endif
@ -1523,9 +1523,9 @@ diff -Naru libpng-1.6.35.org/pngwrite.c libpng-1.6.35/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
/* Initialize the write structure - general purpose utility. */
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
diff -Naru libpng-1.6.36.org/pngwutil.c libpng-1.6.36/pngwutil.c
--- libpng-1.6.36.org/pngwutil.c 2018-12-02 22:43:57.313906416 +0900
+++ libpng-1.6.36/pngwutil.c 2018-12-02 22:43:57.359905681 +0900
@@ -821,6 +821,11 @@
/* Write the chunk */
png_write_complete_chunk(png_ptr, png_IHDR, buf, 13);
@ -1699,10 +1699,10 @@ diff -Naru libpng-1.6.35.org/pngwutil.c libpng-1.6.35/pngwutil.c
+}
+#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */
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 @@
diff -Naru libpng-1.6.36.org/scripts/symbols.def libpng-1.6.36/scripts/symbols.def
--- libpng-1.6.36.org/scripts/symbols.def 2018-12-02 22:43:57.315906384 +0900
+++ libpng-1.6.36/scripts/symbols.def 2018-12-02 22:43:57.362905633 +0900
@@ -253,3 +253,23 @@
png_set_eXIf @247
png_get_eXIf_1 @248
png_set_eXIf_1 @249

5
libpng.spec
View File

@ -1,6 +1,6 @@
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
Name: libpng
Version: 1.6.35
Version: 1.6.36
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
* Tue Dec 25 2018 Automatic Build System <autodist@mambasoft.it> 1.6.36-1mamba
- automatic version update by autodist
* Sat Sep 15 2018 Automatic Build System <autodist@mambasoft.it> 1.6.35-1mamba
- automatic version update by autodist