[csw-devel] SF.net SVN: gar:[9436] csw/mgar/pkg/qhull/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9436
          http://gar.svn.sourceforge.net/gar/?rev=9436&view=rev
Author:   dmichelsen
Date:     2010-03-29 11:55:35 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
qhull: Add patch and license

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

Added Paths:
-----------
    csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch

Modified: csw/mgar/pkg/qhull/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qhull/trunk/Makefile	2010-03-29 11:36:26 UTC (rev 9435)
+++ csw/mgar/pkg/qhull/trunk/Makefile	2010-03-29 11:55:35 UTC (rev 9436)
@@ -2,7 +2,7 @@
 GARVERSION = 2003.1
 CATEGORIES = lib
 
-DESCRIPTION = Qhull computes the convex hull and other hulls
+DESCRIPTION = Qhull computes the convex hull and other hulls (with poly.c-qh_gethash.patch)
 define BLURB
   Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram,
   halfspace intersection about a point, furthest-site Delaunay triangulation,
@@ -18,9 +18,15 @@
 MASTER_SITES = http://www.qhull.org/download/
 DISTFILES  = $(DISTNAME).tar.gz
 
+# From http://www.qhull.org/download/
+PATCHDIRLEVEL = 2
+PATCHFILES = poly.c-qh_gethash.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+LICENSE = COPYING.txt
+
 PACKAGES = CSWqhull CSWqhullrt
 
 CATALOGNAME_CSWqhull = qhull

Modified: csw/mgar/pkg/qhull/trunk/checksums
===================================================================
--- csw/mgar/pkg/qhull/trunk/checksums	2010-03-29 11:36:26 UTC (rev 9435)
+++ csw/mgar/pkg/qhull/trunk/checksums	2010-03-29 11:55:35 UTC (rev 9436)
@@ -1 +1,2 @@
+2545ef6e268e41e31d52685c08c778e5  poly.c-qh_gethash.patch
 48228e26422bff85ef1f45df5b6e3314  qhull-2003.1.tar.gz

Added: csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch
===================================================================
--- csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch	                        (rev 0)
+++ csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch	2010-03-29 11:55:35 UTC (rev 9436)
@@ -0,0 +1,23 @@
+--- a/qhull-2003.1/src/poly.c
++++ b/qhull-2003.1/src/poly.c
+@@ -403,6 +403,7 @@ unsigned qh_gethash (int hashsize, setT *set, int size, int firstindex, void *sk
+   void **elemp= SETelemaddr_(set, firstindex, void);
+   ptr_intT hash = 0, elem;
+   int i;
++  unsigned result;
+ 
+   switch (size-firstindex) {
+   case 1:
+@@ -441,7 +442,8 @@ unsigned qh_gethash (int hashsize, setT *set, int size, int firstindex, void *sk
+     }while(*elemp);
+     break;
+   }
+-  hash %= (ptr_intT) hashsize;
+-  /* hash= 0; for debugging purposes */
+-  return hash;
++  result= (unsigned)hash;
++  result %= (unsigned)hashsize;
++  /* result= 0; for debugging purposes */
++  return result;
+ } /* gethash */
+ 


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