21143: new style package for qhull

Author: videlec

build/pkgs/qhull/SPKG.txt

@@ -0,0 +1,30 @@
+= Qhull =
+
+== Description ==
+
+From the README.txt of Qhull:
+
+Qhull computes convex hulls, Delaunay triangulations, Voronoi diagrams,
+furthest-site Voronoi diagrams, and halfspace intersections about a point.
+It runs in 2-d, 3-d, 4-d, or higher.  It implements the Quickhull algorithm
+for computing convex hulls.   Qhull handles round-off errors from floating
+point arithmetic.  It can approximate a convex hull.
+
+The program includes options for hull volume, facet area, partial hulls,
+input transformations, randomization, tracing, multiple output formats, and
+execution statistics.
+
+== Upstream Contact ==
+
+C. Bradford Barber
+bradb@shore.net 
+or qhull@qhull.org
+
+== Dependencies ==
+
+Can be compiled with Qt support, but the Sage version currently doesn't try to do this.
+
+== License ==
+
+Not a standard license, but Sage compatible.  See the COPYING.txt file in the
+source directory for details.

build/pkgs/qhull/checksums.ini

@@ -0,0 +1,4 @@
+tarball=qhull-VERSION.tgz
+sha1=8188765b9f9f004e38e9906fd2a68e81119f05fb
+md5=e6270733a826a6a7c32b796e005ec3dc
+cksum=2560098443

build/pkgs/qhull/dependencies

@@ -0,0 +1 @@
+# no dependencies

build/pkgs/qhull/package-version.txt

@@ -0,0 +1 @@
+2015-src-7.2.0

build/pkgs/qhull/patches/Makefile.patch

@@ -0,0 +1,50 @@
+* DESTDIR needs to be Sage install (that would better be fixed by a configure script)
+* fix dependencies between target (otherwise compilation fails with "make -j3")
+
+--- a/Makefile
++++ b/Makefile
+@@ -77,7 +77,7 @@
+ # Unix line endings (\n)
+ # $Id: //main/2015/qhull/Makefile#10 $
+ 
+-DESTDIR = /usr/local
++DESTDIR = $(SAGE_ROOT)/local
+ BINDIR	= $(DESTDIR)/bin
+ INCDIR	= $(DESTDIR)/include
+ LIBDIR	= $(DESTDIR)/lib
+@@ -200,7 +200,7 @@ cleanall: clean
+ doc: 
+ 	$(PRINTMAN) $(TXTFILES) $(DOCFILES)
+ 
+-install:
++install: bin/qconvex bin/qdelaunay bin/qhalf bin/qhull bin/qvoronoi bin/rbox
+ 	mkdir -p $(BINDIR)
+ 	mkdir -p $(DOCDIR)
+ 	mkdir -p $(INCDIR)/libqhull
+@@ -240,7 +240,7 @@ printc:
+ printf:
+ 	$(PRINTC) $(FILES)
+ 
+-qtest:
++qtest: bin/testqset bin/rbox
+ 	@echo ============================================
+ 	@echo == make qtest ==============================
+ 	@echo ============================================
+@@ -262,7 +262,7 @@ qtest:
+ 	@echo ============================================
+ 	-bin/rbox D4 | bin/qhull Tv
+ 	
+-test: qtest
++test: qtest  bin/qconvex bin/qdelaunay bin/qhalf bin/qhull bin/qvoronoi bin/rbox
+ 	@echo ============================================
+ 	@echo == make test ===============================
+ 	@echo ============================================
+@@ -319,7 +319,7 @@ testall: test
+ 	-eg/q_egtest
+ 	-eg/q_test
+ 
+-qconvex-prompt:
++qconvex-prompt: bin/qconvex bin/rbox
+ 	bin/qconvex
+ 	@echo
+ 	@echo ============================================

build/pkgs/qhull/spkg-check

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+cd src/
+
+if [ "$SAGE_LOCAL" = "" ]; then
+   echo "SAGE_LOCAL undefined ... exiting";
+   echo "Maybe run 'sage -sh'?"
+   exit 1
+fi
+
+$MAKE test
+if [ $? -ne 0 ]; then
+   echo "Error in testing qhull"
+   exit 1
+fi
+

build/pkgs/qhull/spkg-install

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+if [ "$SAGE_LOCAL" = "" ]; then
+   echo "SAGE_LOCAL undefined ... exiting";
+   echo "Maybe run 'sage -sh'?"
+   exit 1
+fi
+
+cd src/
+
+# Apply all patches
+for patch in ../patches/*.patch; do
+	echo "Applying $patch"
+	patch -p1 <"$patch"
+	if [ $? -ne 0 ]; then
+		echo >&2 "Error applying '$patch'"
+		return 1
+	fi
+done
+
+make -j1
+if [ $? -ne 0 ]; then
+   echo "Error building qhull"
+   exit 1
+fi
+
+make -j1 install
+if [ $? -ne 0 ]; then
+    echo "Error installing qhull"
+    exit 1
+fi

build/pkgs/qhull/type

@@ -0,0 +1 @@
+optional