graphics/meshlab: Updated for version 1.3.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 6 insertions, 70 deletions

diff --git a/graphics/meshlab/meshlab.SlackBuild b/graphics/meshlab/meshlab.SlackBuild
index f2d71a4e86e24..122fff357fce5 100644
--- a/graphics/meshlab/meshlab.SlackBuild
+++ b/graphics/meshlab/meshlab.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meshlab
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,20 +73,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# gcc-4.7 fixes:
-# see http://sourceforge.net/p/meshlab/bugs/308/
-sed -i -e 's/m\.vert\.math::Swap/m.vert.math/' vcglib/wrap/gl/trimesh.h
 # see http://sourceforge.net/p/meshlab/bugs/342/
 patch -p1 < $CWD/plystuff.diff
-# see https://bugzilla.redhat.com/show_bug.cgi?id=904282
-sed -i -e 's/this->::Clear();/Histogram<ScalarType>::Clear();/' \
-  meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-
-# Other fixes (thanks to net147 over at Arch)
-# fix silly lapack error in ancient levmar
+# fix silly lapack error in ancient levmar (thanks to net147 over at Arch)
 patch -p1 -d meshlab < $CWD/lapack.patch
-# qt-4.8 fixes
-patch -p1 -d meshlab < $CWD/qt-4.8.patch
 
 # Build all the dependencies. These will be statically linked into meshlab.
 # (Horrible duplication and many out of date, but avoids version clashes)
@@ -126,7 +116,7 @@ cp \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.txt ../../how_to_compile.txt \
+  README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/meshlab/meshlab.info b/graphics/meshlab/meshlab.info
index d430c9efb0a2a..9a2f6999f8ed6 100644
--- a/graphics/meshlab/meshlab.info
+++ b/graphics/meshlab/meshlab.info
@@ -1,8 +1,8 @@
 PRGNAM="meshlab"
-VERSION="1.3.2"
+VERSION="1.3.3"
 HOMEPAGE="http://meshlab.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/meshlab/MeshLabSrc_AllInc_v132.tgz"
-MD5SUM="3cba61f6d34559f98129d9d0a3126f81"
+DOWNLOAD="http://downloads.sourceforge.net/meshlab/MeshLabSrc_AllInc_v133.tgz"
+MD5SUM="cbdd83d4f3ed69e7a9837c34ebae307a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack"
diff --git a/graphics/meshlab/qt-4.8.patch b/graphics/meshlab/qt-4.8.patch
deleted file mode 100644
index abfd77d6f25d9..0000000000000
--- a/graphics/meshlab/qt-4.8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2011-01-25 18:51:28.000000000 +1100
-+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2012-01-07 11:47:12.836800072 +1100
-@@ -7,6 +7,12 @@
- #include "SyntopiaCore/Logging/Logging.h"

- #include "SyntopiaCore/Misc/MiniParser.h"

- 

-+#ifdef Q_WS_MAC

-+#include <OpenGL/glu.h>

-+#else

-+#include <GL/glu.h>

-+#endif

-+

- using namespace SyntopiaCore::Math;

- using namespace SyntopiaCore::Misc;

- 

-diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2011-01-25 18:51:28.000000000 +1100
-+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2012-01-07 11:45:26.795586149 +1100
-@@ -3,6 +3,12 @@
- #include "SyntopiaCore/Math/Vector3.h"

- #include "Object3D.h"

- 

-+#ifdef Q_WS_MAC

-+#include <OpenGL/glu.h>

-+#else

-+#include <GL/glu.h>

-+#endif

-+

- namespace SyntopiaCore {

- 	namespace GLEngine {	

- 

-diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro
---- meshlab.orig/src/external/structuresynth/structuresynth.pro	2011-01-25 18:49:34.000000000 +1100
-+++ meshlab/src/external/structuresynth/structuresynth.pro	2012-01-07 11:51:46.695981995 +1100
-@@ -113,6 +113,7 @@
-            ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp

- CONFIG+=opengl

- QT+=xml opengl script

-+unix:LIBS += -lGLU

- macx:DESTDIR       = ../lib/macx

- win32-g++:DESTDIR       = ../lib/win32-gcc

- win32-msvc2005:DESTDIR       = ../lib/win32-msvc2005

-diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- meshlab.orig/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
-+++ 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