packages: crossmingw32-libpng/crossmingw32-libpng.spec, crossmingw32-libpng...

qboosh qboosh at pld-linux.org
Wed Dec 21 19:22:17 CET 2011 

Author: qboosh                       Date: Wed Dec 21 18:22:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.5.7

---- Files affected:
packages/crossmingw32-libpng:
   crossmingw32-libpng.spec (1.49 -> 1.50) , libpng-pngminus.patch (1.7 -> 1.8) , libpng-apng-fix.patch (NONE -> 1.1)  (NEW), libpng-apng.patch (1.7 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/crossmingw32-libpng/crossmingw32-libpng.spec
diff -u packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.49 packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.50
--- packages/crossmingw32-libpng/crossmingw32-libpng.spec:1.49	Thu Jul 14 01:59:43 2011
+++ packages/crossmingw32-libpng/crossmingw32-libpng.spec	Wed Dec 21 19:22:12 2011
@@ -3,15 +3,16 @@
 Summary:	PNG library - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka PNG - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	1.4.8
+Version:	1.5.7
 Release:	1
 License:	distributable
 Group:		Development/Libraries
 Source0:	http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5:	2ce595d571f2b06a9403ed5bcfa4ecbd
+# Source0-md5:	c3ae9ce4e81ec0aafdd4ac961586ee0d
 Patch0:		%{realname}-pngminus.patch
-# http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
-Patch1:		%{realname}-apng.patch
+Patch1:		http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
+# Patch1-md5:	6c6a674048cec94db1bc35decf0d142c
+Patch2:		%{realname}-apng-fix.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-zlib
@@ -86,7 +87,8 @@
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
+%patch2 -p1
 
 # avoid version script
 sed -i -e 's/^GLD=.*/GLD=/' configure
@@ -108,37 +110,37 @@
 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
+ln -sf libpng15.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
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/man
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/man
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libpng14.dll.a
+%{_libdir}/libpng15.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng14.la
+%{_libdir}/libpng15.la
 %{_libdir}/libpng.la
-%{_includedir}/libpng14
+%{_includedir}/libpng15
 %{_includedir}/png*.h
-%{_pkgconfigdir}/libpng14.pc
+%{_pkgconfigdir}/libpng15.pc
 %{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng14.a
+%{_libdir}/libpng15.a
 %{_libdir}/libpng.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng14-*.dll
+%{_dlldir}/libpng15-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -146,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2011/12/21 18:22:12  qboosh
+- updated to 1.5.7
+
 Revision 1.49  2011/07/13 23:59:43  qboosh
 - updated to 1.4.8
 

================================================================
Index: packages/crossmingw32-libpng/libpng-pngminus.patch
diff -u packages/crossmingw32-libpng/libpng-pngminus.patch:1.7 packages/crossmingw32-libpng/libpng-pngminus.patch:1.8
--- packages/crossmingw32-libpng/libpng-pngminus.patch:1.7	Sat Feb 19 18:20:54 2011
+++ packages/crossmingw32-libpng/libpng-pngminus.patch	Wed Dec 21 19:22:12 2011
@@ -1,11 +1,11 @@
---- libpng-1.2.10/contrib/pngminus/makefile.std.orig	2006-04-23 20:45:35.000000000 +0200
-+++ libpng-1.2.10/contrib/pngminus/makefile.std	2006-05-20 00:07:36.332062500 +0200
+--- libpng-1.5.7/contrib/pngminus/makefile.std.orig	2011-12-15 16:45:32.000000000 +0100
++++ libpng-1.5.7/contrib/pngminus/makefile.std	2011-12-18 16:24:38.099367091 +0100
 @@ -12,20 +12,20 @@
- #PNGLIB = -L$(PNGPATH)/lib -lpng12
- #PNGLIBS = $(PNGPATH)/lib/libpng12.a
+ #PNGLIB = -L$(PNGPATH)/lib -lpng15
+ #PNGLIBS = $(PNGPATH)/lib/libpng15.a
  PNGINC = -I../..
 -PNGLIB = -L../.. -lpng
-+PNGLIB = -L../.. -L../../.libs -lpng14
++PNGLIB = -L../.. -L../../.libs -lpng15
  PNGLIBS = ../../libpng.a
  
  #ZPATH = /usr/local
@@ -15,15 +15,15 @@
 -ZINC = -I../../../zlib
 -ZLIB = -L../../../zlib -lz
 -ZLIBS = ../../../zlib/libz.a
-+ZINC = 
++ZINC =
 +ZLIB = -lz
 +ZLIBS = -lz
  
--CFLAGS=-O3 $(PNGINC) $(ZINC)
+-CFLAGS=$(PNGINC) $(ZINC)
 +CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDFLAGS=$(PNGLIB) $(ZLIB)
--LDFLAGSS=$(PNGLIBS) $(ZLIBS)
-+LDFLAGSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
+ LDLIBS=$(PNGLIB) $(ZLIB)
+-LDLIBSS=$(PNGLIBS) $(ZLIBS)
++LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
  C=.c
  O=.o
  L=.a

================================================================
Index: packages/crossmingw32-libpng/libpng-apng-fix.patch
diff -u /dev/null packages/crossmingw32-libpng/libpng-apng-fix.patch:1.1
--- /dev/null	Wed Dec 21 19:22:17 2011
+++ packages/crossmingw32-libpng/libpng-apng-fix.patch	Wed Dec 21 19:22:12 2011
@@ -0,0 +1,38 @@
+--- 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,3 +239,24 @@
+  png_get_cHRM_XYZ_fixed @231
+  png_set_cHRM_XYZ @232
+  png_set_cHRM_XYZ_fixed @233
++;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.7/png.h.orig	2011-12-18 18:57:09.559673517 +0100
++++ libpng-1.5.7/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(233);
++  PNG_EXPORT_LAST_ORDINAL(1020);
+ #endif
+ 
+ #ifdef __cplusplus
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libpng/crossmingw32-libpng.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libpng/libpng-pngminus.patch?r1=1.7&r2=1.8&f=u

More information about the pld-cvs-commit mailing list