packages: imlib2/imlib2.spec, imlib2/imlib2-1.4.4-libpng-1.5.patch (NEW)=?UTF-8?Q?=20?=-=?UTF-8?Q?=20?=...

[arekm]

Author: arekm                        Date: Fri Feb 10 11:25:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; libpng fix

---- Files affected:
packages/imlib2:
   imlib2.spec (1.77 -> 1.78) , imlib2-1.4.4-libpng-1.5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/imlib2/imlib2.spec
diff -u packages/imlib2/imlib2.spec:1.77 packages/imlib2/imlib2.spec:1.78
--- packages/imlib2/imlib2.spec:1.77	Tue Feb  7 23:02:57 2012
+++ packages/imlib2/imlib2.spec	Fri Feb 10 12:25:01 2012
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Potężna biblioteka wczytująca i renderująca obrazki
 Name:		imlib2
 Version:	1.4.4
-Release:	3
+Release:	4
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
 # Source0-md5:	b6de51879502e857d5b1f7622267a030
+Patch0:		%{name}-1.4.4-libpng-1.5.patch
 URL:		http://enlightenment.org/p.php?p=about/libs/imlib2
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
@@ -75,6 +76,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__libtoolize}
@@ -139,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2012/02/10 11:25:01  arekm
+- rel 4; libpng fix
+
 Revision 1.77  2012/02/07 22:02:57  arekm
 - release 3
 

================================================================
Index: packages/imlib2/imlib2-1.4.4-libpng-1.5.patch
diff -u /dev/null packages/imlib2/imlib2-1.4.4-libpng-1.5.patch:1.1
--- /dev/null	Fri Feb 10 12:25:06 2012
+++ packages/imlib2/imlib2-1.4.4-libpng-1.5.patch	Fri Feb 10 12:25:01 2012
@@ -0,0 +1,82 @@
+http://bugs.gentoo.org/354989
+
+# http://sourceforge.net/mailarchive/message.php?msg_id=26972342
+
+$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $
+
+Fix build with png-1.5.
+
+has also been committed upstream.
+
+--- src/modules/loaders/loader_png.c
++++ src/modules/loaders/loader_png.c
+@@ -58,7 +58,7 @@
+              fclose(f);
+              return 0;
+           }
+-        if (setjmp(png_ptr->jmpbuf))
++        if (setjmp(png_jmpbuf(png_ptr)))
+           {
+              png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+              fclose(f);
+@@ -238,7 +238,7 @@
+    png_structp         png_ptr;
+    png_infop           info_ptr;
+    DATA32             *ptr;
+-   int                 x, y, j;
++   int                 x, y, j, interlace;
+    png_bytep           row_ptr, data = NULL;
+    png_color_8         sig_bit;
+    int                 pl = 0;
+@@ -265,7 +265,7 @@
+         png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+         return 0;
+      }
+-   if (setjmp(png_ptr->jmpbuf))
++   if (setjmp(png_jmpbuf(png_ptr)))
+      {
+         fclose(f);
+         png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
+@@ -274,11 +274,11 @@
+      }
+ 
+    /* check whether we should use interlacing */
++   interlace = PNG_INTERLACE_NONE;
+    if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
+      {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+-          png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+-          num_passes = png_set_interlace_handling(png_ptr);
++          interlace = PNG_INTERLACE_ADAM7;
+ #endif
+      }
+ 
+@@ -286,7 +286,7 @@
+    if (im->flags & F_HAS_ALPHA)
+      {
+         png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
+-                     PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++                     PNG_COLOR_TYPE_RGB_ALPHA, interlace,
+                      PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+         png_set_swap_alpha(png_ptr);
+@@ -297,7 +297,7 @@
+    else
+      {
+         png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
+-                     png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
++                     interlace, PNG_COMPRESSION_TYPE_BASE,
+                      PNG_FILTER_TYPE_BASE);
+         data = malloc(im->w * 3 * sizeof(char));
+      }
+@@ -344,6 +344,10 @@
+    png_set_shift(png_ptr, &sig_bit);
+    png_set_packing(png_ptr);
+ 
++#ifdef PNG_WRITE_INTERLACING_SUPPORTED
++   num_passes = png_set_interlace_handling(png_ptr);
++#endif
++
+    for (pass = 0; pass < num_passes; pass++)
+      {
+       ptr = im->data;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imlib2/imlib2.spec?r1=1.77&r2=1.78&f=u