svn commit: r377904 - in head/cad/meshlab: . files
Thierry Thomas
thierry at FreeBSD.org
Sun Jan 25 21:37:34 UTC 2015
Author: thierry
Date: Sun Jan 25 21:37:31 2015
New Revision: 377904
URL: https://svnweb.freebsd.org/changeset/ports/377904
QAT: https://qat.redports.org/buildarchive/r377904/
Log:
Upgrade to 1.3.3 and define LICENSE.
Added:
head/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp (contents, props changed)
head/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h (contents, props changed)
Deleted:
head/cad/meshlab/files/patch-meshlab_mainwindow_RunTime.cpp
head/cad/meshlab/files/patch-vcglib-vcg-complex-algorithms_subset.h
head/cad/meshlab/files/patch-vcglib-vcg-math_base.h
head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h
Modified:
head/cad/meshlab/Makefile
head/cad/meshlab/distinfo
head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
head/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
head/cad/meshlab/pkg-plist
Modified: head/cad/meshlab/Makefile
==============================================================================
--- head/cad/meshlab/Makefile Sun Jan 25 21:08:43 2015 (r377903)
+++ head/cad/meshlab/Makefile Sun Jan 25 21:37:31 2015 (r377904)
@@ -2,30 +2,35 @@
# $FreeBSD$
PORTNAME= meshlab
-DISTVERSION= 1.3.2
-PORTREVISION= 3
+PORTVERSION= 1.3.3
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL}/gahr/ \
- http://people.freebsd.org/~gahr/distfiles/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
+DISTNAME= MeshLabSrc_AllInc_v${PORTVERSION:C|\.||g}
MAINTAINER= ports at FreeBSD.org
COMMENT= 3D triangular meshes processing and editing tool
-LIB_DEPENDS= libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap
-LIB_DEPENDS= libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap
+LICENSE= GPLv2
-USES= dos2unix qmake compiler:c++11-lib
+EXTRACT_DEPENDS=gtar:${PORTSDIR}/archivers/gtar
+LIB_DEPENDS= libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap \
+ libmpir.so:${PORTSDIR}/math/mpir
+
+USES= dos2unix qmake compiler:c++11-lib tar:tgz
USE_CXXSTD= c++11
USE_GL= glew glu
USE_QT4= moc_build rcc_build uic_build corelib gui xml \
xmlpatterns opengl network script
+USE_LDCONFIG= yes
DOS2UNIX_FILES= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp \
- meshlabplugins/edit_arc3D/fillImage.cpp
+ meshlabplugins/edit_arc3D/fillImage.cpp \
+ meshlabplugins/filter_csg/intercept.h
-WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}/src
+EXTRACT_CMD= gtar
+WRKSRC= ${WRKDIR}/${PORTNAME}/src
-post-patch:
+pre-configure:
${MV} "${WRKSRC}/distrib/shaders/electronic microscope.gdp" \
${WRKSRC}/distrib/shaders/electronic_microscope.gdp
${MV} "${WRKSRC}/distrib/shaders/shadersrm/old/Depth of Field.rfx" \
Modified: head/cad/meshlab/distinfo
==============================================================================
--- head/cad/meshlab/distinfo Sun Jan 25 21:08:43 2015 (r377903)
+++ head/cad/meshlab/distinfo Sun Jan 25 21:37:31 2015 (r377904)
@@ -1,2 +1,2 @@
-SHA256 (meshlab-1.3.2.tar.gz) = 70b2bdcc8001346b5104e8614cefa9ed9cab055fb6adc04352a19b7f9b66bad6
-SIZE (meshlab-1.3.2.tar.gz) = 12774974
+SHA256 (MeshLabSrc_AllInc_v133.tgz) = c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f
+SIZE (MeshLabSrc_AllInc_v133.tgz) = 13390531
Added: head/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp Sun Jan 25 21:37:31 2015 (r377904)
@@ -0,0 +1,11 @@
+--- external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp.orig 2014-02-07 10:38:23.000000000 +0100
++++ external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2015-01-25 18:58:54.000000000 +0100
+@@ -122,7 +122,7 @@
+ currentT = p;
+
+ // We do not intersect grid.
+- if (!found) return false;
++ if (!found) return nullptr;
+ }
+
+ stepX = (dir.x() > 0) ? 1 : -1;
Modified: head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
==============================================================================
--- head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Sun Jan 25 21:08:43 2015 (r377903)
+++ head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Sun Jan 25 21:37:31 2015 (r377904)
@@ -1,12 +1,12 @@
---- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig 2013-11-16 22:04:41.000000000 +0100
-+++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-11-16 22:04:56.000000000 +0100
+--- meshlabplugins/decorate_base/colorhistogram.h.orig 2013-07-17 17:20:11.000000000 +0200
++++ meshlabplugins/decorate_base/colorhistogram.h 2015-01-24 18:01:12.000000000 +0100
@@ -39,10 +39,11 @@
//ScalarType BinWidth(ScalarType v);
//! Reset histogram data.
+ /* dead code
void Clear() {
- this->::Clear();
+ Histogram<ScalarType>::Clear();
CV.clear();
- }
+ } */
Added: head/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h Sun Jan 25 21:37:31 2015 (r377904)
@@ -0,0 +1,58 @@
+--- meshlabplugins/filter_csg/intercept.h.orig 2015-01-25 21:48:25.000000000 +0100
++++ meshlabplugins/filter_csg/intercept.h 2015-01-25 21:49:09.000000000 +0100
+@@ -7,8 +7,13 @@
+ #include <unordered_map>
+ #include <unordered_set>
+ #else
++# if !defined(_LIBCPP_VERSION)
+ #include <tr1/unordered_map>
+ #include <tr1/unordered_set>
++# else
++ #include <unordered_map>
++ #include <unordered_set>
++# endif
+ #endif
+
+ #include <vcg/complex/complex.h>
+@@ -29,7 +34,7 @@
+ //MSVC++ 7.0 _MSC_VER = 1300
+ //MSVC++ 6.0 _MSC_VER = 1200
+ //MSVC++ 5.0 _MSC_VER = 1100
+-#if defined(_MSC_VER) && (_MSC_VER > 1500)
++#if (defined(_MSC_VER) && (_MSC_VER > 1500)) || defined(_LIBCPP_VERSION)
+ #else
+ namespace tr1 {
+ #endif
+@@ -38,11 +43,15 @@
+ {
+ std::size_t operator()(const vcg::Point3i &x) const
+ {
++#if !defined(_LIBCPP_VERSION)
+ std::tr1::hash<int> h;
++#else
++ std::hash<int> h;
++#endif
+ return ((x[0]) * 131 + h(x[1])) * 131 + h(x[2]);
+ }
+ };
+-#if defined(_MSC_VER) && (_MSC_VER > 1500)
++#if (defined(_MSC_VER) && (_MSC_VER > 1500)) || defined(_LIBCPP_VERSION)
+ #else
+ }
+ #endif
+@@ -823,9 +832,15 @@
+ {
+ typedef typename MeshType::VertexPointer VertexPointer;
+ typedef typename MeshType::CoordType CoordType;
++#if !defined(_LIBCPP_VERSION)
+ typedef typename std::tr1::unordered_map<const InterceptType*,size_t> VertexTable;
+ typedef typename std::tr1::unordered_map<vcg::Point3i,float> SamplesTable;
+ typedef typename std::tr1::unordered_set<vcg::Point3i> CellsSet;
++#else
++ typedef typename std::unordered_map<const InterceptType*,size_t> VertexTable;
++ typedef typename std::unordered_map<vcg::Point3i,float> SamplesTable;
++ typedef typename std::unordered_set<vcg::Point3i> CellsSet;
++#endif
+
+ void clear() {
+ _vertices.clear();
Modified: head/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
==============================================================================
--- head/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Sun Jan 25 21:08:43 2015 (r377903)
+++ head/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Sun Jan 25 21:37:31 2015 (r377904)
@@ -1,5 +1,5 @@
---- ../../vcglib/vcg/space/deprecated_point.h.orig 2012-07-31 08:25:21.000000000 +0200
-+++ ../../vcglib/vcg/space/deprecated_point.h 2014-06-10 17:19:15.000000000 +0200
+--- ../../vcglib/vcg/space/deprecated_point.h.orig 2014-04-01 17:10:03.000000000 +0200
++++ ../../vcglib/vcg/space/deprecated_point.h 2015-01-24 23:55:25.000000000 +0100
@@ -59,6 +59,10 @@
#include <vcg/math/base.h>
#include <vcg/space/space.h>
@@ -10,21 +10,21 @@
+
namespace vcg {
- namespace ndim{
+ namespace ndim{
@@ -164,14 +168,14 @@
}
inline const S &X() const { return _v[0]; }
- inline const S &Y() const { return _v[1]; }
-- inline const S &Z() const { static_assert(N>2); return _v[2]; }
-+ inline const S &Z() const { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
- /// W is in any case the last coordinate.
- /// (in a 2D point, W() == Y(). In a 3D point, W()==Z()
- /// in a 4D point, W() is a separate component)
- inline const S &W() const { return _v[N-1]; }
- inline S &X() { return _v[0]; }
- inline S &Y() { return _v[1]; }
-- inline S &Z() { static_assert(N>2); return _v[2]; }
-+ inline S &Z() { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
- inline S &W() { return _v[N-1]; }
- inline const S * V() const
- {
+ inline const S &Y() const { return _v[1]; }
+- inline const S &Z() const { static_assert(N>2); return _v[2]; }
++ inline const S &Z() const { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
+ /// W is in any case the last coordinate.
+ /// (in a 2D point, W() == Y(). In a 3D point, W()==Z()
+ /// in a 4D point, W() is a separate component)
+ inline const S &W() const { return _v[N-1]; }
+ inline S &X() { return _v[0]; }
+ inline S &Y() { return _v[1]; }
+- inline S &Z() { static_assert(N>2); return _v[2]; }
++ inline S &Z() { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
+ inline S &W() { return _v[N-1]; }
+ inline const S * V() const
+ {
Modified: head/cad/meshlab/pkg-plist
==============================================================================
--- head/cad/meshlab/pkg-plist Sun Jan 25 21:08:43 2015 (r377903)
+++ head/cad/meshlab/pkg-plist Sun Jan 25 21:37:31 2015 (r377904)
@@ -13,6 +13,7 @@ lib/meshlab/plugins/libedit_paint.so
lib/meshlab/plugins/libedit_pickpoints.so
lib/meshlab/plugins/libedit_point.so
lib/meshlab/plugins/libedit_quality.so
+lib/meshlab/plugins/libedit_referencing.so
lib/meshlab/plugins/libedit_select.so
lib/meshlab/plugins/libedit_texture.so
lib/meshlab/plugins/libfilter_aging.so
@@ -25,9 +26,12 @@ lib/meshlab/plugins/libfilter_color_proj
lib/meshlab/plugins/libfilter_colorize.so
lib/meshlab/plugins/libfilter_colorproc.so
lib/meshlab/plugins/libfilter_create.so
+lib/meshlab/plugins/libfilter_createiso.so
+lib/meshlab/plugins/libfilter_csg.so
lib/meshlab/plugins/libfilter_dirt.so
lib/meshlab/plugins/libfilter_fractal.so
lib/meshlab/plugins/libfilter_func.so
+lib/meshlab/plugins/libfilter_geodesic.so
lib/meshlab/plugins/libfilter_img_patch_param.so
lib/meshlab/plugins/libfilter_isoparametrization.so
lib/meshlab/plugins/libfilter_layer.so
@@ -48,8 +52,6 @@ lib/meshlab/plugins/libfilter_texture.so
lib/meshlab/plugins/libfilter_trioptimize.so
lib/meshlab/plugins/libfilter_unsharp.so
lib/meshlab/plugins/libfilter_zippering.so
-lib/meshlab/plugins/libfiltercreateiso.so
-lib/meshlab/plugins/libfiltergeodesic.so
lib/meshlab/plugins/libio_3ds.so
lib/meshlab/plugins/libio_base.so
lib/meshlab/plugins/libio_bre.so
@@ -61,6 +63,7 @@ lib/meshlab/plugins/libio_json.so
lib/meshlab/plugins/libio_m.so
lib/meshlab/plugins/libio_pdb.so
lib/meshlab/plugins/libio_tri.so
+lib/meshlab/plugins/libio_txt.so
lib/meshlab/plugins/libio_u3d.so
lib/meshlab/plugins/libio_x3d.so
lib/meshlab/plugins/librender_gdp.so
More information about the svn-ports-head
mailing list