packages: crossmingw32-libpng/crossmingw32-libpng.spec, crossmingw32-libpng...
qboosh
qboosh at pld-linux.org
Sun Mar 21 18:01:49 CET 2010
Author: qboosh Date: Sun Mar 21 17:01:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.4.1 (from libpng.spec)
---- Files affected:
packages/crossmingw32-libpng:
crossmingw32-libpng.spec (1.36 -> 1.37) , libpng-apng.patch (1.5 -> 1.6) , libpng-read-dither.patch (NONE -> 1.1) (NEW), crossmingw32-libpng-shared.patch (1.3 -> NONE) (REMOVED), libpng-norpath.patch (1.4 -> NONE) (REMOVED), libpng-opt.patch (1.11 -> NONE) (REMOVED), libpng-revert.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/crossmingw32-libpng/crossmingw32-libpng.spec
diff -u packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.36 packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.37
--- packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.36 Wed Mar 25 07:28:46 2009
+++ packages/crossmingw32-libpng/crossmingw32-libpng.spec Sun Mar 21 18:01:40 2010
@@ -3,26 +3,20 @@
Summary: PNG library - Mingw32 cross version
Summary(pl.UTF-8): Biblioteka PNG - wersja skrośna dla Mingw32
Name: crossmingw32-%{realname}
-Version: 1.2.35
+Version: 1.4.1
Release: 1
License: distributable
Group: Development/Libraries
-Source0: http://dl.sourceforge.net/libpng/%{realname}-%{version}.tar.lzma
-# Source0-md5: c6ccc2e011a940f0fc7620b1a2fb96c8
+Source0: http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
+# Source0-md5: d4cb0236cce9ce8ff49a22994a01f9e0
Patch0: %{realname}-pngminus.patch
-Patch1: %{realname}-opt.patch
-Patch2: %{realname}-revert.patch
-Patch3: %{realname}-norpath.patch
-# http://littlesvr.ca/apng/
-Patch4: %{realname}-apng.patch
-Patch5: %{name}-shared.patch
+# http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
+Patch1: %{realname}-apng.patch
+Patch2: %{realname}-read-dither.patch
URL: http://www.libpng.org/pub/png/libpng.html
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake
BuildRequires: crossmingw32-gcc
BuildRequires: crossmingw32-zlib
-BuildRequires: libtool
-BuildRequires: lzma >= 1:4.42
+BuildRequires: xz >= 1:4.999.7
Requires: crossmingw32-zlib
Provides: crossmingw32-libpng(APNG) = 0.10
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,20 +84,12 @@
%prep
%setup -q -n %{realname}-%{version} -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+xz -dc %{SOURCE0} | tar xf - -C ..
%patch0 -p1
-%patch1 -p1
+%patch1 -p0
%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
%configure \
--target=%{target} \
--host=%{target} \
@@ -120,6 +106,8 @@
install -d $RPM_BUILD_ROOT%{_dlldir}
mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+ln -sf libpng14.dll.a $RPM_BUILD_ROOT%{_libdir}/libpng.dll.a
+
%if 0%{!?debug:1}
%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -132,23 +120,23 @@
%files
%defattr(644,root,root,755)
+%{_libdir}/libpng14.dll.a
%{_libdir}/libpng.dll.a
-%{_libdir}/libpng12.dll.a
+%{_libdir}/libpng14.la
%{_libdir}/libpng.la
-%{_libdir}/libpng12.la
-%dir %{_includedir}/libpng12
-%{_includedir}/libpng12/*
-%{_pkgconfigdir}/*.pc
+%{_includedir}/libpng14
+%{_includedir}/png*.h
+%{_pkgconfigdir}/libpng14.pc
+%{_pkgconfigdir}/libpng.pc
%files static
%defattr(644,root,root,755)
+%{_libdir}/libpng14.a
%{_libdir}/libpng.a
-%{_libdir}/libpng12.a
%files dll
%defattr(644,root,root,755)
-%{_dlldir}/libpng-*.dll
-%{_dlldir}/libpng12-*.dll
+%{_dlldir}/libpng14-*.dll
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -156,6 +144,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2010/03/21 17:01:40 qboosh
+- updated to 1.4.1 (from libpng.spec)
+
Revision 1.36 2009/03/25 06:28:46 qboosh
- CVE reference
================================================================
Index: packages/crossmingw32-libpng/libpng-apng.patch
diff -u packages/crossmingw32-libpng/libpng-apng.patch:1.5 packages/crossmingw32-libpng/libpng-apng.patch:1.6
--- packages/crossmingw32-libpng/libpng-apng.patch:1.5 Sat Aug 23 10:08:53 2008
+++ packages/crossmingw32-libpng/libpng-apng.patch Sun Mar 21 18:01:40 2010
@@ -1,54 +1,54 @@
Index: pngread.c
===================================================================
---- pngread.c (révision 149)
-+++ pngread.c (copie de travail)
-@@ -407,6 +407,11 @@
- #if defined(PNG_READ_zTXt_SUPPORTED)
- PNG_CONST PNG_zTXt;
- #endif
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+ PNG_CONST PNG_acTL;
-+ PNG_CONST PNG_fcTL;
-+ PNG_CONST PNG_fdAT;
+--- pngread.c
++++ pngread.c
+@@ -300,6 +300,11 @@
+ #ifdef PNG_READ_zTXt_SUPPORTED
+ PNG_zTXt;
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_acTL;
++ PNG_fcTL;
++ PNG_fdAT;
+#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -451,6 +456,9 @@
+
+@@ -343,6 +348,9 @@
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+ png_have_info(png_ptr, info_ptr);
+#endif
png_ptr->idat_size = length;
png_ptr->mode |= PNG_HAVE_IDAT;
break;
-@@ -523,12 +531,97 @@
+@@ -415,12 +423,95 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4))
++#ifdef PNG_READ_APNG_SUPPORTED
++ else if (!png_memcmp(chunk_name, png_acTL, 4))
+ png_handle_acTL(png_ptr, info_ptr, length);
-+ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
++ else if (!png_memcmp(chunk_name, png_fcTL, 4))
+ png_handle_fcTL(png_ptr, info_ptr, length);
-+ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ else if (!png_memcmp(chunk_name, png_fdAT, 4))
+ png_handle_fdAT(png_ptr, info_ptr, length);
+#endif
else
png_handle_unknown(png_ptr, info_ptr, length);
}
}
- #endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+ #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+void PNGAPI
+png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
+{
+ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */
+
-+ png_debug(0, "Reading frame head\n");
++ png_debug(0, "Reading frame head");
+
+ if (!(png_ptr->mode & PNG_HAVE_acTL))
+ png_error(png_ptr, "attempt to png_read_frame_head() but "
@@ -66,11 +66,9 @@
+ have_chunk_after_DAT = 0;
+ for (;;)
+ {
-+#ifdef PNG_USE_LOCAL_ARRAYS
+ PNG_IDAT;
+ PNG_fdAT;
+ PNG_fcTL;
-+#endif
+ png_byte chunk_length[4];
+ png_uint_32 length;
+
@@ -119,42 +117,41 @@
+}
+#endif /* PNG_READ_APNG_SUPPORTED */
+
- /* optional call to update the users info_ptr structure */
+ /* Optional call to update the users info_ptr structure */
void PNGAPI
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -565,6 +658,10 @@
+@@ -461,6 +552,10 @@
+ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
{
- #ifdef PNG_USE_LOCAL_ARRAYS
- PNG_CONST PNG_IDAT;
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+ PNG_CONST PNG_fdAT;
-+ PNG_CONST PNG_IEND;
+ PNG_IDAT;
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_fdAT;
++ PNG_IEND;
+#endif
PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
0xff};
PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-@@ -694,13 +791,40 @@
+@@ -596,13 +691,39 @@
{
if (!(png_ptr->zstream.avail_in))
{
- while (!png_ptr->idat_size)
+ png_uint_32 bytes_to_skip = 0;
-+
++
+ while (!png_ptr->idat_size || bytes_to_skip != 0)
{
- png_crc_finish(png_ptr, 0);
+ png_crc_finish(png_ptr, bytes_to_skip);
-+ bytes_to_skip = 0;
++ bytes_to_skip = 0;
png_ptr->idat_size = png_read_chunk_header(png_ptr);
-+
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+ if (png_ptr->num_frames_read == 0)
+ {
+#endif
if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
png_error(png_ptr, "Not enough image data");
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+ }
+ else
+ {
@@ -176,38 +173,38 @@
}
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -718,6 +842,9 @@
- png_error(png_ptr, "Extra compressed data");
+@@ -620,6 +741,9 @@
+ png_benign_error(png_ptr, "Extra compressed data");
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+ png_ptr->num_frames_read++;
+#endif
break;
}
if (ret != Z_OK)
-@@ -969,6 +1096,11 @@
- #if defined(PNG_READ_zTXt_SUPPORTED)
- PNG_CONST PNG_zTXt;
- #endif
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+ PNG_CONST PNG_acTL;
-+ PNG_CONST PNG_fcTL;
-+ PNG_CONST PNG_fdAT;
+@@ -875,6 +999,11 @@
+ #ifdef PNG_READ_zTXt_SUPPORTED
+ PNG_zTXt;
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_acTL;
++ PNG_fcTL;
++ PNG_fdAT;
+#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -1069,6 +1201,14 @@
+
+@@ -974,6 +1103,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4))
++#ifdef PNG_READ_APNG_SUPPORTED
++ else if (!png_memcmp(chunk_name, png_acTL, 4))
+ png_handle_acTL(png_ptr, info_ptr, length);
-+ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
++ else if (!png_memcmp(chunk_name, png_fcTL, 4))
+ png_handle_fcTL(png_ptr, info_ptr, length);
-+ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ else if (!png_memcmp(chunk_name, png_fdAT, 4))
+ png_handle_fdAT(png_ptr, info_ptr, length);
+#endif
else
@@ -215,18 +212,18 @@
} while (!(png_ptr->mode & PNG_HAVE_IEND));
Index: pngget.c
===================================================================
---- pngget.c (révision 149)
-+++ pngget.c (copie de travail)
-@@ -797,6 +797,167 @@
+--- pngget.c
++++ pngget.c
+@@ -842,6 +842,167 @@
}
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#ifdef PNG_APNG_SUPPORTED
+png_uint_32 PNGAPI
+png_get_acTL(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 *num_frames, png_uint_32 *num_plays)
+{
-+ png_debug1(1, "in %s retrieval function\n", "acTL");
++ png_debug1(1, "in %s retrieval function", "acTL");
+
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_acTL) &&
@@ -243,7 +240,7 @@
+png_uint_32 PNGAPI
+png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_num_frames()\n");
++ png_debug(1, "in png_get_num_frames()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->num_frames);
@@ -253,7 +250,7 @@
+png_uint_32 PNGAPI
+png_get_num_plays(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_num_plays()\n");
++ png_debug(1, "in png_get_num_plays()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->num_plays);
@@ -267,14 +264,14 @@
+ png_uint_16 *delay_num, png_uint_16 *delay_den,
+ png_byte *dispose_op, png_byte *blend_op)
+{
-+ png_debug1(1, "in %s retrieval function\n", "fcTL");
++ png_debug1(1, "in %s retrieval function", "fcTL");
+
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_fcTL) &&
+ width != NULL && height != NULL &&
+ x_offset != NULL && x_offset != NULL &&
+ delay_num != NULL && delay_den != NULL &&
-+ dispose_op != NULL && blend_op != NULL)
++ dispose_op != NULL && blend_op != NULL)
+ {
+ *width = info_ptr->next_frame_width;
+ *height = info_ptr->next_frame_height;
@@ -293,7 +290,7 @@
+png_uint_32 PNGAPI
+png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_width()\n");
++ png_debug(1, "in png_get_next_frame_width()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_width);
@@ -303,7 +300,7 @@
+png_uint_32 PNGAPI
+png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_height()\n");
++ png_debug(1, "in png_get_next_frame_height()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_height);
@@ -313,7 +310,7 @@
+png_uint_32 PNGAPI
+png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_x_offset()\n");
++ png_debug(1, "in png_get_next_frame_x_offset()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_x_offset);
@@ -323,7 +320,7 @@
+png_uint_32 PNGAPI
+png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_y_offset()\n");
++ png_debug(1, "in png_get_next_frame_y_offset()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_y_offset);
@@ -333,7 +330,7 @@
+png_uint_16 PNGAPI
+png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_delay_num()\n");
++ png_debug(1, "in png_get_next_frame_delay_num()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_delay_num);
@@ -343,7 +340,7 @@
+png_uint_16 PNGAPI
+png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_delay_den()\n");
++ png_debug(1, "in png_get_next_frame_delay_den()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_delay_den);
@@ -353,7 +350,7 @@
+png_byte PNGAPI
+png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_dispose_op()\n");
++ png_debug(1, "in png_get_next_frame_dispose_op()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_dispose_op);
@@ -363,7 +360,7 @@
+png_byte PNGAPI
+png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_get_next_frame_blend_op()\n");
++ png_debug(1, "in png_get_next_frame_blend_op()");
+
+ if (png_ptr != NULL && info_ptr != NULL)
+ return (info_ptr->next_frame_blend_op);
@@ -373,7 +370,7 @@
+png_byte PNGAPI
+png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr)
+{
-+ png_debug(1, "in png_first_frame_is_hidden()\n");
++ png_debug(1, "in png_first_frame_is_hidden()");
+
+ if (png_ptr != NULL)
+ return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN);
@@ -382,32 +379,18 @@
+}
+#endif /* PNG_APNG_SUPPORTED */
+
- #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
png_uint_32 PNGAPI
png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
-Index: png.c
-===================================================================
---- png.c (révision 149)
-+++ png.c (copie de travail)
-@@ -51,6 +51,9 @@
- PNG_tIME;
- PNG_tRNS;
- PNG_zTXt;
-+PNG_acTL;
-+PNG_fcTL;
-+PNG_fdAT;
-
- #ifdef PNG_READ_SUPPORTED
- /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
Index: png.h
===================================================================
---- png.h (révision 149)
-+++ png.h (copie de travail)
-@@ -949,6 +949,19 @@
- png_fixed_point int_y_blue;
+--- png.h
++++ png.h
+@@ -888,6 +888,19 @@
+ png_fixed_point int_y_blue PNG_DEPSTRUCT;
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#ifdef PNG_APNG_SUPPORTED
+ png_uint_32 num_frames; /* including default image */
+ png_uint_32 num_plays;
+ png_uint_32 next_frame_width;
@@ -423,38 +406,39 @@
} png_info;
typedef png_info FAR * png_infop;
-@@ -1050,6 +1063,8 @@
+@@ -985,6 +998,10 @@
#define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
#define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */
++#ifdef PNG_APNG_SUPPORTED
+#define PNG_INFO_acTL 0x10000L
+#define PNG_INFO_fcTL 0x20000L
++#endif
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
-@@ -1090,7 +1105,11 @@
+@@ -1026,6 +1043,10 @@
typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
png_uint_32, int));
-+#if defined(PNG_APNG_SUPPORTED)
++#ifdef PNG_APNG_SUPPORTED
+typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp,
+ png_uint_32));
- #endif
+#endif
+ #endif
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
-@@ -1421,6 +1440,39 @@
- png_uint_32 user_height_max;
+@@ -1445,6 +1466,39 @@
+ png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#ifdef PNG_APNG_SUPPORTED
+ png_uint_32 apng_flags;
+ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */
+ png_uint_32 first_frame_width;
+ png_uint_32 first_frame_height;
+
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#ifdef PNG_READ_APNG_SUPPORTED
+ png_uint_32 num_frames_read; /* incremented after all image data of */
+ /* a frame is read */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
@@ -463,11 +447,10 @@
+#endif
+#endif
+
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
++#ifdef PNG_WRITE_APNG_SUPPORTED
+ png_uint_32 num_frames_to_write;
+ png_uint_32 num_frames_written;
+#endif
-+#endif
+
+/* For png_struct.apng_flags: */
+#define PNG_FIRST_FRAME_HIDDEN 0x0001
@@ -480,46 +463,47 @@
+/* blend_op flags from inside fcTL */
+#define PNG_BLEND_OP_SOURCE 0x00
+#define PNG_BLEND_OP_OVER 0x01
++#endif /* PNG_APNG_SUPPORTED */
+
/* New member added in libpng-1.0.25 and 1.2.17 */
- #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
- /* storage for unknown chunk that the library doesn't recognize. */
-@@ -1747,6 +1799,18 @@
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+ /* Storage for unknown chunk that the library doesn't recognize. */
+@@ -1773,6 +1827,18 @@
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
png_bytepp image));
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
++#ifdef PNG_WRITE_APNG_SUPPORTED
+extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
+ png_infop png_info, png_bytepp row_pointers,
+ png_uint_32 width, png_uint_32 height,
-+ png_uint_32 x_offset, png_uint_32 y_offset,
++ 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));
+
+extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
+ png_infop png_info));
+#endif
-+
- /* writes the end of the PNG file. */
++
+ /* Write the end of the PNG file. */
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
-@@ -1995,6 +2059,11 @@
+@@ -2017,6 +2083,11 @@
png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libpng/crossmingw32-libpng.spec?r1=1.36&r2=1.37&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libpng/libpng-apng.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list