packages: libpng/libpng-pngminus.patch, libpng/libpng.spec, libpng/libpng-a...

qboosh qboosh at pld-linux.org
Tue Dec 20 18:16:01 CET 2011 

Author: qboosh                       Date: Tue Dec 20 17:16:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.5.7 (latest stable release)
  note: new soname; libpng left on LIBPNG_1_4 branch (as default libpng) or in libpng14.spec (as non-default)
- updated pngminus patch
- apng patch updated from libpng-apng project
- added apng-fix patch to avoid make check failure

---- Files affected:
packages/libpng:
   libpng-pngminus.patch (1.7 -> 1.8) , libpng.spec (1.189 -> 1.190) , libpng-apng-fix.patch (NONE -> 1.1)  (NEW), libpng-apng.patch (1.13 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libpng/libpng-pngminus.patch
diff -u packages/libpng/libpng-pngminus.patch:1.7 packages/libpng/libpng-pngminus.patch:1.8
--- packages/libpng/libpng-pngminus.patch:1.7	Thu Jan 28 10:48:16 2010
+++ packages/libpng/libpng-pngminus.patch	Tue Dec 20 18:15:56 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/libpng/libpng.spec
diff -u packages/libpng/libpng.spec:1.189 packages/libpng/libpng.spec:1.190
--- packages/libpng/libpng.spec:1.189	Thu Jul 14 01:57:47 2011
+++ packages/libpng/libpng.spec	Tue Dec 20 18:15:56 2011
@@ -1,5 +1,9 @@
 # $Revision$, $Date$
-%bcond_without	tests
+#
+# Conditional build:
+%bcond_without	tests		# don't perform "make check"
+%bcond_without	default_libpng	# don't use this libpng as default system libpng
+#
 Summary:	PNG library
 Summary(de.UTF-8):	PNG-Library
 Summary(es.UTF-8):	Biblioteca PNG
@@ -8,16 +12,17 @@
 Summary(pt_BR.UTF-8):	Biblioteca PNG
 Summary(tr.UTF-8):	PNG kitaplığı
 Name:		libpng
-Version:	1.4.8
+Version:	1.5.7
 Release:	1
 Epoch:		2
 License:	distributable
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5:	2ce595d571f2b06a9403ed5bcfa4ecbd
+# Source0-md5:	c3ae9ce4e81ec0aafdd4ac961586ee0d
 Patch0:		%{name}-pngminus.patch
-# http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
-Patch1:		%{name}-apng.patch
+Patch1:		http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz
+# Patch1-md5:	6c6a674048cec94db1bc35decf0d142c
+Patch2:		%{name}-apng-fix.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	tar >= 1:1.22
@@ -141,7 +146,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -164,6 +170,14 @@
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
 install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%if %{without default_libpng}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{libpng-config,pn?2pn?} \
+	$RPM_BUILD_ROOT%{_libdir}/libpng.{so,la,a} \
+	$RPM_BUILD_ROOT%{_includedir}/png*.h \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}/libpng.pc \
+	$RPM_BUILD_ROOT%{_mandir}/man[35]/*png*
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -173,36 +187,42 @@
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE CHANGES LICENSE README TODO
-%attr(755,root,root) %{_libdir}/libpng14.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpng14.so.14
+%attr(755,root,root) %{_libdir}/libpng15.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpng15.so.15
 
 %files devel
 %defattr(644,root,root,755)
-%doc libpng-%{version}.txt
-%attr(755,root,root) %{_bindir}/libpng14-config
+%doc libpng-manual.txt
+%attr(755,root,root) %{_bindir}/libpng15-config
+%attr(755,root,root) %{_libdir}/libpng15.so
+%{_libdir}/libpng15.la
+%{_includedir}/libpng15
+%{_pkgconfigdir}/libpng15.pc
+%{_examplesdir}/%{name}-%{version}
+%if %{with default_libpng}
 %attr(755,root,root) %{_bindir}/libpng-config
-%attr(755,root,root) %{_libdir}/libpng14.so
 %attr(755,root,root) %{_libdir}/libpng.so
-%{_libdir}/libpng14.la
 %{_libdir}/libpng.la
-%{_pkgconfigdir}/libpng14.pc
 %{_pkgconfigdir}/libpng.pc
-%{_includedir}/libpng14
 %{_includedir}/png*.h
 %{_mandir}/man3/libpng.3*
 %{_mandir}/man3/libpngpf.3*
 %{_mandir}/man5/png.5*
-%{_examplesdir}/%{name}-%{version}
+%endif
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng14.a
+%{_libdir}/libpng15.a
+%if %{with default_libpng}
 %{_libdir}/libpng.a
+%endif
 
+%if %{with default_libpng}
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/png2pnm
 %attr(755,root,root) %{_bindir}/pnm2png
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -210,6 +230,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.190  2011/12/20 17:15:56  qboosh
+- updated to 1.5.7 (latest stable release)
+  note: new soname; libpng left on LIBPNG_1_4 branch (as default libpng) or in libpng14.spec (as non-default)
+- updated pngminus patch
+- apng patch updated from libpng-apng project
+- added apng-fix patch to avoid make check failure
+
 Revision 1.189  2011/07/13 23:57:47  qboosh
 - updated to 1.4.8
 

================================================================
Index: packages/libpng/libpng-apng-fix.patch
diff -u /dev/null packages/libpng/libpng-apng-fix.patch:1.1
--- /dev/null	Tue Dec 20 18:16:01 2011
+++ packages/libpng/libpng-apng-fix.patch	Tue Dec 20 18:15:56 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/libpng/libpng-pngminus.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng.spec?r1=1.189&r2=1.190&f=u

More information about the pld-cvs-commit mailing list