1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

- Update to snapshot from 28-04-2014

This commit is contained in:
Marcus von Appen 2014-04-12 07:53:02 +00:00
parent 376929d346
commit e19eb7b511
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=351074
4 changed files with 11 additions and 39 deletions

View File

@ -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:

View File

@ -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

View File

@ -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;

View File

@ -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