diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2014-04-12 07:53:02 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2014-04-12 07:53:02 +0000 |
| commit | e19eb7b511102e5f8e462cc0e0513523ca5179bf (patch) | |
| tree | 7e7c1df28ba405296f0785f26f371f1ad22fb6b7 /graphics | |
| parent | 376929d3465e97a1a125dcddbefb7839fb115b86 (diff) | |
| download | ports-e19eb7b511102e5f8e462cc0e0513523ca5179bf.tar.gz ports-e19eb7b511102e5f8e462cc0e0513523ca5179bf.zip | |
Notes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/partio/Makefile | 13 | ||||
| -rw-r--r-- | graphics/partio/distinfo | 4 | ||||
| -rw-r--r-- | graphics/partio/files/patch-src_lib_core_KdTree.h | 27 | ||||
| -rw-r--r-- | graphics/partio/pkg-plist | 6 |
4 files changed, 11 insertions, 39 deletions
diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile index 8756bc42e58f..ffdb93d0287c 100644 --- a/graphics/partio/Makefile +++ b/graphics/partio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= partio -PORTVERSION= 1.1.0.20130624 +PORTVERSION= 1.1.0.20140128 CATEGORIES= graphics math MAINTAINER= mva@FreeBSD.org @@ -17,12 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= wdas GH_PROJECT= partio GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 12428ea - -# Workaround until https://github.com/wdas/partio/pull/38 -# is accepted -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GH_COMMIT= 833fd42 OPTIONS_DEFINE= DOCS PYTHON OPTIONS_DEFAULT= PYTHON @@ -43,6 +38,10 @@ post-patch: @${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY.*src\/py.*/d' \ ${WRKSRC}/CMakeLists.txt .endif +.if !${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY.*src\/doc.*/d' \ + ${WRKSRC}/CMakeLists.txt +.endif .if ${PORT_OPTIONS:MDOCS} post-build: diff --git a/graphics/partio/distinfo b/graphics/partio/distinfo index 78574aa133eb..1a8579a44492 100644 --- a/graphics/partio/distinfo +++ b/graphics/partio/distinfo @@ -1,2 +1,2 @@ -SHA256 (partio-1.1.0.20130624.tar.gz) = ada3ed0a7e68f7a815dcb894fe425aa72caf2138f11f951a64853bbd8128156e -SIZE (partio-1.1.0.20130624.tar.gz) = 263739 +SHA256 (partio-1.1.0.20140128.tar.gz) = 3c032ab20e1cb16ed46e3b76a22cd3be7286be0e2d135eda7dd1efaf648922e9 +SIZE (partio-1.1.0.20140128.tar.gz) = 263610 diff --git a/graphics/partio/files/patch-src_lib_core_KdTree.h b/graphics/partio/files/patch-src_lib_core_KdTree.h deleted file mode 100644 index 65ae2baab324..000000000000 --- a/graphics/partio/files/patch-src_lib_core_KdTree.h +++ /dev/null @@ -1,27 +0,0 @@ ---- src/lib/core/KdTree.h.orig 2013-12-28 22:59:43.000000000 +0100 -+++ src/lib/core/KdTree.h 2013-12-28 22:58:47.000000000 +0100 -@@ -34,7 +34,11 @@ - */ - #ifndef KdTree_h - #define KdTree_h -+#if defined(__clang__) && defined(_LIBCPP_VERSION) -+#include <numeric> -+#elif defined(__GNUC__) - #include <ext/numeric> -+#endif - - namespace Partio - { -@@ -286,7 +290,11 @@ - - // assign sequential ids - _ids.resize(n); -+#if defined(__clang__) && defined(_LIBCPP_VERSION) -+ std::iota(_ids.begin(), _ids.end(), 0); -+#elif defined(__GNUC__) - __gnu_cxx::iota(_ids.begin(), _ids.end(), 0); -+#endif - // _ids.reserve(n); - // while ((int)_ids.size() < n) _ids.push_back(_ids.size()); - _sorted = 0; - diff --git a/graphics/partio/pkg-plist b/graphics/partio/pkg-plist index 158a23e4b4bf..c57a6b379978 100644 --- a/graphics/partio/pkg-plist +++ b/graphics/partio/pkg-plist @@ -35,9 +35,9 @@ lib/libpartio.a %%PORTDOCS%%%%DOCSDIR%%/closed.png %%PORTDOCS%%%%DOCSDIR%%/cpptut.html %%PORTDOCS%%%%DOCSDIR%%/cpptut_8txt.html -%%PORTDOCS%%%%DOCSDIR%%/dir_56764cded5a002c3f242069ae9b8ada5.html -%%PORTDOCS%%%%DOCSDIR%%/dir_7524dcdf2b80aeb1f0178df7bece5e69.html -%%PORTDOCS%%%%DOCSDIR%%/dir_a14c72e9508914f52e3a23f68290c4ed.html +%%PORTDOCS%%%%DOCSDIR%%/dir_572c7c46dd83879a405859aee6b8d533.html +%%PORTDOCS%%%%DOCSDIR%%/dir_5fab038ad9b8a9ea932fd735f3318cfd.html +%%PORTDOCS%%%%DOCSDIR%%/dir_bf245e0b9dec1033d847b880f248ab46.html %%PORTDOCS%%%%DOCSDIR%%/doc_2CMakeLists_8txt.html %%PORTDOCS%%%%DOCSDIR%%/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/doxygen.png |