Mon Nov 7 12:14:15 2011 UTC ()
update to 1.4.5
changes:
-bugfixes
-cleanup, spelling fixes


(drochner)
diff -r1.58 -r1.59 pkgsrc/graphics/imlib2/Makefile
diff -r1.27 -r1.28 pkgsrc/graphics/imlib2/distinfo
diff -r1.11 -r1.12 pkgsrc/graphics/imlib2/patches/patch-ab
diff -r1.7 -r1.8 pkgsrc/graphics/imlib2/patches/patch-ac
diff -r1.4 -r0 pkgsrc/graphics/imlib2/patches/patch-af
cvs diff -r1.58 -r1.59 pkgsrc/graphics/imlib2/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/imlib2/Makefile 2011/11/01 06:01:37 1.58
+++ pkgsrc/graphics/imlib2/Makefile 2011/11/07 12:14:15 1.59
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.58 2011/11/01 06:01:37 sbd Exp $ 1# $NetBSD: Makefile,v 1.59 2011/11/07 12:14:15 drochner Exp $
2 2
3DISTNAME= imlib2-1.4.4 3DISTNAME= imlib2-1.4.5
4PKGREVISION= 1 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://docs.enlightenment.org/api/imlib2/html/ 9HOMEPAGE= http://docs.enlightenment.org/api/imlib2/html/
11COMMENT= Image manipulation library 10COMMENT= Image manipulation library
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
16USE_LIBTOOL= YES 15USE_LIBTOOL= YES
17GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
cvs diff -r1.27 -r1.28 pkgsrc/graphics/imlib2/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/imlib2/distinfo 2011/05/18 10:04:26 1.27
+++ pkgsrc/graphics/imlib2/distinfo 2011/11/07 12:14:15 1.28
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.27 2011/05/18 10:04:26 drochner Exp $ 1$NetBSD: distinfo,v 1.28 2011/11/07 12:14:15 drochner Exp $
2 2
3SHA1 (imlib2-1.4.4.tar.bz2) = aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b 3SHA1 (imlib2-1.4.5.tar.bz2) = af86a2c38f4bc3806db57e64e74dc9814ad474a0
4RMD160 (imlib2-1.4.4.tar.bz2) = 0206b97134fa55c35e2ab1a2e103e5341770d88b 4RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa
5Size (imlib2-1.4.4.tar.bz2) = 888878 bytes 5Size (imlib2-1.4.5.tar.bz2) = 895624 bytes
6SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5 6SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc
7SHA1 (patch-ac) = cf2ddba76a50ae4082ad984aaf6f43857d5a5175 7SHA1 (patch-ac) = 4f5e05fd921499c2ef679135e42bd8dc6f71d2de
8SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a 8SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
9SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0 9SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0
10SHA1 (patch-af) = 9ee80e6dac9cc182ac847ac0b8c215352ee99290 
cvs diff -r1.11 -r1.12 pkgsrc/graphics/imlib2/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/imlib2/patches/Attic/patch-ab 2006/07/19 16:16:23 1.11
+++ pkgsrc/graphics/imlib2/patches/Attic/patch-ab 2011/11/07 12:14:15 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.11 2006/07/19 16:16:23 rillig Exp $ 1$NetBSD: patch-ab,v 1.12 2011/11/07 12:14:15 drochner Exp $
2 2
3This patch makes imlib2 compile on systems that don't have an lround 3This patch makes imlib2 compile on systems that don't have an lround
4function, which is defined in C99. 4function, which is defined in C99.
5 5
6Needed at least for NetBSD-1.6.2 and NetBSD-2.0. 6Needed at least for NetBSD-1.6.2 and NetBSD-2.0.
7 7
8--- src/lib/color_helpers.c.orig 2005-01-08 08:55:02.000000000 +0100 8--- src/lib/color_helpers.c.orig 2005-01-08 08:55:02.000000000 +0100
9+++ src/lib/color_helpers.c 2006-07-19 18:11:42.222074773 +0200 9+++ src/lib/color_helpers.c 2006-07-19 18:11:42.222074773 +0200
10@@ -1,4 +1,22 @@ 10@@ -1,4 +1,22 @@
11+#include <math.h> 11+#include <math.h>
12+#include <stdlib.h> 12+#include <stdlib.h>
13+ 13+
14 #include "color_helpers.h" 14 #include "color_helpers.h"
@@ -19,14 +19,14 @@ Needed at least for NetBSD-1.6.2 and Net @@ -19,14 +19,14 @@ Needed at least for NetBSD-1.6.2 and Net
19+ 19+
20+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || \ 20+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || \
21+ (defined(__DragonFly__) && __DragonFly_version <= 130002) \ 21+ (defined(__DragonFly__) && __DragonFly_version <= 130002) \
22+ || defined(__sun) && defined(__SunOS_5_8) 22+ || defined(__sun) && defined(__SunOS_5_8)
23+#define lround(x) my_lround(x) 23+#define lround(x) my_lround(x)
24+static long my_lround(double x) 24+static long my_lround(double x)
25+{ 25+{
26+ return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5); 26+ return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5);
27+} 27+}
28+#endif 28+#endif
29+ 29+
30 /* 30 /*
31 * Color space conversion helper routines 31 * Color space conversion helper routines
32 * Convert between rgb and hsv adn between rgb and hls 32 * Convert between rgb and hsv and between rgb and hls
cvs diff -r1.7 -r1.8 pkgsrc/graphics/imlib2/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/imlib2/patches/Attic/patch-ac 2011/05/18 10:04:26 1.7
+++ pkgsrc/graphics/imlib2/patches/Attic/patch-ac 2011/11/07 12:14:15 1.8
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-ac,v 1.7 2011/05/18 10:04:26 drochner Exp $ 1$NetBSD: patch-ac,v 1.8 2011/11/07 12:14:15 drochner Exp $
2 2
3Add minimalist #ifndef blocks to rip out XShm support on Interix. 3Add minimalist #ifndef blocks to rip out XShm support on Interix.
4 4
5--- src/lib/grab.c.orig 2010-05-05 18:25:50.000000000 +0000 5--- src/lib/grab.c.orig 2011-04-15 22:05:28.000000000 +0000
6+++ src/lib/grab.c 6+++ src/lib/grab.c
7@@ -530,7 +530,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data 7@@ -530,7 +530,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
8 int i; 8 int i;
9 int src_x, src_y, src_w, src_h, origw, origh; 9 int src_x, src_y, src_w, src_h, origw, origh;
10 int width, height, clipx, clipy; 10 int width, height, clipx, clipy;
11+#ifndef __INTERIX 11+#ifndef __INTERIX
12 XShmSegmentInfo shminfo, mshminfo; 12 XShmSegmentInfo shminfo, mshminfo;
13+#endif 13+#endif
14 XImage *xim, *mxim; 14 XImage *xim, *mxim;
15 XColor cols[256]; 15 XColor cols[256];
16  16
17@@ -665,11 +667,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data 17@@ -665,11 +667,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
18 __imlib_ShmCheck(d); 18 __imlib_ShmCheck(d);
19  19
20 xim = NULL; 20 xim = NULL;
21+#ifndef __INTERIX 21+#ifndef __INTERIX
22 if (x_does_shm) 22 if (x_does_shm)
23 { 23 {
24 xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo); 24 xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo);
25 is_shm = xim != NULL; 25 is_shm = ! !xim;
26 } 26 }
27+#endif /* !__INTERIX */ 27+#endif /* !__INTERIX */
28 if (!xim) 28 if (!xim)
29 xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap); 29 xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
30 if (!xim) 30 if (!xim)
31@@ -740,8 +744,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data 31@@ -740,8 +744,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
32 d, xim, mxim, v, xatt.depth, x, y, w, h, 0); 32 d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
33  33
34 /* destroy the Ximage */ 34 /* destroy the Ximage */
35+#ifndef __INTERIX 35+#ifndef __INTERIX
36 if (is_shm) 36 if (is_shm)
37 __imlib_ShmDetach(d, &shminfo); 37 __imlib_ShmDetach(d, &shminfo);
38+#endif /* !__INTERIX */ 38+#endif /* !__INTERIX */
File Deleted: pkgsrc/graphics/imlib2/patches/Attic/patch-af