[csw-devel] SF.net SVN: gar:[4282] csw/mgar/pkg/ImageMagick/trunk

[hson at users.sourceforge.net]

Revision: 4282
          http://gar.svn.sourceforge.net/gar/?rev=4282&view=rev
Author:   hson
Date:     2009-04-12 12:59:04 +0000 (Sun, 12 Apr 2009)

Log Message:
-----------
imagemagick: update to 6.5.1-1

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile
    csw/mgar/pkg/ImageMagick/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-04-12 12:39:06 UTC (rev 4281)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-04-12 12:59:04 UTC (rev 4282)
@@ -1,6 +1,6 @@
 GARNAME = imagemagick
-GARVERSION = 6.4.9
-GARSUBREV = 10
+GARVERSION = 6.5.1
+GARSUBREV = 1
 CATEGORIES = lib
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
@@ -39,6 +39,8 @@
 CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib 
 
 PATCHFILES += Makefile.patch
+# Temporary patch until upstream make a more permenent fix
+PATCHFILES += djvu.c.diff
 
 # Test has to be run *after* install
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2009-04-12 12:39:06 UTC (rev 4281)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2009-04-12 12:59:04 UTC (rev 4282)
@@ -1,2 +1,3 @@
-4efbf9ba504ce228ed67e6db4c8245ff  download/ImageMagick-6.4.9-10.tar.bz2
+2e5f775ac599ff2548395706fcc7eba0  download/ImageMagick-6.5.1-1.tar.bz2
 6bd361fe352c7d497d60d8d2cbe7cfd4  download/Makefile.patch
+de358462d89bfceb050888cf6b564257  download/djvu.c.diff

Added: csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff	                        (rev 0)
+++ csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff	2009-04-12 12:59:04 UTC (rev 4282)
@@ -0,0 +1,32 @@
+--- ../build-global/ImageMagick-6.5.1-1/coders/djvu.c	2009-03-31 17:44:40.000000000 +0200
++++ ImageMagick-6.5.1-1/coders/djvu.c	2009-04-12 11:00:15.678316236 +0200
+@@ -58,6 +58,29 @@
+ #if defined(MAGICKCORE_DJVU_DELEGATE)
+ #include <libdjvu/ddjvuapi.h>
+ #endif
++
++#if defined(__SunOS_5_8) || defined(__SunOS_5_9)
++#define signbit(x) copysign(1, x)<0
++
++
++double
++fmax(double x, double y)
++{
++	if (isnan(x))
++		return (y);
++	if (isnan(y))
++		return (x);
++
++	if (signbit(x) != signbit(y)) {
++		if (signbit(x))
++			return (y);
++		else
++			return (x);
++	}
++
++	return (x > y ? x : y);
++}
++#endif
+ 
+ /*
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.