math/qhull: update to 2020.2, from Volker Schlecht
now only installs the reentrant version of libqhull; consumers will be adapted to cope. tested by steven@
This commit is contained in:
landry
parent
0a450ee8b5
commit
bbccb799f7
|
|
@ -1,9 +1,13 @@
|
|||
COMMENT = computing the convex hull
|
||||
|
||||
DISTNAME = qhull-2012.1
|
||||
DISTNAME = qhull-${VERSION}
|
||||
|
||||
SHARED_LIBS = qhull_p 0.0 # 6.0
|
||||
SHARED_LIBS += qhull 0.0 # 6.0
|
||||
SHARED_LIBS = qhull_p 1.0
|
||||
SHARED_LIBS += qhull 1.0
|
||||
SHARED_LIBS += qhull_r 0.0
|
||||
|
||||
VERSION = 2020.2
|
||||
QHULL_REV = 8.0.2
|
||||
|
||||
CATEGORIES = math
|
||||
|
||||
|
|
@ -15,7 +19,7 @@ PERMIT_PACKAGE = Yes
|
|||
WANTLIB = c m
|
||||
|
||||
MASTER_SITES = ${HOMEPAGE}download/
|
||||
DISTFILES = ${DISTNAME}-src${EXTRACT_SUFX}
|
||||
DISTFILES = ${DISTNAME:R}-src-${QHULL_REV}${EXTRACT_SUFX}
|
||||
EXTRACT_SUFX = .tgz
|
||||
|
||||
MODULES = devel/cmake
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (qhull-2012.1-src.tgz) = o17KphBVC38Fw843PYnDDPdLBZppiA8DCAxVba68/4g=
|
||||
SIZE (qhull-2012.1-src.tgz) = 716665
|
||||
SHA256 (qhull-2020-src-8.0.2.tgz) = tcLX64MyeIgblSyKUtIBeeq4d2awC4ZQAEaaRcGDi34=
|
||||
SIZE (qhull-2020-src-8.0.2.tgz) = 1298874
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
--- src/libqhullcpp/QhullIterator.h.orig Thu Apr 27 22:36:05 2017
|
||||
+++ src/libqhullcpp/QhullIterator.h Thu Apr 27 22:37:44 2017
|
||||
@@ -16,8 +16,19 @@ extern "C" {
|
||||
#include <assert.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#if defined(_LIBCPP_VERSION)
|
||||
+// shut up clang
|
||||
+# pragma GCC diagnostic push
|
||||
+# pragma GCC diagnostic ignored "-Wc++11-extensions"
|
||||
+_LIBCPP_BEGIN_NAMESPACE_STD
|
||||
+ struct bidirectional_iterator_tag;
|
||||
+ struct random_access_iterator_tag;
|
||||
+_LIBCPP_END_NAMESPACE_STD
|
||||
+# pragma GCC diagnostic pop
|
||||
+#else
|
||||
//! Avoid dependence on <iterator>
|
||||
namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
|
||||
+#endif
|
||||
|
||||
namespace orgQhull {
|
||||
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
--- src/libqhullcpp/QhullLinkedList.h.orig Thu Apr 27 22:39:48 2017
|
||||
+++ src/libqhullcpp/QhullLinkedList.h Thu Apr 27 22:40:55 2017
|
||||
@@ -9,7 +9,20 @@
|
||||
#ifndef QHULLLINKEDLIST_H
|
||||
#define QHULLLINKEDLIST_H
|
||||
|
||||
+#include <new>
|
||||
+#if defined(_LIBCPP_VERSION)
|
||||
+// shut up clang
|
||||
+# pragma GCC diagnostic push
|
||||
+# pragma GCC diagnostic ignored "-Wc++11-extensions"
|
||||
+_LIBCPP_BEGIN_NAMESPACE_STD
|
||||
+ struct bidirectional_iterator_tag;
|
||||
+ struct random_access_iterator_tag;
|
||||
+_LIBCPP_END_NAMESPACE_STD
|
||||
+# pragma GCC diagnostic pop
|
||||
+#else
|
||||
+//! Avoid dependence on <iterator>
|
||||
namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
|
||||
+#endif
|
||||
|
||||
#include "QhullError.h"
|
||||
|
||||
|
|
@ -5,28 +5,30 @@
|
|||
@bin bin/qvoronoi
|
||||
@bin bin/rbox
|
||||
include/libqhull/
|
||||
include/libqhull/DEPRECATED.txt
|
||||
include/libqhull/geom.h
|
||||
include/libqhull/index.htm
|
||||
include/libqhull/io.h
|
||||
include/libqhull/libqhull.h
|
||||
include/libqhull/mem.h
|
||||
include/libqhull/merge.h
|
||||
include/libqhull/poly.h
|
||||
include/libqhull/qh-geom.htm
|
||||
include/libqhull/qh-globa.htm
|
||||
include/libqhull/qh-io.htm
|
||||
include/libqhull/qh-mem.htm
|
||||
include/libqhull/qh-merge.htm
|
||||
include/libqhull/qh-poly.htm
|
||||
include/libqhull/qh-qhull.htm
|
||||
include/libqhull/qh-set.htm
|
||||
include/libqhull/qh-stat.htm
|
||||
include/libqhull/qh-user.htm
|
||||
include/libqhull/qhull_a.h
|
||||
include/libqhull/qset.h
|
||||
include/libqhull/random.h
|
||||
include/libqhull/stat.h
|
||||
include/libqhull/user.h
|
||||
include/libqhull_r/
|
||||
include/libqhull_r/geom_r.h
|
||||
include/libqhull_r/io_r.h
|
||||
include/libqhull_r/libqhull_r.h
|
||||
include/libqhull_r/mem_r.h
|
||||
include/libqhull_r/merge_r.h
|
||||
include/libqhull_r/poly_r.h
|
||||
include/libqhull_r/qhull_ra.h
|
||||
include/libqhull_r/qset_r.h
|
||||
include/libqhull_r/random_r.h
|
||||
include/libqhull_r/stat_r.h
|
||||
include/libqhull_r/user_r.h
|
||||
include/libqhullcpp/
|
||||
include/libqhullcpp/Coordinates.h
|
||||
include/libqhullcpp/PointCoordinates.h
|
||||
|
|
@ -46,19 +48,28 @@ include/libqhullcpp/QhullRidge.h
|
|||
include/libqhullcpp/QhullSet.h
|
||||
include/libqhullcpp/QhullSets.h
|
||||
include/libqhullcpp/QhullStat.h
|
||||
include/libqhullcpp/QhullUser.h
|
||||
include/libqhullcpp/QhullVertex.h
|
||||
include/libqhullcpp/QhullVertexSet.h
|
||||
include/libqhullcpp/RboxPoints.h
|
||||
include/libqhullcpp/RoadError.h
|
||||
include/libqhullcpp/RoadLogEvent.h
|
||||
include/libqhullcpp/RoadTest.h
|
||||
include/libqhullcpp/UsingLibQhull.h
|
||||
include/libqhullcpp/functionObjects.h
|
||||
@lib lib/libqhull.so.${LIBqhull_VERSION}
|
||||
@lib lib/libqhull_p.so.${LIBqhull_p_VERSION}
|
||||
lib/libqhullcpp.a
|
||||
lib/libqhullstatic.a
|
||||
lib/libqhullstatic_p.a
|
||||
lib/cmake/
|
||||
lib/cmake/Qhull/
|
||||
lib/cmake/Qhull/QhullConfig.cmake
|
||||
lib/cmake/Qhull/QhullConfigVersion.cmake
|
||||
lib/cmake/Qhull/QhullTargets${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/Qhull/QhullTargets.cmake
|
||||
@lib lib/libqhull_r.so.${LIBqhull_r_VERSION}
|
||||
@static-lib lib/libqhullcpp.a
|
||||
@static-lib lib/libqhullstatic.a
|
||||
@static-lib lib/libqhullstatic_r.a
|
||||
lib/pkgconfig/qhull_r.pc
|
||||
lib/pkgconfig/qhullcpp.pc
|
||||
lib/pkgconfig/qhullstatic.pc
|
||||
lib/pkgconfig/qhullstatic_r.pc
|
||||
@man man/man1/qhull.1
|
||||
@man man/man1/rbox.1
|
||||
share/doc/qhull/
|
||||
|
|
@ -66,37 +77,42 @@ share/doc/qhull/Announce.txt
|
|||
share/doc/qhull/COPYING.txt
|
||||
share/doc/qhull/README.txt
|
||||
share/doc/qhull/REGISTER.txt
|
||||
share/doc/qhull/html/
|
||||
share/doc/qhull/html/index.htm
|
||||
share/doc/qhull/html/normal_voronoi_knauss_oesterle.jpg
|
||||
share/doc/qhull/html/qconvex.htm
|
||||
share/doc/qhull/html/qdelau_f.htm
|
||||
share/doc/qhull/html/qdelaun.htm
|
||||
share/doc/qhull/html/qh--4d.gif
|
||||
share/doc/qhull/html/qh--cone.gif
|
||||
share/doc/qhull/html/qh--dt.gif
|
||||
share/doc/qhull/html/qh--geom.gif
|
||||
share/doc/qhull/html/qh--half.gif
|
||||
share/doc/qhull/html/qh--rand.gif
|
||||
share/doc/qhull/html/qh-code.htm
|
||||
share/doc/qhull/html/qh-eg.htm
|
||||
share/doc/qhull/html/qh-faq.htm
|
||||
share/doc/qhull/html/qh-get.htm
|
||||
share/doc/qhull/html/qh-impre.htm
|
||||
share/doc/qhull/html/qh-optc.htm
|
||||
share/doc/qhull/html/qh-optf.htm
|
||||
share/doc/qhull/html/qh-optg.htm
|
||||
share/doc/qhull/html/qh-opto.htm
|
||||
share/doc/qhull/html/qh-optp.htm
|
||||
share/doc/qhull/html/qh-optq.htm
|
||||
share/doc/qhull/html/qh-optt.htm
|
||||
share/doc/qhull/html/qh-quick.htm
|
||||
share/doc/qhull/html/qh_findbestfacet-drielsma.pdf
|
||||
share/doc/qhull/html/qhalf.htm
|
||||
share/doc/qhull/html/qhull-cpp.xml
|
||||
share/doc/qhull/html/qhull.htm
|
||||
share/doc/qhull/html/qhull.man
|
||||
share/doc/qhull/html/qhull.txt
|
||||
share/doc/qhull/html/qvoron_f.htm
|
||||
share/doc/qhull/html/qvoronoi.htm
|
||||
share/doc/qhull/html/rbox.htm
|
||||
share/doc/qhull/html/rbox.man
|
||||
share/doc/qhull/html/rbox.txt
|
||||
share/doc/qhull/index.htm
|
||||
share/doc/qhull/normal_voronoi_knauss_oesterle.jpg
|
||||
share/doc/qhull/qconvex.htm
|
||||
share/doc/qhull/qdelau_f.htm
|
||||
share/doc/qhull/qdelaun.htm
|
||||
share/doc/qhull/qh--4d.gif
|
||||
share/doc/qhull/qh--cone.gif
|
||||
share/doc/qhull/qh--dt.gif
|
||||
share/doc/qhull/qh--geom.gif
|
||||
share/doc/qhull/qh--half.gif
|
||||
share/doc/qhull/qh--rand.gif
|
||||
share/doc/qhull/qh-code.htm
|
||||
share/doc/qhull/qh-eg.htm
|
||||
share/doc/qhull/qh-faq.htm
|
||||
share/doc/qhull/qh-get.htm
|
||||
share/doc/qhull/qh-impre.htm
|
||||
share/doc/qhull/qh-optc.htm
|
||||
share/doc/qhull/qh-optf.htm
|
||||
share/doc/qhull/qh-optg.htm
|
||||
share/doc/qhull/qh-opto.htm
|
||||
share/doc/qhull/qh-optp.htm
|
||||
share/doc/qhull/qh-optq.htm
|
||||
share/doc/qhull/qh-optt.htm
|
||||
share/doc/qhull/qh-quick.htm
|
||||
share/doc/qhull/qhalf.htm
|
||||
share/doc/qhull/qhull-cpp.xml
|
||||
share/doc/qhull/qhull.htm
|
||||
share/doc/qhull/qhull.man
|
||||
share/doc/qhull/qhull.txt
|
||||
share/doc/qhull/qvoron_f.htm
|
||||
share/doc/qhull/qvoronoi.htm
|
||||
share/doc/qhull/rbox.htm
|
||||
share/doc/qhull/rbox.man
|
||||
share/doc/qhull/rbox.txt
|
||||
share/doc/qhull/src/
|
||||
share/doc/qhull/src/Changes.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue