summaryrefslogtreecommitdiff
path: root/cad/meshlab
diff options
context:
space:
mode:
Diffstat (limited to 'cad/meshlab')
-rw-r--r--cad/meshlab/Makefile65
-rw-r--r--cad/meshlab/distinfo2
-rw-r--r--cad/meshlab/files/patch-common_common.pro11
-rw-r--r--cad/meshlab/files/patch-common_pluginmanager.cpp14
-rw-r--r--cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp11
-rw-r--r--cad/meshlab/files/patch-external-structuresynth-ssynth-SyntopiaCore-GLEngine-Raytracer_VoxelStepper.cpp11
-rw-r--r--cad/meshlab/files/patch-glu10
-rw-r--r--cad/meshlab/files/patch-meshlab__full.pro13
-rw-r--r--cad/meshlab/files/patch-meshlab_meshlab.pro12
-rw-r--r--cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h15
-rw-r--r--cad/meshlab/files/patch-meshlabplugins-edit_arc3D-fillImage.cpp10
-rw-r--r--cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h58
-rw-r--r--cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp17
-rw-r--r--cad/meshlab/files/patch-meshlabplugins-filter_poisson-src_Geometry.inl11
-rw-r--r--cad/meshlab/files/patch-meshlabserver_meshlabserver.pro11
-rw-r--r--cad/meshlab/files/patch-shared.pri8
-rw-r--r--cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h30
-rw-r--r--cad/meshlab/files/patch-vcglib-wrap-ply_plystuff.h10
-rw-r--r--cad/meshlab/pkg-descr7
-rw-r--r--cad/meshlab/pkg-plist190
20 files changed, 0 insertions, 516 deletions
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
deleted file mode 100644
index 4fdb5bdc0e3b..000000000000
--- a/cad/meshlab/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Created by: gahr
-# $FreeBSD$
-
-PORTNAME= meshlab
-PORTVERSION= 1.3.3
-PORTREVISION= 10
-CATEGORIES= cad
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
-DISTNAME= MeshLabSrc_AllInc_v${PORTVERSION:C|\.||g}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= 3D triangular meshes processing and editing tool
-
-LICENSE= GPLv2
-
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
-
-BROKEN_aarch64= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_armv6= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_armv7= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_powerpc64= fails to compile: mc_lookup_table.h:316:5: narrowing conversion of '-1' from 'int' to 'char' inside { }
-
-EXTRACT_DEPENDS=gtar:archivers/gtar
-LIB_DEPENDS= libQtSolutions_SOAP-head.so:devel/qt4-qtsolutions-soap \
- libmpir.so:math/mpir
-
-USES= compiler:c++11-lib dos2unix qmake qt:4 tar:tgz
-USE_CXXSTD= c++11
-USE_GL= glew glu
-USE_QT= 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/filter_csg/intercept.h \
- meshlabplugins/filter_photosynth/downloader.cpp
-
-EXTRACT_CMD= gtar
-QMAKE_SOURCE_PATH= ${WRKSRC}/meshlab_full.pro
-WRKSRC= ${WRKDIR}/${PORTNAME}/src
-
-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" \
- ${WRKSRC}/distrib/shaders/shadersrm/old/Depth_of_Field.rfx
- ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
- ${WRKSRC}/common/pluginmanager.cpp
-
-.if defined(MAINTAINER_MODE)
- ${FIND} ${WRKSRC}/../../ -name "*.pro" | ${XARGS} \
- ${REINPLACE_CMD} -e '/^CONFIG +=/s|$$| debug|'
-.endif
-
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
- cd ${WRKSRC}/distrib/plugins && ${INSTALL_LIB} *.so ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/shaders
- cd ${WRKSRC}/distrib/shaders && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/meshlab/shaders
- ${INSTALL_PROGRAM} ${WRKSRC}/distrib/meshlab ${STAGEDIR}${PREFIX}/lib/meshlab
- ${LN} -sf ../lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/cad/meshlab/distinfo b/cad/meshlab/distinfo
deleted file mode 100644
index 27061f8f61e5..000000000000
--- a/cad/meshlab/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (MeshLabSrc_AllInc_v133.tgz) = c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f
-SIZE (MeshLabSrc_AllInc_v133.tgz) = 13390531
diff --git a/cad/meshlab/files/patch-common_common.pro b/cad/meshlab/files/patch-common_common.pro
deleted file mode 100644
index 11bcb9195e1f..000000000000
--- a/cad/meshlab/files/patch-common_common.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/common.pro.orig 2014-02-07 09:38:24 UTC
-+++ common/common.pro
-@@ -126,6 +126,8 @@ SOURCES += filterparameter.cpp \
- #win32-msvc2008:LIBS += ../external/lib/win32-msvc2008/jhead.lib
- #win32-msvc2010:LIBS += ../external/lib/win32-msvc2010/jhead.lib
- #win32-msvc2012:LIBS += ../external/lib/win32-msvc2012/jhead.lib
-+
-+CONFIG += static
- #win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead
- #linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead
- #linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead
diff --git a/cad/meshlab/files/patch-common_pluginmanager.cpp b/cad/meshlab/files/patch-common_pluginmanager.cpp
deleted file mode 100644
index 3d4c78012e61..000000000000
--- a/cad/meshlab/files/patch-common_pluginmanager.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- common/pluginmanager.cpp.orig 2012-11-07 11:15:44.000000000 +0100
-+++ common/pluginmanager.cpp 2012-11-07 11:16:26.000000000 +0100
-@@ -230,7 +230,11 @@
-
- QString PluginManager::getPluginDirPath()
- {
-+#ifdef __FreeBSD__
-+ QDir pluginsDir("%%PREFIX%%/lib/meshlab/");
-+#else
- QDir pluginsDir(getBaseDirPath());
-+#endif
- if(!pluginsDir.exists("plugins"))
- //QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory.");
- qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory.");
diff --git a/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp b/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp
deleted file mode 100644
index fdfe5a8120f9..000000000000
--- a/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/cad/meshlab/files/patch-external-structuresynth-ssynth-SyntopiaCore-GLEngine-Raytracer_VoxelStepper.cpp b/cad/meshlab/files/patch-external-structuresynth-ssynth-SyntopiaCore-GLEngine-Raytracer_VoxelStepper.cpp
deleted file mode 100644
index 2b7d3abcf433..000000000000
--- a/cad/meshlab/files/patch-external-structuresynth-ssynth-SyntopiaCore-GLEngine-Raytracer_VoxelStepper.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp.orig 2014-05-19 17:17:49.000000000 +0200
-+++ external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2014-05-19 17:19:07.000000000 +0200
-@@ -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;
diff --git a/cad/meshlab/files/patch-glu b/cad/meshlab/files/patch-glu
deleted file mode 100644
index eae7d1f63f01..000000000000
--- a/cad/meshlab/files/patch-glu
+++ /dev/null
@@ -1,10 +0,0 @@
---- external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h.orig 2012-06-20 18:04:43.000000000 +0200
-+++ external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h 2012-06-20 18:05:23.000000000 +0200
-@@ -3,6 +3,7 @@
- #include "SyntopiaCore/Math/Vector3.h"
- #include <QGLWidget>
- #include <QtOpenGL>
-+#include <GL/glu.h>
-
- namespace SyntopiaCore {
- namespace GLEngine {
diff --git a/cad/meshlab/files/patch-meshlab__full.pro b/cad/meshlab/files/patch-meshlab__full.pro
deleted file mode 100644
index f58150ba34fb..000000000000
--- a/cad/meshlab/files/patch-meshlab__full.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-Make external libraries part of the default build. They are currently built
-before the rest, as qmake will recurse into each subdirectory in order.
---- meshlab_full.pro.bak 2015-11-21 16:25:23.812658000 +0100
-+++ meshlab_full.pro 2015-11-21 16:25:32.892417000 +0100
-@@ -1,7 +1,7 @@
- #config += debug_and_release
- TEMPLATE = subdirs
- CONFIG += ordered
--SUBDIRS = common \
-+SUBDIRS = external common \
- meshlab \
- meshlabserver \
- # IO plugins
diff --git a/cad/meshlab/files/patch-meshlab_meshlab.pro b/cad/meshlab/files/patch-meshlab_meshlab.pro
deleted file mode 100644
index af7f2bf5850e..000000000000
--- a/cad/meshlab/files/patch-meshlab_meshlab.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- meshlab/meshlab.pro.orig 2012-05-30 16:32:44.000000000 +0200
-+++ meshlab/meshlab.pro 2013-05-08 10:34:55.000000000 +0200
-@@ -136,6 +136,9 @@
- linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
-
-+LIBS += -L../external/jhead-2.95 ../common/libcommon.a -lGLU -ljhead
-+QMAKE_RPATHDIR += ../distrib
-+
- # uncomment in your local copy only in emergency cases.
- # We should never be too permissive
- # win32-g++:QMAKE_CXXFLAGS += -fpermissive
diff --git a/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h b/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
deleted file mode 100644
index 8662f077f095..000000000000
--- a/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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() {
- Histogram<ScalarType>::Clear();
- CV.clear();
-- }
-+ } */
- /*
- Note that the histogram holds <n> valid bins plus two semi-infinite bins.
-
diff --git a/cad/meshlab/files/patch-meshlabplugins-edit_arc3D-fillImage.cpp b/cad/meshlab/files/patch-meshlabplugins-edit_arc3D-fillImage.cpp
deleted file mode 100644
index 81f93b1e8f63..000000000000
--- a/cad/meshlab/files/patch-meshlabplugins-edit_arc3D-fillImage.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- meshlabplugins/edit_arc3D/fillImage.cpp.orig 2013-10-31 10:47:05.000000000 +0100
-+++ meshlabplugins/edit_arc3D/fillImage.cpp 2013-10-31 10:52:27.000000000 +0100
-@@ -22,6 +22,7 @@
- ****************************************************************************/
-
- #include "fillImage.h"
-+#include <cstdlib>
- #include <cmath>
- #include <limits>
-
diff --git a/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h b/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h
deleted file mode 100644
index e9ab3087f292..000000000000
--- a/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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();
diff --git a/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp b/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp
deleted file mode 100644
index e57927cf60c4..000000000000
--- a/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-Prevents the following build error:
-
-downloader.cpp:686:23: error: non-constant-expression cannot be narrowed from type 'unsigned char' to 'char' in initializer list [-Wc++11-narrowing]
- char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] };
- ^~~~~~~~
-downloader.cpp:686:23: note: insert an explicit cast to silence this issue
---- meshlabplugins/filter_photosynth/downloader.cpp.orig 2013-05-22 15:09:13 UTC
-+++ meshlabplugins/filter_photosynth/downloader.cpp
-@@ -683,7 +683,7 @@
- if(error)
- return -1;
- }
-- char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] };
-+ unsigned char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] };
-
- float *f = (float *)(& reversed[0]);
- return*f;
diff --git a/cad/meshlab/files/patch-meshlabplugins-filter_poisson-src_Geometry.inl b/cad/meshlab/files/patch-meshlabplugins-filter_poisson-src_Geometry.inl
deleted file mode 100644
index c4a0b7a53d41..000000000000
--- a/cad/meshlab/files/patch-meshlabplugins-filter_poisson-src_Geometry.inl
+++ /dev/null
@@ -1,11 +0,0 @@
---- meshlabplugins/filter_poisson/src/Geometry.inl.orig 2013-10-31 09:51:50.000000000 +0100
-+++ meshlabplugins/filter_poisson/src/Geometry.inl 2013-10-31 09:52:01.000000000 +0100
-@@ -26,6 +26,8 @@
- DAMAGE.
- */
-
-+#include <stdlib.h>
-+
- template<class Real>
- Real Random(void){return Real(rand())/RAND_MAX;}
-
diff --git a/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro b/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro
deleted file mode 100644
index 3d3f4b3a784c..000000000000
--- a/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- meshlabserver/meshlabserver.pro.orig 2011-10-14 18:34:48.000000000 +0200
-+++ meshlabserver/meshlabserver.pro 2013-05-08 10:36:08.000000000 +0200
-@@ -31,6 +31,8 @@
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
- linux-g++-64: LIBS += -L../distrib -lcommon
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
-+LIBS += ../common/libcommon.a -L../external/jhead-2.95 -ljhead
-+QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- # win32-msvc2005:release: LIBS += -L../common/release -lcommon
- # win32-msvc2008:release: LIBS += -L../common/release -lcommon
diff --git a/cad/meshlab/files/patch-shared.pri b/cad/meshlab/files/patch-shared.pri
deleted file mode 100644
index b6455076bb9f..000000000000
--- a/cad/meshlab/files/patch-shared.pri
+++ /dev/null
@@ -1,8 +0,0 @@
---- shared.pri.orig 2012-07-31 07:43:04.000000000 +0200
-+++ shared.pri 2013-10-31 12:18:49.000000000 +0100
-@@ -72,3 +72,5 @@
- win32-msvc2005: RCC_DIR = $(ConfigurationName)
- win32-msvc2008: RCC_DIR = $(ConfigurationName)
- win32-msvc2010: RCC_DIR = $(ConfigurationName)
-+
-+LIBS+=../../common/libcommon.a
diff --git a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h b/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
deleted file mode 100644
index 220bf6713507..000000000000
--- a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../../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>
-
-+#if defined(__FreeBSD__) && __FreeBSD_version < 1000000
-+#define static_assert(cond,msg) typedef char static_assertion_##__FILE__##__LINE__[(cond)?1:-1]
-+#endif
-+
- namespace vcg {
-
- 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
- {
diff --git a/cad/meshlab/files/patch-vcglib-wrap-ply_plystuff.h b/cad/meshlab/files/patch-vcglib-wrap-ply_plystuff.h
deleted file mode 100644
index 5a2b6278ab84..000000000000
--- a/cad/meshlab/files/patch-vcglib-wrap-ply_plystuff.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../vcglib/wrap/ply/plystuff.h.orig 2013-10-31 09:44:03.000000000 +0100
-+++ ../../vcglib/wrap/ply/plystuff.h 2013-10-31 09:50:52.000000000 +0100
-@@ -75,6 +75,7 @@
- #define pb_close _close
- #define DIR_SEP "\\"
- #else
-+#include <unistd.h>
- #define pb_mkdir(n) mkdir(n,0755)
- #define pb_access access
- #define pb_stat stat
diff --git a/cad/meshlab/pkg-descr b/cad/meshlab/pkg-descr
deleted file mode 100644
index a9b4a5ff2c9a..000000000000
--- a/cad/meshlab/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-MeshLab is an open source, portable, and extensible system for the processing
-and editing of unstructured 3D triangular meshes. The system is aimed to help
-the processing of the typical not-so-small unstructured models arising in 3D
-scanning, providing a set of tools for editing, cleaning, healing, inspecting,
-rendering and converting this kind of meshes.
-
-WWW: http://meshlab.sourceforge.net/
diff --git a/cad/meshlab/pkg-plist b/cad/meshlab/pkg-plist
deleted file mode 100644
index 154a0af00cce..000000000000
--- a/cad/meshlab/pkg-plist
+++ /dev/null
@@ -1,190 +0,0 @@
-bin/meshlab
-lib/meshlab/meshlab
-lib/meshlab/plugins/libdecorate_background.so
-lib/meshlab/plugins/libdecorate_base.so
-lib/meshlab/plugins/libdecorate_raster_proj.so
-lib/meshlab/plugins/libdecorate_shadow.so
-lib/meshlab/plugins/libedit_align.so
-lib/meshlab/plugins/libedit_arc3D.so
-lib/meshlab/plugins/libedit_hole.so
-lib/meshlab/plugins/libedit_manipulators.so
-lib/meshlab/plugins/libedit_measure.so
-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
-lib/meshlab/plugins/libfilter_ao.so
-lib/meshlab/plugins/libfilter_autoalign.so
-lib/meshlab/plugins/libfilter_bnpts.so
-lib/meshlab/plugins/libfilter_camera.so
-lib/meshlab/plugins/libfilter_clean.so
-lib/meshlab/plugins/libfilter_color_projection.so
-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
-lib/meshlab/plugins/libfilter_measure.so
-lib/meshlab/plugins/libfilter_meshing.so
-lib/meshlab/plugins/libfilter_mls.so
-lib/meshlab/plugins/libfilter_mutualinfo.so
-lib/meshlab/plugins/libfilter_photosynth.so
-lib/meshlab/plugins/libfilter_plymc.so
-lib/meshlab/plugins/libfilter_poisson.so
-lib/meshlab/plugins/libfilter_qhull.so
-lib/meshlab/plugins/libfilter_quality.so
-lib/meshlab/plugins/libfilter_sampling.so
-lib/meshlab/plugins/libfilter_sdfgpu.so
-lib/meshlab/plugins/libfilter_select.so
-lib/meshlab/plugins/libfilter_ssynth.so
-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/libio_3ds.so
-lib/meshlab/plugins/libio_base.so
-lib/meshlab/plugins/libio_bre.so
-lib/meshlab/plugins/libio_collada.so
-lib/meshlab/plugins/libio_ctm.so
-lib/meshlab/plugins/libio_expe.so
-lib/meshlab/plugins/libio_gts.so
-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
-lib/meshlab/plugins/librender_radiance_scaling.so
-lib/meshlab/plugins/librender_rfx.so
-lib/meshlab/plugins/librender_splatting.so
-lib/meshlab/plugins/libsampleedit.so
-lib/meshlab/plugins/libsamplefilter.so
-lib/meshlab/plugins/libsamplefilterdyn.so
-lib/meshlab/shaders/3Dlabs-license.txt
-lib/meshlab/shaders/Cook-Torrance.frag
-lib/meshlab/shaders/Cook-Torrance.gdp
-lib/meshlab/shaders/Cook-Torrance.vert
-lib/meshlab/shaders/Hatch.frag
-lib/meshlab/shaders/Hatch.gdp
-lib/meshlab/shaders/Hatch.vert
-lib/meshlab/shaders/LightworkDesign-license.txt
-lib/meshlab/shaders/Oren-Nayar.frag
-lib/meshlab/shaders/Oren-Nayar.gdp
-lib/meshlab/shaders/Oren-Nayar.vert
-lib/meshlab/shaders/SEM.frag
-lib/meshlab/shaders/SEM.vert
-lib/meshlab/shaders/ambient_occlusion.vert
-lib/meshlab/shaders/ambient_occlusion4.frag
-lib/meshlab/shaders/ambient_occlusion8.frag
-lib/meshlab/shaders/decorate_shadow/sm/depth.frag
-lib/meshlab/shaders/decorate_shadow/sm/depth.vert
-lib/meshlab/shaders/decorate_shadow/sm/object.frag
-lib/meshlab/shaders/decorate_shadow/sm/object.vert
-lib/meshlab/shaders/decorate_shadow/ssao/blur.frag
-lib/meshlab/shaders/decorate_shadow/ssao/blur.vert
-lib/meshlab/shaders/decorate_shadow/ssao/normalMap.frag
-lib/meshlab/shaders/decorate_shadow/ssao/normalMap.vert
-lib/meshlab/shaders/decorate_shadow/ssao/ssao.frag
-lib/meshlab/shaders/decorate_shadow/ssao/ssao.vert
-lib/meshlab/shaders/decorate_shadow/vsm/depthVSM.frag
-lib/meshlab/shaders/decorate_shadow/vsm/depthVSM.vert
-lib/meshlab/shaders/decorate_shadow/vsm/objectVSM.frag
-lib/meshlab/shaders/decorate_shadow/vsm/objectVSM.vert
-lib/meshlab/shaders/decorate_shadow/vsmb/blurVSM.frag
-lib/meshlab/shaders/decorate_shadow/vsmb/blurVSM.vert
-lib/meshlab/shaders/decorate_shadow/vsmb/depthVSM.frag
-lib/meshlab/shaders/decorate_shadow/vsmb/depthVSM.vert
-lib/meshlab/shaders/decorate_shadow/vsmb/objectVSM.frag
-lib/meshlab/shaders/decorate_shadow/vsmb/objectVSM.vert
-lib/meshlab/shaders/depthmap.frag
-lib/meshlab/shaders/depthmap.gdp
-lib/meshlab/shaders/depthmap.vert
-lib/meshlab/shaders/dimple.frag
-lib/meshlab/shaders/dimple.gdp
-lib/meshlab/shaders/dimple.vert
-lib/meshlab/shaders/electronic_microscope.gdp
-lib/meshlab/shaders/envmap.frag
-lib/meshlab/shaders/envmap.gdp
-lib/meshlab/shaders/envmap.vert
-lib/meshlab/shaders/glass.frag
-lib/meshlab/shaders/glass.gdp
-lib/meshlab/shaders/glass.vert
-lib/meshlab/shaders/gooch.frag
-lib/meshlab/shaders/gooch.gdp
-lib/meshlab/shaders/gooch.vert
-lib/meshlab/shaders/lattice.frag
-lib/meshlab/shaders/lattice.gdp
-lib/meshlab/shaders/lattice.vert
-lib/meshlab/shaders/minnaert.frag
-lib/meshlab/shaders/minnaert.gdp
-lib/meshlab/shaders/minnaert.vert
-lib/meshlab/shaders/normalmap.frag
-lib/meshlab/shaders/normalmap.gdp
-lib/meshlab/shaders/normalmap.vert
-lib/meshlab/shaders/phong.frag
-lib/meshlab/shaders/phong.gdp
-lib/meshlab/shaders/phong.vert
-lib/meshlab/shaders/polkadot3d.frag
-lib/meshlab/shaders/polkadot3d.gdp
-lib/meshlab/shaders/polkadot3d.vert
-lib/meshlab/shaders/reflexion_lines.frag
-lib/meshlab/shaders/reflexion_lines.gdp
-lib/meshlab/shaders/reflexion_lines.vert
-lib/meshlab/shaders/shadersrm/NormalMapping.rfx
-lib/meshlab/shaders/shadersrm/PhongUntextured.rfx
-lib/meshlab/shaders/shadersrm/QualityContour.rfx
-lib/meshlab/shaders/shadersrm/ZBrush.rfx
-lib/meshlab/shaders/shadersrm/cartoon.rfx
-lib/meshlab/shaders/shadersrm/old/Depth_of_Field.rfx
-lib/meshlab/shaders/shadersrm/old/GlyphBomb.rfx
-lib/meshlab/shaders/shadersrm/old/ImageBasedLighting.rfx
-lib/meshlab/shaders/shadersrm/old/Plastic.rfx
-lib/meshlab/shaders/shadersrm/old/RenderToTexture.rfx
-lib/meshlab/shaders/shadersrm/old/cubeenvmap.rfx
-lib/meshlab/shaders/shadersrm/old/fur.rfx
-lib/meshlab/shaders/shadersrm/old/hatching.rfx
-lib/meshlab/shaders/slicingplane.frag
-lib/meshlab/shaders/slicingplane.gdp
-lib/meshlab/shaders/slicingplane.vert
-lib/meshlab/shaders/splatpyramid/shader_analysis.frag
-lib/meshlab/shaders/splatpyramid/shader_analysis.vert
-lib/meshlab/shaders/splatpyramid/shader_analysis_color.frag
-lib/meshlab/shaders/splatpyramid/shader_analysis_color.vert
-lib/meshlab/shaders/splatpyramid/shader_copy.frag
-lib/meshlab/shaders/splatpyramid/shader_copy.vert
-lib/meshlab/shaders/splatpyramid/shader_copy_color.frag
-lib/meshlab/shaders/splatpyramid/shader_copy_color.vert
-lib/meshlab/shaders/splatpyramid/shader_phong.frag
-lib/meshlab/shaders/splatpyramid/shader_phong.vert
-lib/meshlab/shaders/splatpyramid/shader_phong_color.frag
-lib/meshlab/shaders/splatpyramid/shader_phong_color.vert
-lib/meshlab/shaders/splatpyramid/shader_point_projection.frag
-lib/meshlab/shaders/splatpyramid/shader_point_projection.vert
-lib/meshlab/shaders/splatpyramid/shader_point_projection_color.frag
-lib/meshlab/shaders/splatpyramid/shader_point_projection_color.vert
-lib/meshlab/shaders/splatpyramid/shader_synthesis.frag
-lib/meshlab/shaders/splatpyramid/shader_synthesis.vert
-lib/meshlab/shaders/splatpyramid/shader_synthesis_color.frag
-lib/meshlab/shaders/splatpyramid/shader_synthesis_color.vert
-lib/meshlab/shaders/stripes2.frag
-lib/meshlab/shaders/stripes2.gdp
-lib/meshlab/shaders/stripes2.vert
-lib/meshlab/shaders/toon.frag
-lib/meshlab/shaders/toon.gdp
-lib/meshlab/shaders/toon.vert
-lib/meshlab/shaders/xray.frag
-lib/meshlab/shaders/xray.gdp
-lib/meshlab/shaders/xray.vert