47 files changed, 737 insertions, 1079 deletions

diff --git a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch b/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch
deleted file mode 100644
index 84c5ced8dc6a..000000000000
--- a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Fix crash on project save (closes: #718583)
-Git-Branch: p/crash-on-save
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..cfc9473d1fa0e565d0aad4994fbb31
-
-Patch from upstream SVN commit [r6114].
-
- meshlab/src/meshlab/mainwindow_RunTime.cpp |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/meshlab/src/meshlab/mainwindow_RunTime.cpp b/meshlab/src/meshlab/mainwindow_RunTime.cpp
-index 8f5057c..3273cec 100644
---- a/meshlab/src/meshlab/mainwindow_RunTime.cpp
-+++ b/meshlab/src/meshlab/mainwindow_RunTime.cpp
-@@ -1575,8 +1575,12 @@ void MainWindow::saveProject()
- 
-   /*********WARNING!!!!!! CHANGE IT!!! ALSO IN THE OPENPROJECT FUNCTION********/
-   meshDoc()->setDocLabel(fileName);
--  mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel());
--  layerDialog->setWindowTitle(meshDoc()->docLabel());
-+  QMdiSubWindow* sub = mdiarea->currentSubWindow();
-+  if (sub != NULL)
-+  {
-+    sub->setWindowTitle(meshDoc()->docLabel());
-+    layerDialog->setWindowTitle(meshDoc()->docLabel());
-+  }
-   /****************************************************************************/
- 
- 
diff --git a/media-gfx/meshlab/files/1.3.2/02_cstddef.patch b/media-gfx/meshlab/files/1.3.2/02_cstddef.patch
deleted file mode 100644
index 903b0c77b547..000000000000
--- a/media-gfx/meshlab/files/1.3.2/02_cstddef.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Include <cstddef> on files using offsetoff (closes: #625053)
-Git-Branch: p/cstddef
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8fb2fc380c1a53d0e603d1aaeff156
-
- vcglib/wrap/io_tetramesh/import_ply.h |    1 +
- vcglib/wrap/io_trimesh/import_ply.h   |    1 +
- vcglib/wrap/ply/plystuff.h            |    1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/vcglib/wrap/io_tetramesh/import_ply.h b/vcglib/wrap/io_tetramesh/import_ply.h
-index 0da4c1f..8370e48 100644
---- a/vcglib/wrap/io_tetramesh/import_ply.h
-+++ b/vcglib/wrap/io_tetramesh/import_ply.h
-@@ -36,6 +36,7 @@ created
- #include<wrap/ply/io_mask.h>
- #include<wrap/io_tetramesh/io_ply.h>
- #include<vcg/complex/tetramesh/allocate.h>
-+#include <cstddef>
- 
- 
- 
-diff --git a/vcglib/wrap/io_trimesh/import_ply.h b/vcglib/wrap/io_trimesh/import_ply.h
-index 13eaa30..ce2de3a 100644
---- a/vcglib/wrap/io_trimesh/import_ply.h
-+++ b/vcglib/wrap/io_trimesh/import_ply.h
-@@ -29,6 +29,7 @@
- #include<wrap/io_trimesh/io_mask.h>
- #include<wrap/io_trimesh/io_ply.h>
- #include<vcg/complex/algorithms/create/platonic.h>
-+#include <cstddef>
- 
- namespace vcg {
- namespace tri {
-diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
-index 3e41e63..4761e9f 100644
---- a/vcglib/wrap/ply/plystuff.h
-+++ b/vcglib/wrap/ply/plystuff.h
-@@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching support for ply files. First working vers
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h> 
-+#include <cstddef>
- #ifdef WIN32
- #include <io.h>
- #endif
diff --git a/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch b/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch
deleted file mode 100644
index 9702758dca85..000000000000
--- a/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Disable checking for updates on startup.
-Git-Branch: p/disable-updates
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8f6cf9176644dce65ef4518b08526c
-
- meshlab/src/meshlab/mainwindow_Init.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab/src/meshlab/mainwindow_Init.cpp b/meshlab/src/meshlab/mainwindow_Init.cpp
-index de3ff1d..ce7bf81 100644
---- a/meshlab/src/meshlab/mainwindow_Init.cpp
-+++ b/meshlab/src/meshlab/mainwindow_Init.cpp
-@@ -926,7 +926,7 @@ void MainWindow::saveRecentFileList(const QString &fileName)
- 
- 	if(loadedMeshCounter-lastComunicatedValue>connectionInterval && !myLocalBuf.isOpen())
- 	{
--#if not defined(__DISABLE_AUTO_STATS__)
-+#if defined(__ENABLE_AUTO_STATS__)
- 		checkForUpdates(false);
- #endif
- 		int congratsMeshCounter = settings.value("congratsMeshCounter",50).toInt();
diff --git a/media-gfx/meshlab/files/1.3.2/05_externals.patch b/media-gfx/meshlab/files/1.3.2/05_externals.patch
deleted file mode 100644
index 0592b5709646..000000000000
--- a/media-gfx/meshlab/files/1.3.2/05_externals.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Only build necessary external sources.
-Git-Branch: p/externals
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ca572df8704909a1bbe18b1ce25d76
-
- meshlab/src/external/external.pro |    7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meshlab/src/external/external.pro b/meshlab/src/external/external.pro
-index c103d88..324eb91 100644
---- a/meshlab/src/external/external.pro
-+++ b/meshlab/src/external/external.pro
-@@ -2,11 +2,6 @@ config += debug_and_release
- 
- TEMPLATE      = subdirs
- 
--SUBDIRS       = lib3ds-1.3.0/lib3ds \
--                bzip2-1.0.5/bzip2-1.0.5.pro \
--                muparser_v132/src \
--                levmar-2.3/levmar-2.3.pro \
-+SUBDIRS       = levmar-2.3/levmar-2.3.pro \
-                 structuresynth/structuresynth.pro \
--                                OpenCTM-1.0.3/openctm.pro \
-                 jhead-2.95/jhead-2.95.pro
--#                openkinect/openkinect.pro
diff --git a/media-gfx/meshlab/files/1.3.2/06_format-security.patch b/media-gfx/meshlab/files/1.3.2/06_format-security.patch
deleted file mode 100644
index 36a767ca07e9..000000000000
--- a/media-gfx/meshlab/files/1.3.2/06_format-security.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Fix compilation errors with -Werror=format-security.
-Git-Branch: p/format-security
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..be247b855ebb49a4d826d60b7d21a0
-
- .../meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp   |    4 ++--
- meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp               |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
-index 4864214..233b657 100644
---- a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
-+++ b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
-@@ -526,7 +526,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction          *act,
-             GLenum err = glewInit();

-             if( err != GLEW_OK )

-             {

--                qWarning( (std::string("Impossible to load GLEW library.")+(char*)glewGetErrorString(err)).c_str() );

-+                qWarning("Impossible to load GLEW library: %s", glewGetErrorString(err));

-                 return false;

-             }

-             Log( "GLEW library correctly initialized." );

-@@ -536,7 +536,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction          *act,
-             std::string logs;

-             if( !initShaders(logs) )

-             {

--                qWarning( ("Error while initializing shaders.\n"+logs).c_str() );

-+                qWarning("Error while initializing shaders.\n%s", logs.c_str());

-                 return false;

-             }

-             Log( "Shaders correctly loaded." );

-diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
-index 88b6f9f..c23987c 100644
---- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
-+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
-@@ -269,7 +269,7 @@ void EditArc3DPlugin::ExportPly()
- 					QString suffix = "." + qfInfo.completeSuffix();

- 					QString path = qfInfo.absoluteFilePath().remove(suffix);

- 					path.append("Undist" + suffix);

--					qDebug(path.toLatin1());

-+					qDebug("%s", path.toStdString().c_str());

- 

- 					QImage undistImg(originalImg.width(),originalImg.height(),originalImg.format()); 

- 					undistImg.fill(qRgba(0,0,0,255));

diff --git a/media-gfx/meshlab/files/1.3.2/07_gcc47.patch b/media-gfx/meshlab/files/1.3.2/07_gcc47.patch
deleted file mode 100644
index df608d8369ed..000000000000
--- a/media-gfx/meshlab/files/1.3.2/07_gcc47.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Fix FTBFS with GCC-4.7
-Git-Branch: p/gcc47
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..07a6c6cf991f44779236b31381a7ca
-
-Closes: #667276
-
-Thanks to Matej Vela for the patch.
-
- meshlab/src/meshlabplugins/decorate_base/colorhistogram.h      |    2 +-
- .../vcg/complex/algorithms/local_optimization/tri_edge_flip.h  |    8 ++++----
- vcglib/vcg/space/index/grid_static_obj.h                       |    2 +-
- vcglib/wrap/gl/trimesh.h                                       |    2 +-
- vcglib/wrap/ply/plystuff.h                                     |    1 +
- 5 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-index 2351b2a..90c6d76 100644
---- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-@@ -40,7 +40,7 @@ public:
- 
-   //! Reset histogram data.
-   void Clear() {
--    this->::Clear();
-+    Histogram<ScalarType>::Clear();
-     CV.clear();
-   }
-   /*
-diff --git a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
-index 9054166..f40f0dc 100644
---- a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
-+++ b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
-@@ -558,13 +558,13 @@ public:
- 		// edges of the first face, except the flipped edge
- 		for(int i = 0; i < 3; i++) if(i != flipped) {
- 			PosType newpos(f1, i);
--			Insert(heap, newpos, this->GlobalMark());
-+			this->Insert(heap, newpos, this->GlobalMark());
- 		}
- 
- 		// edges of the second face, except the flipped edge
- 		for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) {
- 			PosType newpos(f2, i);
--			Insert(heap, newpos, this->GlobalMark());
-+			this->Insert(heap, newpos, this->GlobalMark());
- 		}
- 
- 		// every edge with v0, v1 v3 of f1
-@@ -583,7 +583,7 @@ public:
- 			do {
- 				VertexPointer v = pos.VFlip();
- 				if(v != v0 && v != v1 && v != v2 && v != v3)
--				Insert(heap, pos, this->GlobalMark());
-+				this->Insert(heap, pos, this->GlobalMark());
- 
- 				pos.NextE();
- 			} while(pos != startpos && !pos.IsBorder());
-@@ -603,7 +603,7 @@ public:
- 		do {
- 			VertexPointer v = pos.VFlip();
- 			if(v != v0 && v != v1 && v != v2 && v != v3)
--			Insert(heap, pos, this->GlobalMark());
-+			this->Insert(heap, pos, this->GlobalMark());
- 
- 			pos.NextE();
- 		} while(pos != startpos && !pos.IsBorder());
-diff --git a/vcglib/vcg/space/index/grid_static_obj.h b/vcglib/vcg/space/index/grid_static_obj.h
-index 0554393..26608d5 100644
---- a/vcglib/vcg/space/index/grid_static_obj.h
-+++ b/vcglib/vcg/space/index/grid_static_obj.h
-@@ -72,7 +72,7 @@ class GridStaticObj : public BasicGrid<FLT>
- 	 inline ~GridStaticObj() { if(grid) delete[] grid; }
- 	 inline void Init(const ObjType &val)
- 	 {
--		 fill(grid,grid+size(),val);
-+		 std::fill(grid,grid+size(),val);
- 	 }
- 
- 
-diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
-index 5d40404..ba72456 100644
---- a/vcglib/wrap/gl/trimesh.h
-+++ b/vcglib/wrap/gl/trimesh.h
-@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
- 			}
- 		}
- 
--	m.vert.math::Swap(newvert);
-+	m.vert.swap(newvert);
- 	m.vn=m.vert.size();
- }
- 
-diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
-index 3e41e63..4af9508 100644
---- a/vcglib/wrap/ply/plystuff.h
-+++ b/vcglib/wrap/ply/plystuff.h
-@@ -75,6 +75,7 @@ using namespace vcg;
- #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/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch b/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch
deleted file mode 100644
index 243ed1d9668a..000000000000
--- a/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use Debian lib3ds.
-Git-Branch: p/lib3ds
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..944ece3e566dbf4cc885163178d303
-
- meshlab/src/meshlabplugins/io_3ds/io_3ds.pro |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
-index cf8052a..fed064d 100644
---- a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
-+++ b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
-@@ -14,7 +14,7 @@ SOURCES       += 	meshio.cpp \
- 
- TARGET        = io_3ds
- 
--INCLUDEPATH += ../../external/lib3ds-1.3.0/
-+INCLUDEPATH += /usr/include/lib3ds
- 
- # Notes on the paths of lib3ds files.
- # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
-@@ -25,9 +25,7 @@ win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/3ds.lib
- win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
- win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
- win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
--linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
-+linux-g++:LIBS += -l3ds
- 
- # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
- 
diff --git a/media-gfx/meshlab/files/1.3.2/09_libbz2.patch b/media-gfx/meshlab/files/1.3.2/09_libbz2.patch
deleted file mode 100644
index 1b064f7f6ae9..000000000000
--- a/media-gfx/meshlab/files/1.3.2/09_libbz2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use Debian libbz2.
-Git-Branch: p/libbz2
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..a6e1a0b242a02075c0d686ec4fa8b8
-
- meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro |    8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
-index e317b99..94dc124 100644
---- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
-+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
-@@ -32,16 +32,12 @@ RESOURCES     = edit_arc3D.qrc
- win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib

- win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib

- win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a

--linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a

--linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a

--linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a

-+linux-g++:LIBS	+= -lbz2

- 

- win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5

- win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5

- win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5

--linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5

--linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5

--linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5

-+linux-g++:INCLUDEPATH	+= /usr/include

- 

- mac:LIBS   += -lbz2

- 

diff --git a/media-gfx/meshlab/files/1.3.2/10_muparser.patch b/media-gfx/meshlab/files/1.3.2/10_muparser.patch
deleted file mode 100644
index f640377c59f4..000000000000
--- a/media-gfx/meshlab/files/1.3.2/10_muparser.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use Debian muparser.
-Git-Branch: p/muparser
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..5e9cfcdae805ddac6f550b2a9f7011
-
- meshlab/src/meshlabplugins/filter_func/filter_func.pro |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/filter_func/filter_func.pro b/meshlab/src/meshlabplugins/filter_func/filter_func.pro
-index 3bcce2a..9a147b2 100644
---- a/meshlab/src/meshlabplugins/filter_func/filter_func.pro
-+++ b/meshlab/src/meshlabplugins/filter_func/filter_func.pro
-@@ -6,7 +6,7 @@ SOURCES       += filter_func.cpp
- 

- TARGET        = filter_func

- 

--INCLUDEPATH += ../../external/muparser_v132/include

-+INCLUDEPATH += /usr/include/muParser

- 

- # Note: we need static libs so when building muparser lib use 

- # ./configure --enable-shared=no

-@@ -14,7 +14,5 @@ INCLUDEPATH += ../../external/muparser_v132/include
- win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib

- win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib

- macx:LIBS            += $$MACLIBDIR/libmuparser.a

--linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a

--linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a

--linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a

-+linux-g++:LIBS       += -lmuparser

- win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a

diff --git a/media-gfx/meshlab/files/1.3.2/11_openctm.patch b/media-gfx/meshlab/files/1.3.2/11_openctm.patch
deleted file mode 100644
index 7fcbced741a3..000000000000
--- a/media-gfx/meshlab/files/1.3.2/11_openctm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use Debian OpenCTM
-Git-Branch: p/openctm
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e067d2c66c2408593f62f9c7776eed
-
- meshlab/src/meshlabplugins/io_ctm/io_ctm.pro |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
-index 1084902..31f0237 100644
---- a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
-+++ b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
-@@ -3,7 +3,7 @@ HEADERS += io_ctm.h \
-     $$VCGDIR/wrap/io_trimesh/import_ctm.h \
-     $$VCGDIR/wrap/io_trimesh/export_ctm.h
- SOURCES += io_ctm.cpp
--INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
-+INCLUDEPATH += /usr/include
- TARGET = io_ctm
- 
- win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
-@@ -15,8 +15,6 @@ win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/openctm.lib
- win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/openctm.lib
- win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/openctm.lib
- win32-g++:LIBS		+= ../../external/lib/win32-gcc/libopenctm.a
--linux-g++:LIBS		+= ../../external/lib/linux-g++/libopenctm.a
--linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libopenctm.a
--linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libopenctm.a
-+linux-g++:LIBS		+= -lopenctm
- #macx:LIBS += ../../external/lib/macx/libopenctm.a
- macx:LIBS += $$MACLIBDIR/libopenctm.a
diff --git a/media-gfx/meshlab/files/1.3.2/12_overflow.patch b/media-gfx/meshlab/files/1.3.2/12_overflow.patch
deleted file mode 100644
index 7bf594302c82..000000000000
--- a/media-gfx/meshlab/files/1.3.2/12_overflow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Fix overflowing array index in VCGlib
-Git-Branch: p/overflow
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ec0961589f0d134ab51265b8431c5f
-
-Fixes also E-array-bounds error in Debian build log scanner.
-
- vcglib/wrap/gl/addons.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vcglib/wrap/gl/addons.h b/vcglib/wrap/gl/addons.h
-index 002ff1b..bc863bf 100644
---- a/vcglib/wrap/gl/addons.h
-+++ b/vcglib/wrap/gl/addons.h
-@@ -292,7 +292,7 @@ public:
- 						P[1] = Point3f( 0,   sinf(angle), cosf(angle));
- 						assert(!glGetError());
- 						glBegin(GL_TRIANGLES);
--						Point3f n =  ( (P[0]-p0) ^ (P[2]-p0) ).Normalize();
-+						Point3f n =  ( (P[0]-p0) ^ (P[1]-p0) ).Normalize();
- 						glNormal3f(n[0],n[1],n[2]);
- 						glVertex3f(p0[0],p0[1],p0[2]);
- 						glNormal3f(N[0][0],N[0][1],N[0][2]);
diff --git a/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch b/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch
deleted file mode 100644
index f92ad6376ff1..000000000000
--- a/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Hardcode pluginsDir to the correct path in Debian
-Git-Branch: p/pluginsdir
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e1db74a038fd5fc27cc5e9f0bee8d3
-
- meshlab/src/common/pluginmanager.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab/src/common/pluginmanager.cpp b/meshlab/src/common/pluginmanager.cpp
-index d84c8fa..a039736 100644
---- a/meshlab/src/common/pluginmanager.cpp
-+++ b/meshlab/src/common/pluginmanager.cpp
-@@ -230,7 +230,7 @@ QString PluginManager::getBaseDirPath()
- 
- QString PluginManager::getPluginDirPath()
- {
--  QDir pluginsDir(getBaseDirPath());
-+  QDir pluginsDir("/usr/lib/meshlab");
-   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/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch b/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch
deleted file mode 100644
index 2f7c6e0a72d2..000000000000
--- a/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Set LC_NUMERIC to "C"
-Git-Branch: p/ply_numeric
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..2aeac7daa4785a9cf0b2480f663780
-
-Fixes reading of ascii float values in locales which use the comma as a
-float separator.
-
- meshlab/src/meshlab/main.cpp |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/meshlab/src/meshlab/main.cpp b/meshlab/src/meshlab/main.cpp
-index 7058e31..e452e87 100644
---- a/meshlab/src/meshlab/main.cpp
-+++ b/meshlab/src/meshlab/main.cpp
-@@ -25,12 +25,16 @@
- #include <QMessageBox>
- #include "mainwindow.h"
- 
-+using namespace std;
-+
- int main(int argc, char *argv[])
- {	 
-   MeshLabApplication app(argc, argv);
-   QLocale::setDefault(QLocale::C);
-   QCoreApplication::setOrganizationName("VCG");
-   QCoreApplication::setApplicationName("MeshLab");
-+
-+  std::setlocale(LC_NUMERIC, "C");
- 	
- 		if(argc>1)	
- 		{
diff --git a/media-gfx/meshlab/files/1.3.2/15_qhull.patch b/media-gfx/meshlab/files/1.3.2/15_qhull.patch
deleted file mode 100644
index 6c1f70a3f0bc..000000000000
--- a/media-gfx/meshlab/files/1.3.2/15_qhull.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro
---- a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro	2013-10-30 21:12:42.000000000 +0000
-+++ b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro	2013-10-30 21:31:35.692580129 +0000
-@@ -8,28 +8,6 @@
- SOURCES       += filter_qhull.cpp \ 
- 		qhull_tools.cpp 
- 
--HEADERS += 	../../external/qhull-2003.1/src/geom.h \
--		../../external/qhull-2003.1/src/io.h \
--		../../external/qhull-2003.1/src/mem.h \
--		../../external/qhull-2003.1/src/merge.h \
--		../../external/qhull-2003.1/src/poly.h \
--		../../external/qhull-2003.1/src/qhull.h \
--		../../external/qhull-2003.1/src/qset.h \
--		../../external/qhull-2003.1/src/stat.h \
--		../../external/qhull-2003.1/src/user.h 
--
--SOURCES +=	../../external/qhull-2003.1/src/geom.c \
--		../../external/qhull-2003.1/src/geom2.c \
--		../../external/qhull-2003.1/src/global.c \
--		../../external/qhull-2003.1/src/io.c \
--		../../external/qhull-2003.1/src/mem.c \
--		../../external/qhull-2003.1/src/merge.c \
--		../../external/qhull-2003.1/src/poly.c \
--		../../external/qhull-2003.1/src/poly2.c \
--		../../external/qhull-2003.1/src/qconvex.c \
--		../../external/qhull-2003.1/src/qhull.c \
--		../../external/qhull-2003.1/src/qset.c \
--		../../external/qhull-2003.1/src/stat.c \
--		../../external/qhull-2003.1/src/user.c 
-+LIBS += -lqhull 
- 
- TARGET        = filter_qhull
-\ В конце файла нет новой строки
-diff -Naur a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
---- a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h	2013-10-30 21:32:57.242574626 +0000
-@@ -0,0 +1,29 @@
-+ 
-+#include <common/meshmodel.h>
-+#include <math.h>
-+
-+
-+#if defined(__cplusplus)
-+extern "C"
-+{
-+#endif
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <libqhull/libqhull.h>
-+#include <libqhull/mem.h>
-+#include <libqhull/qset.h>
-+#include <libqhull/geom.h>
-+#include <libqhull/merge.h>
-+#include <libqhull/poly.h>
-+#include <libqhull/io.h>
-+#include <libqhull/stat.h>
-+#if defined(__cplusplus)
-+}
-+#endif
-+
-+facetT *compute_convex_hull(int dim, int numpoints, MeshModel &m);
-+facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);
-+bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);
-+bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);
-+int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);
-+
diff --git a/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch b/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch
deleted file mode 100644
index d8ebc206f045..000000000000
--- a/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Hardcode shadersDir to the correct path in Debian in various plugins
-Git-Branch: p/shadersdir
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..06b8aa9ce525fc0c5c221f5d675c29
-
- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp   |    2 +-
- meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp |    2 +-
- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp   |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
-index 64dbcc3..c07998c 100644
---- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
-+++ b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
-@@ -39,7 +39,7 @@ void MeshShaderRenderPlugin::initActionList() {
- 	qaNone->setCheckable(false);
- 	actionList << qaNone;*/
- 
--	QDir shadersDir = QDir(qApp->applicationDirPath());
-+	QDir shadersDir = QDir("/usr/share/meshlab");
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
- 		shadersDir.cdUp();
-diff --git a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
-index 9c45981..0256805 100644
---- a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
-+++ b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
-@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int i) {
- void ShaderDialog::browseTexturePath(int i) {
- 	QFileDialog fd(0,"Choose new texture");
- 
--	QDir shadersDir = QDir(qApp->applicationDirPath());
-+	QDir shadersDir = QDir("/usr/share/meshlab");
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
- 		shadersDir.cdUp();
-diff --git a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
-index e327cea..eb67fd2 100755
---- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
-+++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
-@@ -55,7 +55,7 @@ QList<QAction*> RenderRFX::actions()
- 
- void RenderRFX::initActionList()
- {
--	QDir shadersDir = PluginManager::getBaseDirPath();
-+	QDir shadersDir = QDir("/usr/share/meshlab");
- 
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug"   ||
diff --git a/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch b/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch
deleted file mode 100644
index 6a6b84c8d682..000000000000
--- a/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Include glu.h where needed in included structure-synth code.
-Git-Branch: p/structuresynth
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..45495fd45078a06d7c5f7405ba636c
-
-Also link structuresynth code with libGLU.
-
-This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same
-issue in the real structure-synth Debian package.
-
- .../structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h        |    1 +
- .../src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h |    1 +
- meshlab/src/external/structuresynth/structuresynth.pro                |    1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
-index 8905cbe..e13b011 100644
---- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
-+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
-@@ -5,6 +5,7 @@
- #include <QMainWindow>

- #include <QPoint>

- #include <QList>

-+#include <GL/glu.h>

- 

- #include "SyntopiaCore/Math/Vector3.h"

- #include "SyntopiaCore/Math/Matrix4.h"

-diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
-index 0b0dc40..ed95346 100644
---- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
-+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
-@@ -2,6 +2,7 @@
- 

- #include "SyntopiaCore/Math/Vector3.h"

- #include "Object3D.h"

-+#include <GL/glu.h>

- 

- namespace SyntopiaCore {

- 	namespace GLEngine {	

-diff --git a/meshlab/src/external/structuresynth/structuresynth.pro b/meshlab/src/external/structuresynth/structuresynth.pro
-index 8579b03..362ce5d 100644
---- a/meshlab/src/external/structuresynth/structuresynth.pro
-+++ b/meshlab/src/external/structuresynth/structuresynth.pro
-@@ -120,3 +120,4 @@ win32-msvc2008:DESTDIR       = ../lib/win32-msvc2008
- linux-g++-32:DESTDIR = ../lib/linux-g++-32

- linux-g++-64:DESTDIR = ../lib/linux-g++-64

- linux-g++:DESTDIR = ../lib/linux-g++

-+unix:LIBS+=-lGLU

diff --git a/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch b/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch
deleted file mode 100644
index 894f05cf2423..000000000000
--- a/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use Debian GLEW.
-Git-Branch: p/glew
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..7023f74389baab6b9032c08ae2e2b2
-
- meshlab/src/common/common.pro                            |    5 ++---
- meshlab/src/meshlab/meshlab.pro                          |    4 +---
- meshlab/src/meshlabplugins/filter_plymc/plymc.pro        |    2 +-
- meshlab/src/meshlabserver/meshlabserver.pro              |    6 ++----
- meshlab/src/shared.pri                                   |    7 ++++---
- vcglib/apps/sample/trimesh_QT/trimesh_qt.pro             |    5 +++--
- vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro |    4 ++--
- 7 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/meshlab/src/common/common.pro b/meshlab/src/common/common.pro
-index eec1863..58bda06 100644
---- a/meshlab/src/common/common.pro
-+++ b/meshlab/src/common/common.pro
-@@ -1,9 +1,9 @@
- include (../general.pri)
- EXIF_DIR = ../external/jhead-2.95
-+GLEWDIR = /usr
-+LIBS += -lGLEW
- 
- 
--GLEWCODE = $$GLEWDIR/src/glew.c
--
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
- win32-msvc2010:DESTDIR = ../distrib
-@@ -106,7 +106,6 @@ SOURCES += filterparameter.cpp \
- 	mlapplication.cpp \
- 	scriptsyntax.cpp \
- 	searcher.cpp \
--    $$GLEWCODE \
-     meshlabdocumentxml.cpp \
-     meshlabdocumentbundler.cpp
- 
-diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro
-index 4a7d0fd..ecd9ed6 100644
---- a/meshlab/src/meshlab/meshlab.pro
-+++ b/meshlab/src/meshlab/meshlab.pro
-@@ -129,11 +129,9 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -L../distrib -lcommon
- #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
- #}
- 
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- 
- # uncomment in your local copy only in emergency cases.
-diff --git a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
-index b609419..a89e8c6 100755
---- a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
-+++ b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
-@@ -1,7 +1,7 @@
- TARGET = plymc
- DEPENDPATH += .
- INCLUDEPATH += ../../../../vcglib \
--    ../../code/lib/glew/include
-+    /usr/include
- CONFIG += console \
-     stl \
-     debug_and_release
-diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro
-index cca5560..9b070c7 100644
---- a/meshlab/src/meshlabserver/meshlabserver.pro
-+++ b/meshlab/src/meshlabserver/meshlabserver.pro
-@@ -1,4 +1,4 @@
--GLEWDIR = ../external/glew-1.5.1
-+GLEWDIR = /usr
- 
- HEADERS        = 
- 
-@@ -25,11 +25,9 @@ win32-msvc2005:  LIBS += -L../distrib -lcommon
- win32-msvc2008:  LIBS += -L../distrib -lcommon
- win32-msvc2010:  LIBS += -L../distrib -lcommon
- win32-g++:  LIBS += -L../distrib -lcommon
--linux-g++:  LIBS += -L../distrib -lcommon
-+linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:  LIBS += -L../distrib -lcommon
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:  LIBS += -L../distrib -lcommon
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
-diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri
-index 93ed32f..0ba3e67 100644
---- a/meshlab/src/shared.pri
-+++ b/meshlab/src/shared.pri
-@@ -17,9 +17,10 @@ win32-msvc2005:  LIBS += ../../distrib/common.lib
- win32-msvc2008:  LIBS += ../../distrib/common.lib
- win32-msvc2010:  LIBS += ../../distrib/common.lib
- win32-g++:LIBS += -L../../distrib -lcommon
--linux-g++:LIBS += -L../../distrib -lcommon
--linux-g++-32:LIBS += -L../../distrib -lcommon
--linux-g++-64:LIBS += -L../../distrib -lcommon
-+linux-g++:LIBS += -L../../distrib -lcommon -lGLEW
-+#linux-g++-32:LIBS += -L../../distrib -lcommon
-+#linux-g++-64:LIBS += -L../../distrib -lcommon
-+
- 
- #CONFIG(debug, debug|release) {
- #	win32-msvc2005:  LIBS += ../../common/debug/common.lib
-diff --git a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
-index 8a3c7fc..986116e 100644
---- a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
-+++ b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
-@@ -26,8 +26,9 @@ SOURCES += ../../../wrap/gui/trackmode.cpp
- 
- # Compile glew
- DEFINES += GLEW_STATIC
--INCLUDEPATH += ../../../../code/lib/glew/include
--SOURCES += ../../../../code/lib/glew/src/glew.c
-+INCLUDEPATH += /usr/include
-+#SOURCES += ../../../../code/lib/glew/src/glew.c
-+LIBS += -lGLEW
- 
- # Awful problem with windows..
- win32{
-diff --git a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
-index e8ae178..4a69fef 100644
---- a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
-+++ b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
-@@ -1,14 +1,14 @@
--INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include
-+INCLUDEPATH += . ../../.. ../../../../code/lib /usr/include
- HEADERS       = glwidget.h \
-                 window.h \
- 		mesh_type.h	
- SOURCES       = glwidget.cpp \
-                 main.cpp \
-                 window.cpp\
--		 ../../../../code/lib/glew/src/glew.c \
- 		../../../wrap/ply/plylib.cpp\
- 		../../../wrap/gui/trackmode.cpp\
- 		../../../wrap/gui/trackball.cpp
-+LIBS += -lGLEW
- QT           += opengl
- 
- # install
diff --git a/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch b/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch
deleted file mode 100644
index c3dfc4de35be..000000000000
--- a/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-reverted:
---- b/meshlab/src/meshlab/meshlab.pro
-+++ a/meshlab/src/meshlab/meshlab.pro
-@@ -129,9 +129,11 @@
- #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
- #}
- 
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
- linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
-+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- 
- # uncomment in your local copy only in emergency cases.
-reverted:
---- b/meshlab/src/meshlabserver/meshlabserver.pro
-+++ a/meshlab/src/meshlabserver/meshlabserver.pro
-@@ -25,9 +25,11 @@
- win32-msvc2008:  LIBS += -L../distrib -lcommon
- win32-msvc2010:  LIBS += -L../distrib -lcommon
- win32-g++:  LIBS += -L../distrib -lcommon
-+linux-g++:  LIBS += -L../distrib -lcommon
--linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++-32:  LIBS += -L../distrib -lcommon
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
-+linux-g++-64:  LIBS += -L../distrib -lcommon
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
diff --git a/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch b/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch
deleted file mode 100644
index e53d8bf1e798..000000000000
--- a/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Teemu Ikonen <tpikonen@gmail.com>
-Subject: Use /usr/lib/meshlab as RPATH in binaries.
-Git-Branch: p/rpath
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..0ecffa4d55bfff6f3b98a478d0cd82
-
- meshlab/src/meshlab/meshlab.pro             |    4 +---
- meshlab/src/meshlabserver/meshlabserver.pro |    4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro
-index 4a7d0fd..f67ba07 100644
---- a/meshlab/src/meshlab/meshlab.pro
-+++ b/meshlab/src/meshlab/meshlab.pro
-@@ -130,11 +130,9 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -L../distrib -lcommon
- #}
- 
- linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
--linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
- linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
--linux-g++-32:QMAKE_RPATHDIR += ../distrib
- linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
--linux-g++-64:QMAKE_RPATHDIR += ../distrib
- 
- # uncomment in your local copy only in emergency cases.
- # We should never be too permissive
-diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro
-index cca5560..6a19b81 100644
---- a/meshlab/src/meshlabserver/meshlabserver.pro
-+++ b/meshlab/src/meshlabserver/meshlabserver.pro
-@@ -26,11 +26,9 @@ win32-msvc2008:  LIBS += -L../distrib -lcommon
- win32-msvc2010:  LIBS += -L../distrib -lcommon
- win32-g++:  LIBS += -L../distrib -lcommon
- linux-g++:  LIBS += -L../distrib -lcommon
--linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
- linux-g++-32:  LIBS += -L../distrib -lcommon
--linux-g++-32:QMAKE_RPATHDIR += ../distrib
- linux-g++-64:  LIBS += -L../distrib -lcommon
--linux-g++-64: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/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch b/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch
deleted file mode 100644
index 35c1cac41412..000000000000
--- a/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Resolve patch overlaps.
---- a/meshlab/src/meshlab/meshlab.pro
-+++ b/meshlab/src/meshlab/meshlab.pro
-@@ -129,10 +129,8 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -L../distrib -lcommon
- #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
- #}
- 
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
- linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
- 
- # uncomment in your local copy only in emergency cases.
- # We should never be too permissive
---- a/meshlab/src/meshlabserver/meshlabserver.pro
-+++ b/meshlab/src/meshlabserver/meshlabserver.pro
-@@ -25,10 +25,8 @@ win32-msvc2005:  LIBS += -L../distrib -lcommon
- win32-msvc2008:  LIBS += -L../distrib -lcommon
- win32-msvc2010:  LIBS += -L../distrib -lcommon
- win32-g++:  LIBS += -L../distrib -lcommon
--linux-g++:  LIBS += -L../distrib -lcommon
-+linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
--linux-g++-32:  LIBS += -L../distrib -lcommon
--linux-g++-64:  LIBS += -L../distrib -lcommon
- #CONFIG (release,debug | release) {
- #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
- #	win32-msvc2008:release:  LIBS += -L../common/release -lcommon
diff --git a/media-gfx/meshlab/files/1.3.2/22_aliasing.patch b/media-gfx/meshlab/files/1.3.2/22_aliasing.patch
deleted file mode 100644
index 7f3b8447c2d0..000000000000
--- a/media-gfx/meshlab/files/1.3.2/22_aliasing.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp
---- meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp	2014-08-11 18:01:55.329182160 +0200
-+++ meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp	2014-08-11 15:11:20.000000000 +0200
-@@ -149,9 +149,11 @@
-     fread(&numFaces,sizeof(int),1,fp);
-   }
-   // advance pointer ??
--  char s[4];
-+  
-+  char s[5];
-   fread(s,sizeof(char),4,fp);
--	printf("extara is %s (%d)\n", s, *(int*)(&s[0]));
-+  s[4]=0;
-+  printf("extara is %s (%d)\n", s, ((unsigned)s[0])|(((unsigned)s[1])<<8)|(((unsigned)s[2])<<16)|(((unsigned)s[3])<<24));
-   return 0;
- }
- 
-@@ -284,7 +286,7 @@
- 			bool floatFlag=false;
- 			
- 			int ret=fread(texCode,sizeof(char),4,fp);
--			qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)(&texCode[0]),  *(float*)(&texCode[0]));
-+			//qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)((void*)(&texCode[0])),  *(float*)((void*)(&texCode[0])));
- 
- 			if(feof(fp)){
- 					qDebug("Premature end of file");
-diff -urN meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h
---- meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h	2014-08-11 18:01:55.366182161 +0200
-+++ meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h	2014-08-11 14:36:38.000000000 +0200
-@@ -233,12 +233,12 @@
-   // DuplicateFace=false a model with looks ok if you enable doublesided lighting and disable backfaceculling
- 
-   bool DuplicateFaceParam;
--
-   // This class keeps the references to the three cells where a face has its vertexes.
- 	class SimpleTri
-   {
-   public:
-     CellType *v[3];
-+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-     int ii(int i) const {return *((int *)(&(v[i])));}
-     bool operator < ( const SimpleTri &p) const {
-       return	(v[2]!=p.v[2])?(v[2]<p.v[2]):
diff --git a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
deleted file mode 100644
index 6329f23e7949..000000000000
--- a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h
-index 3e41e63..4af9508 100644
---- a/vcglib/wrap/ply/plystuff.h
-+++ b/vcglib/wrap/ply/plystuff.h
-@@ -75,6 +75,7 @@ using namespace vcg;
- #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/media-gfx/meshlab/files/1.3.3/lapack.patch b/media-gfx/meshlab/files/1.3.3/lapack.patch
deleted file mode 100644
index e2742eb99991..000000000000
--- a/media-gfx/meshlab/files/1.3.3/lapack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h
---- a/meshlab/src/external/levmar-2.3/lm.h	2010-04-28 17:30:47.000000000 +1000
-+++ b/meshlab/src/external/levmar-2.3/lm.h	2010-05-13 20:17:35.488505907 +1000
-@@ -27,7 +27,6 @@
- 
- /* specify whether to use LAPACK or not. The first option is strongly recommended */
-  #define HAVE_LAPACK  /* use LAPACK */
-- #undef HAVE_LAPACK   /* uncomment this to force not using LAPACK */
- 
- /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to
-  * retain working memory between calls. Such a choice, however, renders these routines
diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch
deleted file mode 100644
index 33eb1cbf7038..000000000000
--- a/media-gfx/meshlab/files/1.3.3/meshrender.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp	2014-02-07 10:38:28.000000000 +0100
-+++ b/meshlab/src/meshlabplugins/render_gdb/meshrender.cpp	2015-11-15 22:17:39.848179962 +0100
-@@ -36,8 +36,11 @@
- 	/*QAction * qaNone = new QAction("None", this); 
- 	qaNone->setCheckable(false);
- 	actionList << qaNone;*/
--
-+#if defined(Q_OS_LINUX)
-+	QDir shadersDir = QDir("/usr/share/meshlab");
-+#else
- 	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
- 		shadersDir.cdUp();
diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch b/media-gfx/meshlab/files/1.3.3/mpir.patch
deleted file mode 100644
index fae203e18a18..000000000000
--- a/media-gfx/meshlab/files/1.3.3/mpir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
---- a/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro	2014-04-02 02:59:31.000000000 +1100
-+++ b/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro	2014-06-01 21:10:24.521095356 +1000
-@@ -18,6 +18,4 @@
- win32-msvc2008:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
- win32-msvc2010:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
- win32-msvc2012:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
--linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
--linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a
- 
diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
deleted file mode 100644
index 853015da4d06..000000000000
--- a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meshlab/src/common/pluginmanager.cpp	2014-04-01 17:07:40.000000000 +0200
-+++ b/meshlab/src/common/pluginmanager.cpp	2015-11-15 20:58:53.708227793 +0100
-@@ -178,7 +178,11 @@
- 
- QString PluginManager::getBaseDirPath()
- {
-+#if defined(Q_OS_LINUX)
-+  QDir baseDir("/usr/lib/meshlab");
-+#else
-   QDir baseDir(qApp->applicationDirPath());
-+#endif
- 
- #if defined(Q_OS_WIN)
-   // Windows:
diff --git a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
deleted file mode 100644
index bb1113a5c617..000000000000
--- a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- a/meshlab/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
-+++ b/meshlab/src/meshlab/meshlab.pro	2012-01-07 11:57:18.055586086 +1100
-@@ -85,6 +85,7 @@
- QT += xmlpatterns
- QT += network
- QT += script
-+unix:LIBS += -lGLU
- 
- 
- # the following line is needed to avoid mismatch between
diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch
deleted file mode 100644
index 0d7d03d3f09e..000000000000
--- a/media-gfx/meshlab/files/1.3.3/rfx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2014-02-07 10:38:29.000000000 +0100
-+++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2015-11-16 00:07:34.868113218 +0100
-@@ -55,7 +55,11 @@
- 
- void RenderRFX::initActionList()
- {
-+#if defined(Q_OS_LINUX)
-+	QDir shadersDir("/usr/share/meshlab");
-+#else
- 	QDir shadersDir = PluginManager::getBaseDirPath();
-+#endif
- 
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug"   ||
diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
deleted file mode 100644
index 1fbf686980be..000000000000
--- a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2013-05-22 17:08:53.000000000 +0200
-+++ b/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2015-11-15 23:18:04.678143277 +0100
-@@ -63,7 +63,12 @@
- 
- void RmMeshShaderRenderPlugin::initActionList() {
- 
-+#if defined(Q_OS_LINUX)
-+	QDir shadersDir = QDir("/usr/share/meshlab/shaders");
-+#else
- 	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
-+
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" ||
- 	    shadersDir.dirName() == "release" ||
diff --git a/media-gfx/meshlab/files/1.3.3/rpath.patch b/media-gfx/meshlab/files/1.3.3/rpath.patch
deleted file mode 100644
index 473d2a8fa480..000000000000
--- a/media-gfx/meshlab/files/1.3.3/rpath.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- a/meshlab/src/meshlab/meshlab.pro	2012-05-31 00:32:44.000000000 +1000
-+++ b/meshlab/src/meshlab/meshlab.pro	2012-08-06 21:26:01.405784190 +1000
-@@ -130,11 +130,11 @@
- #}
- 
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
--linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
--linux-g++-32:QMAKE_RPATHDIR += ../distrib
-+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
--linux-g++-64:QMAKE_RPATHDIR += ../distrib
-+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
- 
- # uncomment in your local copy only in emergency cases.
- # We should never be too permissive
-diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro
---- a/meshlab/src/meshlabserver/meshlabserver.pro	2011-10-15 03:34:48.000000000 +1100
-+++ b/meshlab/src/meshlabserver/meshlabserver.pro	2012-08-06 21:26:34.609557938 +1000
-@@ -26,11 +26,11 @@
- win32-msvc2010:  LIBS += -L../distrib -lcommon
- win32-g++:  LIBS += -L../distrib -lcommon
- linux-g++:  LIBS += -L../distrib -lcommon
--linux-g++:QMAKE_RPATHDIR += ../distrib
-+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
- linux-g++-32:  LIBS += -L../distrib -lcommon
--linux-g++-32:QMAKE_RPATHDIR += ../distrib
-+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
- linux-g++-64:  LIBS += -L../distrib -lcommon
--linux-g++-64:QMAKE_RPATHDIR += ../distrib
-+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
- #CONFIG (release,debug | release) {
- #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
- #	win32-msvc2008:release:  LIBS += -L../common/release -lcommon
diff --git a/media-gfx/meshlab/files/1.3.3/structuresynth.patch b/media-gfx/meshlab/files/1.3.3/structuresynth.patch
deleted file mode 100644
index e5d6d2baea9c..000000000000
--- a/media-gfx/meshlab/files/1.3.3/structuresynth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp	2014-02-07 12:38:23.000000000 +0300
-+++ b/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp	2017-08-10 21:00:02.819783756 +0300
-@@ -122,7 +122,7 @@
- 						currentT = p;
- 
- 						// We do not intersect grid.
--						if (!found) return false;
-+						if (!found) return NULL;
- 				}
- 
- 				stepX = (dir.x() > 0) ? 1 : -1;
diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
new file mode 100644
index 000000000000..6e2e31af9bd2
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
@@ -0,0 +1,22 @@
+From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <mohammadpour.sobhan@gmail.com>
+Date: Mon, 20 Nov 2017 14:40:02 +0330
+Subject: [PATCH] compile server
+
+---
+ meshlab_mini.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_mini.pro b/meshlab_mini.pro
+index abe0259..b18771e 100644
+--- a/meshlab_mini.pro
++++ b/meshlab_mini.pro
+@@ -34,4 +34,4 @@ SUBDIRS       = common \
+ #                meshlabplugins/filter_unsharp \
+ #                meshlabplugins/io_collada \
+ #                meshlabplugins/io_x3d \
+-#                meshlabserver
++                meshlabserver
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
new file mode 100644
index 000000000000..d8c5bb1f5aaa
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
@@ -0,0 +1,72 @@
+From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 00:57:42 +0330
+Subject: [PATCH] depend-on-system-glew
+
+---
+ common/common.pro   | 7 +------
+ meshlab/meshlab.pro | 2 --
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/common/common.pro b/common/common.pro
+index 51cdcb5..85849dc 100644
+--- a/common/common.pro
++++ b/common/common.pro
+@@ -1,7 +1,6 @@
+ include (../general.pri)
+ EXIF_DIR = ../external/jhead-2.95
+ 
+-GLEWCODE = $$GLEWDIR/src/glew.c
+ 
+ win32-msvc2005:DESTDIR = ../distrib
+ win32-msvc2008:DESTDIR = ../distrib
+@@ -53,9 +52,7 @@ ln -s ../../../meshlab/src/distrib/shaders ../distrib/shaders ;\
+ echo "linked shader dir"; \
+ fi;\
+ "
+-INCLUDEPATH *= ../.. \
+-    $$VCGDIR \
+-    $$GLEWDIR/include
++
+ TEMPLATE = lib
+ linux-g++:CONFIG += dll
+ linux-g++:DESTDIR = ../distrib
+@@ -80,7 +77,6 @@ QT += script
+ TARGET = common
+ DEPENDPATH += .
+ INCLUDEPATH += . $$EXIF_DIR
+-DEFINES += GLEW_STATIC
+ win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
+@@ -117,7 +113,6 @@ SOURCES += 	filterparameter.cpp \
+ 			mlapplication.cpp \
+ 			scriptsyntax.cpp \
+ 			searcher.cpp \
+-			$$GLEWCODE \
+ 			meshlabdocumentxml.cpp \
+ 			meshlabdocumentbundler.cpp \
+ 			ml_shared_data_context.cpp 
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 0e50581..37d44ba 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -9,7 +9,6 @@ INCLUDEPATH *= . \
+ 	.. \
+ 	../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include \
+ 	$$EXIF_DIR
+ DEPENDPATH += $$VCGDIR \
+     $$VCGDIR/vcg \
+@@ -64,7 +63,6 @@ SOURCES = main.cpp \
+ 	$$VCGDIR/wrap/gui/trackball.cpp \
+     $$VCGDIR/wrap/gui/trackmode.cpp \
+ 	$$VCGDIR/wrap/gui/coordinateframe.cpp \
+-	#$$GLEWDIR/src/glew.c \
+     glarea_setting.cpp \
+ 	filterthread.cpp 
+ 
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
new file mode 100644
index 000000000000..ed58bc0cb97e
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
@@ -0,0 +1,25 @@
+From 59588b3198e0ca6cd97265a65ea87b40897d3bd9 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 00:41:15 +0330
+Subject: [PATCH] disable-edit-quality
+
+---
+ meshlab_full.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_full.pro b/meshlab_full.pro
+index 143e226..9939225 100644
+--- a/meshlab_full.pro
++++ b/meshlab_full.pro
+@@ -69,7 +69,7 @@ SUBDIRS       = common \
+                 meshlabplugins/edit_pickpoints \
+                 meshlabplugins/edit_point\
+                 plugins_experimental/edit_referencing \
+-                meshlabplugins/edit_quality \
++#                meshlabplugins/edit_quality \
+                 meshlabplugins/edit_select \
+ # Sample Plugins
+                 sampleplugins/sampleedit \
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
new file mode 100644
index 000000000000..407d7775f9f1
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
@@ -0,0 +1,25 @@
+From 90862a887b923984e17343447c30251f2d6fc541 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 12:37:14 +0330
+Subject: [PATCH] disable filter layer
+
+---
+ meshlab_full.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_full.pro b/meshlab_full.pro
+index 9939225..1691d31 100644
+--- a/meshlab_full.pro
++++ b/meshlab_full.pro
+@@ -34,7 +34,7 @@ SUBDIRS       = common \
+                 sampleplugins/filter_geodesic \
+                 meshlabplugins/filter_img_patch_param \
+                 meshlabplugins/filter_isoparametrization \
+-                meshlabplugins/filter_layer \
++#                meshlabplugins/filter_layer \
+                 meshlabplugins/filter_measure \
+                 meshlabplugins/filter_meshing \
+                 plugins_experimental/filter_mutualglobal \
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
new file mode 100644
index 000000000000..c5f84998a627
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
@@ -0,0 +1,25 @@
+From 22f946dece8e56683a197204ac05292045a3dda1 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Wed, 22 Nov 2017 23:20:57 +0330
+Subject: [PATCH] disable-filter-ssynth
+
+---
+ meshlab_full.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_full.pro b/meshlab_full.pro
+index 4a256a1..143e226 100644
+--- a/meshlab_full.pro
++++ b/meshlab_full.pro
+@@ -49,7 +49,7 @@ SUBDIRS       = common \
+                 meshlabplugins/filter_sdfgpu \
+                 meshlabplugins/filter_select \
+                 plugins_experimental/filter_sketchfab \
+-                meshlabplugins/filter_ssynth \
++#                meshlabplugins/filter_ssynth \
+                 meshlabplugins/filter_texture \
+                 meshlabplugins/filter_trioptimize \
+                 meshlabplugins/filter_unsharp \
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
new file mode 100644
index 000000000000..320912c40ed3
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
@@ -0,0 +1,25 @@
+From 0358aad037efc55701622884bf0ed1249a08387f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 02:23:03 +0330
+Subject: [PATCH] remove not sane plugins
+
+---
+ meshlab_full.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_full.pro b/meshlab_full.pro
+index 9939225..b8a6bce 100644
+--- a/meshlab_full.pro
++++ b/meshlab_full.pro
+@@ -27,7 +27,7 @@ SUBDIRS       = common \
+                 meshlabplugins/filter_color_projection \
+                 meshlabplugins/filter_create \
+ 				sampleplugins/filter_createiso \
+-                meshlabplugins/filter_csg \
++#                meshlabplugins/filter_csg \
+                 meshlabplugins/filter_dirt \
+                 meshlabplugins/filter_fractal \
+                 meshlabplugins/filter_func \
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
new file mode 100644
index 000000000000..a1a4f3f860ab
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
@@ -0,0 +1,164 @@
+From 4780d519177021364427b44567fd9a67879435aa Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Fri, 24 Nov 2017 18:20:11 +0330
+Subject: [PATCH] set shader and texture paths
+
+---
+ meshlabplugins/render_gdp/meshrender.cpp                  |  6 +++++-
+ meshlabplugins/render_gdp/shaderDialog.cpp                |  6 +++++-
+ plugins_experimental/render_splatpyramid/dialog.cpp       |  7 +++++--
+ plugins_experimental/render_splatpyramid/splat_pyramid.cc |  6 +++++-
+ plugins_unsupported/render_rm/glstateholder.cpp           | 12 ++++++++++--
+ plugins_unsupported/render_rm/rmmeshrender.cpp            |  6 +++++-
+ plugins_unsupported/render_rm/rmshaderdialog.cpp          | 10 +++++++++-
+ 7 files changed, 44 insertions(+), 9 deletions(-)
+
+diff --git a/meshlabplugins/render_gdp/meshrender.cpp b/meshlabplugins/render_gdp/meshrender.cpp
+index 5841ce6..28e66b3 100644
+--- a/meshlabplugins/render_gdp/meshrender.cpp
++++ b/meshlabplugins/render_gdp/meshrender.cpp
+@@ -38,7 +38,11 @@ void MeshShaderRenderPlugin::initActionList() {
+ 	qaNone->setCheckable(false);
+ 	actionList << qaNone;*/
+ 
+-	QDir shadersDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir shadersDir("/usr/share/meshlab");
++#else
++			QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins")
+ 		shadersDir.cdUp();
+diff --git a/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlabplugins/render_gdp/shaderDialog.cpp
+index 1315757..168c0f8 100644
+--- a/meshlabplugins/render_gdp/shaderDialog.cpp
++++ b/meshlabplugins/render_gdp/shaderDialog.cpp
+@@ -317,7 +317,11 @@ void ShaderDialog::changeTexturePath(int i) {
+ void ShaderDialog::browseTexturePath(int i) {
+ 	QFileDialog fd(0,"Choose new texture");
+ 
+-	QDir shadersDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir shadersDir("/usr/share/meshlab");
++#else
++			QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
+ 		shadersDir.cdUp();
+diff --git a/plugins_experimental/render_splatpyramid/dialog.cpp b/plugins_experimental/render_splatpyramid/dialog.cpp
+index 589ba48..11cf3fe 100644
+--- a/plugins_experimental/render_splatpyramid/dialog.cpp
++++ b/plugins_experimental/render_splatpyramid/dialog.cpp
+@@ -122,8 +122,11 @@ void Dialog::changeTexturePath(int i) {
+ 
+ void Dialog::browseTexturePath(int i) {
+   QFileDialog fd(0,"Choose new texture");
+-
+-  QDir shadersDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir shadersDir("/usr/share/meshlab");
++#else
++			QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+   if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
+ 	shadersDir.cdUp();
+diff --git a/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
+index a4915d1..75074a6 100644
+--- a/plugins_experimental/render_splatpyramid/splat_pyramid.cc
++++ b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
+@@ -85,7 +85,11 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &,
+ 		objects[i].setRendererType( render_mode );
+ 
+   	/// Sets the path to the meshlab's shaders directory
+-  	QDir shadersDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir shadersDir("/usr/share/meshlab");
++#else
++			QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
+ 		shadersDir.cdUp();
+diff --git a/plugins_unsupported/render_rm/glstateholder.cpp b/plugins_unsupported/render_rm/glstateholder.cpp
+index fa7cdd9..544c6b3 100644
+--- a/plugins_unsupported/render_rm/glstateholder.cpp
++++ b/plugins_unsupported/render_rm/glstateholder.cpp
+@@ -75,8 +75,12 @@ UniformValue::UniformValue(UniformVar &v)
+ 
+ 	// if it's a texture, try to load it from the standard path
+ 	if (!textureFilename.isEmpty())	{
++#if defined(Q_OS_LINUX)
++    QDir textureDir("/usr/share/meshlab");
++#else
+ 		QDir textureDir = QDir(qApp->applicationDirPath());
+-
++#endif
++	
+ #if defined(Q_OS_WIN)
+ 		if (textureDir.dirName() == "debug" ||
+ 		    textureDir.dirName() == "release" ||
+@@ -158,7 +162,11 @@ void UniformValue::updateUniformVariableValuesFromDialog(int rowIdx, int colIdx,
+ 			// * choose the filename with a dialog (55 by convention)
+ 			if (rowIdx == 5 && colIdx == 5) {
+ 				QFileDialog fd(0, "Choose new texture");
+-				QDir texturesDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir textureDir("/usr/share/meshlab");
++#else
++			QDir textureDir = QDir(qApp->applicationDirPath());
++#endif
+ 
+ #if defined(Q_OS_WIN)
+ 				if (texturesDir.dirName() == "debug" ||
+diff --git a/plugins_unsupported/render_rm/rmmeshrender.cpp b/plugins_unsupported/render_rm/rmmeshrender.cpp
+index 9e516d2..f367842 100644
+--- a/plugins_unsupported/render_rm/rmmeshrender.cpp
++++ b/plugins_unsupported/render_rm/rmmeshrender.cpp
+@@ -63,7 +63,11 @@ QList<QAction*> RmMeshShaderRenderPlugin::actions()
+ 
+ void RmMeshShaderRenderPlugin::initActionList() {
+ 
+-	QDir shadersDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir shadersDir("/usr/share/meshlab/shaders");
++#else
++			QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" ||
+ 	    shadersDir.dirName() == "release" ||
+diff --git a/plugins_unsupported/render_rm/rmshaderdialog.cpp b/plugins_unsupported/render_rm/rmshaderdialog.cpp
+index 1f6c02b..6c8af80 100644
+--- a/plugins_unsupported/render_rm/rmshaderdialog.cpp
++++ b/plugins_unsupported/render_rm/rmshaderdialog.cpp
+@@ -332,7 +332,11 @@ void RmShaderDialog::fillTabsWithPass(int index)
+ 
+ 			QFileInfo finfo(v.textureFilename);
+ 
++			#if defined(Q_OS_LINUX)
++	    QDir textureDir("/usr/share/meshlab");
++			#else
+ 			QDir textureDir = QDir(qApp->applicationDirPath());
++			#endif
+ #if defined(Q_OS_WIN)
+ 			if (textureDir.dirName() == "debug" || textureDir.dirName() == "release" || textureDir.dirName() == "plugins"  ) textureDir.cdUp();
+ #elif defined(Q_OS_MAC)
+@@ -444,7 +448,11 @@ void RmShaderDialog::valuesChanged(const QString & varNameAndIndex )
+ 				// choose the filename with a dialog
+ 				QFileDialog fd(0,"Choose new texture");
+ 
+-				QDir texturesDir = QDir(qApp->applicationDirPath());
++#if defined(Q_OS_LINUX)
++	    QDir textureDir("/usr/share/meshlab");
++#else
++			QDir textureDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 				if (texturesDir.dirName() == "debug" || texturesDir.dirName() == "release") texturesDir.cdUp();
+ #elif defined(Q_OS_MAC)
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
new file mode 100644
index 000000000000..9f6d7487817f
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
@@ -0,0 +1,29 @@
+From 6310a419f2a0e0f11f59a60fee850a1b64c2f41e Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Fri, 24 Nov 2017 17:47:43 +0330
+Subject: [PATCH] update 1.3.3/pluginmanager.patch
+
+---
+ common/pluginmanager.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
+index 5354055..551e73f 100644
+--- a/common/pluginmanager.cpp
++++ b/common/pluginmanager.cpp
+@@ -189,8 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname)
+ 
+ QString PluginManager::getBaseDirPath()
+ {
++  #if defined(Q_OS_LINUX)
++	QDir baseDir("/usr/lib/meshlab");
++	#else
+   QDir baseDir(qApp->applicationDirPath());
+-
++	#endif
+ #if defined(Q_OS_WIN)
+   // Windows:
+   // during development with visual studio binary could be in the debug/release subdir.
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
new file mode 100644
index 000000000000..e01d5ebae851
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
@@ -0,0 +1,51 @@
+From 731519b5573ab503b78f2c892e2d5c4bcabef1ea Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Wed, 22 Nov 2017 23:33:11 +0330
+Subject: [PATCH] use-external-bzip
+
+---
+ meshlabplugins/edit_arc3D/edit_arc3D.pro | 31 -------------------------------
+ 1 file changed, 31 deletions(-)
+
+diff --git a/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlabplugins/edit_arc3D/edit_arc3D.pro
+index 08b5860..75db42c 100644
+--- a/meshlabplugins/edit_arc3D/edit_arc3D.pro
++++ b/meshlabplugins/edit_arc3D/edit_arc3D.pro
+@@ -28,34 +28,3 @@ SOURCES       += edit_arc3D.cpp   \
+ TARGET        = edit_arc3D

+ RESOURCES     = edit_arc3D.qrc

+ 

+-win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib

+-win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib

+-win32-msvc2010:LIBS	   += ../../external/lib/win32-msvc2010/bz2.lib

+-win32-msvc2012:LIBS	   += ../../external/lib/win32-msvc2012/bz2.lib

+-win32-msvc2013:LIBS	   += ../../external/lib/win32-msvc2013/bz2.lib

+-win32-msvc2015:LIBS	   += ../../external/lib/win32-msvc2015/bz2.lib

+-win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a

+-linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a

+-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a

+-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a

+-mac:LIBS   += -lbz2

+-

+-win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5

+-win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5

+-win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5

+-win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5

+-win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5

+-win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5

+-

+-win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5

+-linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5

+-linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5

+-linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5

+-

+-

+-CONFIG(release, debug|release) {

+-	win32-g++:release:QMAKE_CXXFLAGS -= -O2

+-	win32-g++:release:QMAKE_CFLAGS -= -O2

+-	win32-g++:release:QMAKE_CXXFLAGS += -O3 -mtune=pentium3 -ffast-math

+-}

+-

+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
new file mode 100644
index 000000000000..58d760499920
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
@@ -0,0 +1,95 @@
+From 3b698bccccaeeee03c4bf454971b9c4bc00f2450 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 01:22:19 +0330
+Subject: [PATCH] use-external-glew
+
+---
+ common/common.pro               | 7 ++++---
+ meshlab/meshlab.pro             | 8 ++++----
+ meshlabserver/meshlabserver.pro | 8 ++++----
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/common/common.pro b/common/common.pro
+index 8bdf6a5..0edc245 100644
+--- a/common/common.pro
++++ b/common/common.pro
+@@ -1,7 +1,7 @@
+ include (../general.pri)
+ #EXIF_DIR = ../external/jhead-2.95
+ 
+-GLEWCODE = $$GLEWDIR/src/glew.c
++#GLEWCODE = $$GLEWDIR/src/glew.c
+ 
+ win32-msvc2005:DESTDIR = ../distrib
+ win32-msvc2008:DESTDIR = ../distrib
+@@ -55,7 +55,8 @@ fi;\
+ "
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include
++#    $$GLEWDIR/include
++
+ TEMPLATE = lib
+ linux-g++:CONFIG += dll
+ linux-g++:DESTDIR = ../distrib
+@@ -80,7 +81,7 @@ QT += script
+ TARGET = common
+ DEPENDPATH += .
+ #INCLUDEPATH += . $$EXIF_DIR
+-DEFINES += GLEW_STATIC
++#DEFINES += GLEW_STATIC
+ win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 5456342..9d45834 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -9,7 +9,7 @@ INCLUDEPATH *= . \
+ 	.. \
+ 	../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include \
++#    $$GLEWDIR/include \
+ #	$$EXIF_DIR
+ 
+ DEPENDPATH += $$VCGDIR \
+@@ -151,11 +151,11 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
+ #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
+ #}
+ 
+-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
++linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
+ linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
++linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
+ linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
++linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
+ linux-g++-64:QMAKE_RPATHDIR += ../distrib
+ 
+ # uncomment in your local copy only in emergency cases.
+diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
+index c9f5d0e..2b96033 100644
+--- a/meshlabserver/meshlabserver.pro
++++ b/meshlabserver/meshlabserver.pro
+@@ -28,12 +28,12 @@ win32-msvc2008:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
+ win32-msvc2010:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
+ win32-msvc2012:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
+ win32-msvc2015:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
+-win32-g++:  LIBS += -L../distrib -lcommon      
+-linux-g++:  LIBS += -L../distrib -lcommon
++win32-g++:  LIBS += -L../distrib -lcommon 
++linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
+ linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:  LIBS += -L../distrib -lcommon
++linux-g++-32:  LIBS += -L../distrib -lcommon -lGLEW
+ linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:  LIBS += -L../distrib -lcommon
++linux-g++-64:  LIBS += -L../distrib -lcommon -lGLEW
+ linux-g++-64:QMAKE_RPATHDIR += ../distrib
+ #CONFIG (release,debug | release) {
+ #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
new file mode 100644
index 000000000000..002c2dc3bdf9
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
@@ -0,0 +1,56 @@
+From 68d92b2de5d598d4d85e2cdbddec5219ba317796 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Thu, 23 Nov 2017 01:21:10 +0330
+Subject: [PATCH] use-external-jhead
+
+---
+ common/common.pro   | 4 ++--
+ meshlab/meshlab.pro | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/common/common.pro b/common/common.pro
+index 51cdcb5..8bdf6a5 100644
+--- a/common/common.pro
++++ b/common/common.pro
+@@ -1,5 +1,5 @@
+ include (../general.pri)
+-EXIF_DIR = ../external/jhead-2.95
++#EXIF_DIR = ../external/jhead-2.95
+ 
+ GLEWCODE = $$GLEWDIR/src/glew.c
+ 
+@@ -79,7 +79,7 @@ QT += script
+ 
+ TARGET = common
+ DEPENDPATH += .
+-INCLUDEPATH += . $$EXIF_DIR
++#INCLUDEPATH += . $$EXIF_DIR
+ DEFINES += GLEW_STATIC
+ win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 0e50581..5456342 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -1,7 +1,7 @@
+ include (../general.pri)
+ #CONFIG += debug_and_release
+ DESTDIR = ../distrib
+-EXIF_DIR = ../external/jhead-2.95
++#EXIF_DIR = ../external/jhead-2.95
+ 
+ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
+ 
+@@ -10,7 +10,8 @@ INCLUDEPATH *= . \
+ 	../.. \
+     $$VCGDIR \
+     $$GLEWDIR/include \
+-	$$EXIF_DIR
++#	$$EXIF_DIR
++
+ DEPENDPATH += $$VCGDIR \
+     $$VCGDIR/vcg \
+     $$VCGDIR/wrap
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
new file mode 100644
index 000000000000..acbd8f4b5fed
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
@@ -0,0 +1,48 @@
+From 911bc805f89c464540fdce4c16e15f64476cf161 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Wed, 22 Nov 2017 19:25:35 +0330
+Subject: [PATCH] use-external-lib3ds
+
+---
+ meshlabplugins/io_3ds/io_3ds.pro | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
+index 601f5da..5a19589 100644
+--- a/meshlabplugins/io_3ds/io_3ds.pro
++++ b/meshlabplugins/io_3ds/io_3ds.pro
+@@ -9,31 +9,7 @@ HEADERS		= meshio.h \
+ 			io_3ds.h 
+ 				
+ SOURCES       += 	meshio.cpp \
+-			
+-DEFINES += LIB3DS_STATIC
+ 
+ TARGET        = io_3ds
+ 
+-INCLUDEPATH += ../../external/lib3ds-1.3.0/
+-
+-# Notes on the paths of lib3ds files.
+-# Once you have compiled the library put the lib files in a dir named lib/XXX/ 
+-# where XXX is the name of your system according to the QT naming style.
+-# Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds
+-
+-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
+-win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/3ds.lib
+-win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
+-win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
+-win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
+-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
+-
+-# unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
+-
+-# mac:LIBS -= -l3ds 
+-# mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a
+-
+-macx:LIBS += $$MACLIBDIR/lib3ds.a
+ 
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
new file mode 100644
index 000000000000..f107d5bc69e0
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
@@ -0,0 +1,37 @@
+From 0928f85bc8fb8215a98c5a115d85269f51f65b5e Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Wed, 22 Nov 2017 22:49:16 +0330
+Subject: [PATCH] use-external-muParser
+
+---
+ meshlabplugins/filter_func/filter_func.pro | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro
+index a7cc17a..23d5578 100644
+--- a/meshlabplugins/filter_func/filter_func.pro
++++ b/meshlabplugins/filter_func/filter_func.pro
+@@ -6,20 +6,3 @@ SOURCES       += filter_func.cpp
+ 

+ TARGET        = filter_func

+ 

+-INCLUDEPATH += ../../external/muparser_v225/include

+-

+-# Note: we need static libs so when building muparser lib use 

+-# ./configure --enable-shared=no

+-

+-win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib

+-win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib

+-win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/muparser.lib

+-win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/muparser.lib

+-win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib

+-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib

+-

+-macx:LIBS            += $$MACLIBDIR/libmuparser.a

+-linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a

+-linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a

+-linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a

+-win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a

+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
new file mode 100644
index 000000000000..7c48aa14a747
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
@@ -0,0 +1,43 @@
+From 7af5fa63c7577d4da060a2a8442b2f453023be86 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
+Date: Wed, 22 Nov 2017 22:41:39 +0330
+Subject: [PATCH] use-external-openctm
+
+---
+ meshlabplugins/io_ctm/io_ctm.pro | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro
+index 479b64e..434e6ad 100644
+--- a/meshlabplugins/io_ctm/io_ctm.pro
++++ b/meshlabplugins/io_ctm/io_ctm.pro
+@@ -3,26 +3,6 @@ HEADERS += io_ctm.h \
+     $$VCGDIR/wrap/io_trimesh/import_ctm.h \
+     $$VCGDIR/wrap/io_trimesh/export_ctm.h
+ SOURCES += io_ctm.cpp
+-INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
+ TARGET = io_ctm
+ 
+-win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-msvc2010:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-msvc2012:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-msvc2015:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
+-win32-g++:DEFINES += OPENCTM_STATIC
+ 
+-win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/openctm.lib
+-win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/openctm.lib
+-win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/openctm.lib
+-win32-msvc2010:LIBS	+= ../../external/lib/win32-msvc2010/openctm.lib
+-win32-msvc2012:LIBS	+= ../../external/lib/win32-msvc2012/openctm.lib
+-win32-msvc2015:LIBS	+= ../../external/lib/win32-msvc2015/openctm.lib
+-win32-g++:LIBS		+= ../../external/lib/win32-gcc/libopenctm.a
+-linux-g++:LIBS		+= ../../external/lib/linux-g++/libopenctm.a
+-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libopenctm.a
+-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libopenctm.a
+-#macx:LIBS += ../../external/lib/macx/libopenctm.a
+-macx:LIBS += $$MACLIBDIR/libopenctm.a
+-- 
+2.15.0
+
diff --git a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
new file mode 100644
index 000000000000..b372c7baf5e5
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
@@ -0,0 +1,10 @@
+--- a/meshlab_full.pro	2017-10-25 21:39:01.438252054 +0200
++++ b/meshlab_full.pro	2017-10-25 21:39:25.417251424 +0200
+@@ -66,7 +66,6 @@
+                 meshlabplugins/edit_arc3D \
+                 meshlabplugins/edit_manipulators \
+                 meshlabplugins/edit_measure \
+-                plugins_experimental/edit_mutualcorrs \
+                 meshlabplugins/edit_paint\
+                 meshlabplugins/edit_pickpoints \
+                 meshlabplugins/edit_point\
diff --git a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
new file mode 100644
index 000000000000..3d0eb74429b6
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
@@ -0,0 +1,10 @@
+--- a/meshlab_full.pro	2017-10-25 21:41:57.178247439 +0200
++++ b/meshlab_full.pro	2017-10-25 21:42:11.629247060 +0200
+@@ -16,7 +16,6 @@
+                 meshlabplugins/io_x3d \
+                 meshlabplugins/io_expe \
+                 meshlabplugins/io_pdb \
+-                plugins_experimental/io_TXT \
+ # Filter plugins
+                 meshlabplugins/filter_aging \
+                 meshlabplugins/filter_ao \