Author: wiget Date: Fri Jan 29 20:45:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed building with libpng 1.4.0
---- Files affected:
packages/povray:
povray.spec (1.65 -> 1.66) , povray-png.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/povray/povray.spec
diff -u packages/povray/povray.spec:1.65 packages/povray/povray.spec:1.66
--- packages/povray/povray.spec:1.65 Fri Jan 29 09:23:03 2010
+++ packages/povray/povray.spec Fri Jan 29 21:45:46 2010
@@ -11,7 +11,7 @@
Summary(pl.UTF-8): Persistence of Vision Ray Tracer
Name: povray
Version: 3.6.1
-Release: 7
+Release: 8
Epoch: 1
License: distributable
Group: Applications/Graphics
@@ -25,11 +25,12 @@
Patch3: %{name}-lib64.patch
Patch4: %{name}-no_svgalib.patch
Patch5: %{name}-m4.patch
+Patch6: %{name}-png.patch
URL: http://www.povray.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 1.4.0
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
%{?with_pvm:BuildRequires: pvm-devel >= 3.4.3-24}
@@ -113,6 +114,7 @@
##%patch4 -p1
%endif
%patch5 -p1
+%patch6 -p1
%build
%{__aclocal}
@@ -228,6 +230,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2010/01/29 20:45:46 wiget
+ - fixed building with libpng 1.4.0
+
Revision 1.65 2010/01/29 08:23:03 amateja
- release 7
================================================================
Index: packages/povray/povray-png.patch
diff -u /dev/null packages/povray/povray-png.patch:1.1
--- /dev/null Fri Jan 29 21:45:52 2010
+++ packages/povray/povray-png.patch Fri Jan 29 21:45:46 2010
@@ -0,0 +1,29 @@
+--- povray-3.6.1/source/png_pov.cpp.wiget 2010-01-29 21:35:24.000000000
+0100
++++ povray-3.6.1/source/png_pov.cpp 2010-01-29 21:35:33.000000000 +0100
+@@ -782,7 +782,7 @@ PNG_Image::~PNG_Image()
+ {
+ // finished prematurely - trick into thinking done
+ png_ptr->num_rows = png_ptr->row_number;
+- png_write_finish_row(png_ptr);
++ png_write_row(png_ptr, row_ptr);
+ }
+
+ #ifdef POV_COMMENTS // temporarily skip comment writing code
+@@ -1428,7 +1428,7 @@ void Read_Png_Image(IMAGE *Image, char *
+ if(r_info_ptr->valid & PNG_INFO_tRNS)
+ {
+ for (index = 0; index < r_info_ptr->num_trans; index++)
+- cmap[index].Transmit = 255 -
r_info_ptr->trans[index];
++ cmap[index].Transmit = 255 -
r_info_ptr->trans_alpha[index];
+ }
+
+ Image->data.map_lines = (unsigned char **)POV_MALLOC(height *
sizeof(unsigned char *), "PNG image");
+@@ -1461,7 +1461,7 @@ void Read_Png_Image(IMAGE *Image, char *
+ if(r_info_ptr->valid & PNG_INFO_tRNS)
+ {
+ for (index = 0; index < r_info_ptr->num_trans; index++)
+- cmap[index].Transmit = 255 -
r_info_ptr->trans[index];
++ cmap[index].Transmit = 255 -
r_info_ptr->trans_alpha[index];
+ }
+
+ Image->data.map_lines = (unsigned char **)POV_MALLOC(height *
sizeof(unsigned char *), "PNG image");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/povray/povray.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
