[libAfterImage] 1.20-5

[Andreas Bierfert]

commit 1177c06280a2ca16fa7b85a3af905bdc81abd54c
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon May 28 17:25:49 2012 +0200

    1.20-5
    
    - fix some issues with newer libpng (rhbz#817780)

 libAfterImage.spec           |   12 ++++++++++--
 libafterimage-libpng15.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/libAfterImage.spec b/libAfterImage.spec
index 81392bc..8342eeb 100644
--- a/libAfterImage.spec
+++ b/libAfterImage.spec
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -13,6 +13,9 @@ Patch1:         libAfterImage-afterimage-config.patch
 Patch2:         libAfterImage-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# use gentoo patch to fix some issues with libpng
+Patch100:       http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/libafterimage/files/libafterimage-libpng15.patch
+
 BuildRequires:  freetype-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtiff-devel
@@ -38,7 +41,7 @@ TGA and GIF being supported internally.
 PNG, JPEG and TIFF formats are supported via standard libraries.
 
 Powerful text rendering capabilities included, providing support for
-TrueType fonts using FreeType library, and antialiasing of standard fonts
+TrueType fonts using FreeType library, and anti-aliasing of standard fonts
 from X window system. 
 
 %package devel
@@ -65,6 +68,7 @@ The %{name}-devel package contains the files needed for development with
 %patch0 
 %patch1
 %patch2 -b multiarch
+%patch100 -b libpng15
 
 %build
 %configure --enable-i18n --enable-sharedlibs \
@@ -106,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon May 28 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.20-5
+- fix some issues with newer libpng (rhbz#817780)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/libafterimage-libpng15.patch b/libafterimage-libpng15.patch
new file mode 100644
index 0000000..44d5b94
--- /dev/null
+++ b/libafterimage-libpng15.patch
@@ -0,0 +1,31 @@
+--- export.c
++++ export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- import.c
++++ import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }