[pkgsrc/trunk]: pkgsrc/graphics/imlib2 Replaced the patch-aa (worked only wit...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/251ecbf2f280
branches:  trunk
changeset: 490456:251ecbf2f280
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Mar 10 23:39:53 2005 +0000

description:
Replaced the patch-aa (worked only with NetBSD-2.0) with patch-ab (works
also with NetBSD-1.6.2). Bumped PKGREVISION, because the actual code
changes. The patch is ugly (as usual), but small. Reviewed by christos.

diffstat:

 graphics/imlib2/Makefile         |   3 ++-
 graphics/imlib2/distinfo         |   4 ++--
 graphics/imlib2/patches/patch-aa |  13 -------------
 graphics/imlib2/patches/patch-ab |  23 +++++++++++++++++++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diffs (68 lines):

diff -r f52806930576 -r 251ecbf2f280 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Thu Mar 10 22:21:56 2005 +0000
+++ b/graphics/imlib2/Makefile  Thu Mar 10 23:39:53 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/01/11 13:37:54 adam Exp $
+# $NetBSD: Makefile,v 1.28 2005/03/10 23:39:53 rillig Exp $
 
 DISTNAME=      imlib2-1.2.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff -r f52806930576 -r 251ecbf2f280 graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo  Thu Mar 10 22:21:56 2005 +0000
+++ b/graphics/imlib2/distinfo  Thu Mar 10 23:39:53 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 08:45:08 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/03/10 23:39:53 rillig Exp $
 
 SHA1 (imlib2-1.2.0.tar.gz) = 54f8ef83b0eac3f8e7f2218705e02a425fa73118
 RMD160 (imlib2-1.2.0.tar.gz) = 158ed1bd7c59b8d1db2c00db98027d9c5c0abec3
 Size (imlib2-1.2.0.tar.gz) = 890457 bytes
-SHA1 (patch-aa) = 03df5c153288d30db3b7b587b9ff47b7f44bd52b
+SHA1 (patch-ab) = 42529ee0815cbb96ab29ac24a4ebb8eea0c754e2
diff -r f52806930576 -r 251ecbf2f280 graphics/imlib2/patches/patch-aa
--- a/graphics/imlib2/patches/patch-aa  Thu Mar 10 22:21:56 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/01/23 19:43:00 wiz Exp $
-
---- src/lib/color_helpers.h.orig       2004-11-01 10:39:42.000000000 +0100
-+++ src/lib/color_helpers.h
-@@ -1,3 +1,8 @@
-+#include <math.h>
-+#ifndef lround
-+#define lround (long int)round
-+#endif
-+
- #ifndef __COLOR_HELPERS 
- #define __COLOR_HELPERS 1
- 
diff -r f52806930576 -r 251ecbf2f280 graphics/imlib2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/imlib2/patches/patch-ab  Thu Mar 10 23:39:53 2005 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.7 2005/03/10 23:39:53 rillig Exp $
+
+This patch makes imlib2 compile on systems that don't have an lround
+function, which is defined in C99.
+
+Needed at least for NetBSD-1.6.2 and NetBSD-2.0.
+
+--- src/lib/color_helpers.c.orig       Sat Jan  8 08:55:02 2005
++++ src/lib/color_helpers.c    Thu Mar 10 23:57:26 2005
+@@ -1,4 +1,13 @@
+ #include "color_helpers.h"
++
++#ifdef __NetBSD__
++#define lround(x) my_lround(x)
++static long my_lround(double x)
++{
++      return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5);
++}
++#endif
++
+ /*
+  * Color space conversion helper routines
+  * Convert between rgb and hsv adn between rgb and hls