- updated to 1.5.12

- added filterout_c to avoid build failures on -f* options

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index 52024c46b0faffbde21b1c73d4f3a9a6694a3c8e..da7f0de15548e00469c54d98488a9d1a439446ed 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,15 +2,15 @@
 Summary:       PNG library - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.5.10
+Version:       1.5.12
 Release:       1
 License:       distributable
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5: 9c2ac3c3a31de2ab867875718f8de18e
+# Source0-md5: 0fd51add1da6a0e470e0c726c59171b9
 Patch0:                %{realname}-pngminus.patch
 Patch1:                http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
-# Patch1-md5:  88517ab0e9c0be2590800116e2b50c8d
+# Patch1-md5:  7f2924b1fe0cca9080e18b8720443716
 Patch2:                %{realname}-apng-fix.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: crossmingw32-gcc
@@ -39,8 +39,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define                optflags        -O2
 %endif
-# -z options are invalid for mingw linker
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 The PNG library is a collection of routines used to create and

diff --git a/libpng-apng-fix.patch b/libpng-apng-fix.patch
index add8cb792b08b5f4a5f66c7bc15f4b7421849498..b2a467ae4a96a36eb247718deb987e1f83dcf12c 100644 (file)
--- a/libpng-apng-fix.patch
+++ b/libpng-apng-fix.patch
@@ -1,38 +1,27 @@
---- libpng-1.5.10/scripts/symbols.def.orig     2012-03-29 07:06:56.000000000 +0200
-+++ libpng-1.5.10/scripts/symbols.def  2012-04-25 17:53:13.007292298 +0200
-@@ -240,3 +240,24 @@
+--- libpng-1.5.7/scripts/symbols.def.orig      2011-12-15 16:45:34.000000000 +0100
++++ libpng-1.5.7/scripts/symbols.def   2011-12-18 19:44:57.326436207 +0100
+@@ -239,4 +239,24 @@
+  png_get_cHRM_XYZ_fixed @231
   png_set_cHRM_XYZ @232
   png_set_cHRM_XYZ_fixed @233
   png_set_check_for_invalid_index @234
-+;missing warning
-+ png_write_frame_head @1001
-+ png_write_frame_tail @1002
-+ png_set_progressive_frame_fn @1003
-+ png_get_acTL @1004
-+ png_set_acTL @1005
-+ png_get_num_frames @1006
-+ png_get_num_plays @1007
-+ png_get_next_frame_fcTL @1008
-+ png_set_next_frame_fcTL @1009
-+ png_get_next_frame_width @1010
-+ png_get_next_frame_height @1011
-+ png_get_next_frame_x_offset @1012
-+ png_get_next_frame_y_offset @1013
-+ png_get_next_frame_delay_num @1014
-+ png_get_next_frame_delay_den @1015
-+ png_get_next_frame_dispose_op @1016
-+ png_get_next_frame_blend_op @1017
-+ png_get_first_frame_is_hidden @1018
-+ png_set_first_frame_is_hidden @1019
-+ png_read_frame_head @1020
---- libpng-1.5.10/png.h.orig   2011-12-18 18:57:09.559673517 +0100
-+++ libpng-1.5.10/png.h        2011-12-18 19:44:48.716435917 +0100
-@@ -2725,7 +2725,7 @@
-  * scripts/symbols.def as well.
-  */
- #ifdef PNG_EXPORT_LAST_ORDINAL
--  PNG_EXPORT_LAST_ORDINAL(234);
-+  PNG_EXPORT_LAST_ORDINAL(1020);
- #endif
- 
- #ifdef __cplusplus
++ png_get_acTL @235
++ png_set_acTL @236
++ png_get_num_frames @237
++ png_get_num_plays @238
++ png_get_next_frame_fcTL @239
++ png_set_next_frame_fcTL @240
++ png_get_next_frame_width @241
++ png_get_next_frame_height @242
++ png_get_next_frame_x_offset @243
++ png_get_next_frame_y_offset @244
++ png_get_next_frame_delay_num @245
++ png_get_next_frame_delay_den @246
++ png_get_next_frame_dispose_op @247
++ png_get_next_frame_blend_op @248
++ png_get_first_frame_is_hidden @249
++ png_set_first_frame_is_hidden @250
++ png_read_frame_head @251
++ png_set_progressive_frame_fn @252
++ png_write_frame_head @253
++ png_write_frame_tail @254