Author: sparky Date: Sun Mar 25 22:45:10 2012 GMT
Module: packages Tag: HEAD
Log message:
- added libpng 1.5 patch (found in arch linux)
Files affected:
packages/enblend-enfuse:
enblend-enfuse.spec (1.18 - 1.19) , enblend-enfuse-libpng15.patch (NONE -
1.1) (NEW)
Diffs:
Index: packages/enblend-enfuse/enblend-enfuse.spec
diff -u packages/enblend-enfuse/enblend-enfuse.spec:1.18
packages/enblend-enfuse/enblend-enfuse.spec:1.19
--- packages/enblend-enfuse/enblend-enfuse.spec:1.18Tue Jan 31 22:00:56 2012
+++ packages/enblend-enfuse/enblend-enfuse.spec Mon Mar 26 00:45:04 2012
@@ -11,6 +11,7 @@
# Source0-md5: 2e7c950061e0085fd75d94576130250f
Patch0:%{name}-libpng.patch
Patch1:%{name}-info.patch
+Patch2:%{name}-libpng15.patch
URL: http://enblend.sourceforge.net/
BuildRequires: OpenEXR-devel = 1.0
BuildRequires: OpenGL-GLU-devel
@@ -52,6 +53,7 @@
%setup -q -n %{name}-%{version}-753b534c819d
%patch0 -p1
%patch1 -p1
+%patch2 -p0
%build
%{__aclocal} -I m4
@@ -92,6 +94,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.19 2012/03/25 22:45:04 sparky
+- added libpng 1.5 patch (found in arch linux)
+
Revision 1.18 2012/01/31 21:00:56 lisu
- BR: transfig (needed to build whole documentation)
Index: packages/enblend-enfuse/enblend-enfuse-libpng15.patch
diff -u /dev/null packages/enblend-enfuse/enblend-enfuse-libpng15.patch:1.1
--- /dev/null Mon Mar 26 00:45:10 2012
+++ packages/enblend-enfuse/enblend-enfuse-libpng15.patch Mon Mar 26
00:45:04 2012
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+-longjmp( png_ptr-jmpbuf, 1 );
++longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+ vigra_postcondition( png != 0, could not create the read struct. );
+
+ // create info struct
+-if (setjmp(png-jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( png, info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, error in
png_create_info_struct(): ).c_str() );
+ }
+@@ -221,14 +221,14 @@
+ vigra_postcondition( info != 0, could not create the info struct. );
+
+ // init png i/o
+-if (setjmp(png-jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( png, info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, error in
png_init_io(): ).c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+-if (setjmp(png-jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( png, info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, error in
png_set_sig_bytes(): ).c_str() );
+ }
+@@ -244,13 +244,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+-if (setjmp(png-jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, error in
png_read_info(): ).c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+-if (setjmp(png-jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, error in
png_get_IHDR(): ).c_str() );
+ png_get_IHDR( png, info, width, height, bit_depth, color_type,
+ interlace_method, compression_method, filter_method
);
+@@ -264,7 +264,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-if (setjmp(png-jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0,
error in png_palette_to_rgb(): ).c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY bit_depth 8 ) {
+-if (setjmp(png-jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, error
in png_set_expand_gray_1_2_4_to_8(): ).c_str());
+ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+@@ -283,7 +283,7 @@
+ #if 0
+ // strip alpha channel
+ if ( color_type
