10 files changed, 119 insertions, 75 deletions

diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index a4586ff01716..4f98c1d1d2c6 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -7,22 +7,24 @@
 #
 
 PORTNAME=	meshlab
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+DISTVERSION=	1.3.0
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
-DISTNAME=	MeshLabSrc_AllInc_v123a
+DISTNAME=	MeshLabSrc_AllInc_v${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A tool for processing and editing 3D triangular meshes
 
+LIB_DEPENDS=	QtSolutions_SOAP-head:${PORTSDIR}/devel/qt4-qtsolutions-soap
+
 USE_GL=		glew glu
 USE_QT4=	qmake corelib gui xml opengl network moc uic rcc
+MAKE_ENV+=	CXX=clang++
 
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/meshlab/src
+WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.pro" | ${XARGS} ${REINPLACE_CMD} -e 's|^linux-g++|freebsd-g++|'
@@ -31,7 +33,7 @@ post-patch:
 
 do-configure:
 	cd ${WRKSRC}/external && ${QMAKE} -recursive external.pro
-	cd ${WRKSRC} && ${QMAKE} -recursive meshlabv12.pro
+	cd ${WRKSRC} && ${QMAKE} -recursive meshlab_full.pro
 
 do-build:
 	cd ${WRKSRC}/external && ${MAKE}
diff --git a/cad/meshlab/distinfo b/cad/meshlab/distinfo
index e8380521aa70..7b0a52e348c1 100644
--- a/cad/meshlab/distinfo
+++ b/cad/meshlab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MeshLabSrc_AllInc_v123a.tgz) = 3b515ddde7ff24a14ba32e3cbc755661cd7d58a4a2a467133d59fad001168427
-SIZE (MeshLabSrc_AllInc_v123a.tgz) = 11126723
+SHA256 (MeshLabSrc_AllInc_v130.tgz) = a1692e52c8d6dbc3ead8b2bcb4585138b65e3f44d1ac97764034b3c4d225a7f9
+SIZE (MeshLabSrc_AllInc_v130.tgz) = 12087620
diff --git a/cad/meshlab/files/patch-fgt-filter_ssynth_ssynthres.qrc b/cad/meshlab/files/patch-fgt-filter_ssynth_ssynthres.qrc
new file mode 100644
index 000000000000..4d649e7c2289
--- /dev/null
+++ b/cad/meshlab/files/patch-fgt-filter_ssynth_ssynthres.qrc
@@ -0,0 +1,11 @@
+--- fgt/filter_ssynth/ssynthres.qrc.orig	2012-06-25 08:39:52.000000000 +0200
++++ fgt/filter_ssynth/ssynthres.qrc	2012-06-25 08:40:45.000000000 +0200
+@@ -1,8 +1,4 @@
+ <RCC>
+     <qresource prefix="/">
+-        <file>x3d.rendertemplate</file>
+-        <file>x3d2.rendertemplate</file>
+-        <file>x3d3.rendertemplate</file>
+-        <file>x3d4.rendertemplate</file>
+     </qresource>
+ </RCC>
diff --git a/cad/meshlab/files/patch-glu b/cad/meshlab/files/patch-glu
new file mode 100644
index 000000000000..9b573460317e
--- /dev/null
+++ b/cad/meshlab/files/patch-glu
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..ba4db9e4826e
--- /dev/null
+++ b/cad/meshlab/files/patch-meshlab_full.pro
@@ -0,0 +1,14 @@
+--- meshlab_full.pro.orig	2011-09-20 12:57:22.000000000 +0200
++++ meshlab_full.pro	2011-09-20 12:57:35.000000000 +0200
+@@ -63,11 +63,7 @@
+ # projects
+                 fgt/filter_aging \
+                 fgt/filter_colorproc \
+-<<<<<<< .mine
+                 #fgt/filter_csg \
+-=======
+-#			fgt/filter_csg \
+->>>>>>> .r5054
+                 fgt/filter_func \
+                 fgt/filter_ssynth \
+                 fgt/filter_qhull \
diff --git a/cad/meshlab/files/patch-meshlab_meshlab.pro b/cad/meshlab/files/patch-meshlab_meshlab.pro
index 542c3f15ed30..5883f413cbef 100644
--- a/cad/meshlab/files/patch-meshlab_meshlab.pro
+++ b/cad/meshlab/files/patch-meshlab_meshlab.pro
@@ -1,5 +1,5 @@
---- meshlab/meshlab.pro~	2012-05-20 01:14:08.000000000 -0300
-+++ meshlab/meshlab.pro	2012-05-20 01:14:53.000000000 -0300
+--- meshlab/meshlab.pro.orig	2011-02-15 10:39:47.000000000 +0100
++++ meshlab/meshlab.pro	2012-06-21 09:13:21.000000000 +0200
 @@ -1,3 +1,6 @@
 +# Qt 4.8 does not add -lGLU automatically with QT=opengl anymore
 +LIBS += -lGLU
@@ -7,3 +7,22 @@
  VCGDIR = ../../../vcglib
  GLEWDIR = ../external/glew-1.5.1
  #CONFIG += debug_and_release
+@@ -128,12 +131,12 @@
+ #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
+ #}
+ 
+-linux-g++:LIBS += -L../distrib -lcommon
+-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
++freebsd-g++:LIBS += $$PWD/../distrib/libcommon.so
++freebsd-g++:QMAKE_RPATHDIR += ../distrib
++freebsd-g++-32:LIBS += $PWD/../distrib/libcommon.so
++freebsd-g++-32:QMAKE_RPATHDIR += ../distrib
++freebsd-g++-64:LIBS += $PWD/../distrib/libcommon.so
++freebsd-g++-64:QMAKE_RPATHDIR += ../distrib
+ 
+ 
+ # uncomment in your local copy only in emergency cases.
diff --git a/cad/meshlab/files/patch-meshlab_meshlab.qrc b/cad/meshlab/files/patch-meshlab_meshlab.qrc
new file mode 100644
index 000000000000..1ed9e44aaee0
--- /dev/null
+++ b/cad/meshlab/files/patch-meshlab_meshlab.qrc
@@ -0,0 +1,10 @@
+--- meshlab/meshlab.qrc.orig	2012-06-21 08:37:05.000000000 +0200
++++ meshlab/meshlab.qrc	2012-06-21 08:37:21.000000000 +0200
+@@ -34,7 +34,6 @@
+         <file>images/100mesh.html</file>
+         <file>images/selected_face.png</file>
+         <file>images/selected_vert.png</file>
+-        <file>images/facebook.gif</file>
+         <file>images/onscreenHelp.txt</file>
+         <file>images/splitV.png</file>
+         <file>images/splitH.png</file>
diff --git a/cad/meshlab/files/patch-meshlablugins-radianceScalingRenderer.qrc b/cad/meshlab/files/patch-meshlablugins-radianceScalingRenderer.qrc
new file mode 100644
index 000000000000..40f156d18d54
--- /dev/null
+++ b/cad/meshlab/files/patch-meshlablugins-radianceScalingRenderer.qrc
@@ -0,0 +1,12 @@
+--- meshlabplugins/render_radiance_scaling/radianceScalingRenderer.qrc.orig	2012-06-22 09:04:58.000000000 +0200
++++ meshlabplugins/render_radiance_scaling/radianceScalingRenderer.qrc	2012-06-22 09:06:27.000000000 +0200
+@@ -1,9 +1,5 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource prefix="/RadianceScalingRenderer">
+-    <file>shaders/01_buffer.vs</file>
+-    <file>shaders/01_buffer.fs</file>
+-    <file>shaders/02_rs.vs</file>
+-    <file>shaders/02_rs.fs</file>
+     <file>litSpheres/ls01.png</file>
+     <file>litSpheres/ls02.png</file>
+ </qresource>
diff --git a/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro b/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro
new file mode 100644
index 000000000000..d5e2f9910ef7
--- /dev/null
+++ b/cad/meshlab/files/patch-meshlabserver_meshlabserver.pro
@@ -0,0 +1,21 @@
+--- meshlabserver/meshlabserver.pro.bak	2011-01-25 08:49:46.000000000 +0100
++++ meshlabserver/meshlabserver.pro	2012-06-21 09:29:05.000000000 +0200
+@@ -25,12 +25,12 @@
+ 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++-32:  LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:  LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++freebsd-g++:  LIBS += $$PWD/../distrib/libcommon.so
++freebsd-g++:QMAKE_RPATHDIR += ../distrib
++freebsd-g++-32:  LIBS += $$PWD/../distrib/libcommon.so
++freebsd-g++-32:QMAKE_RPATHDIR += ../distrib
++freebsd-g++-64:  LIBS += $$PWD/../distrib/libcommon.so
++freebsd-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/cad/meshlab/pkg-plist b/cad/meshlab/pkg-plist
index aef58ca74aa7..ccba3aac0d1e 100644
--- a/cad/meshlab/pkg-plist
+++ b/cad/meshlab/pkg-plist
@@ -4,21 +4,21 @@ lib/libcommon.so.1.0
 lib/libcommon.so.1
 lib/libcommon.so
 lib/meshlab/meshlab
+lib/meshlab/plugins/libdecorate_background.so
+lib/meshlab/plugins/libdecorate_base.so
 lib/meshlab/plugins/libdecorate_shadow.so
 lib/meshlab/plugins/libedit_hole.so
 lib/meshlab/plugins/libedit_pickpoints.so
 lib/meshlab/plugins/libedit_quality.so
 lib/meshlab/plugins/libedit_select.so
 lib/meshlab/plugins/libedit_texture.so
-lib/meshlab/plugins/libedit_topo.so
 lib/meshlab/plugins/libeditalign.so
 lib/meshlab/plugins/libeditmeasure.so
 lib/meshlab/plugins/libeditpaint.so
-lib/meshlab/plugins/libeditrgbtri.so
-lib/meshlab/plugins/libeditsegment.so
 lib/meshlab/plugins/libfilter_aging.so
 lib/meshlab/plugins/libfilter_ao.so
 lib/meshlab/plugins/libfilter_autoalign.so
+lib/meshlab/plugins/libfilter_camera.so
 lib/meshlab/plugins/libfilter_clean.so
 lib/meshlab/plugins/libfilter_colorize.so
 lib/meshlab/plugins/libfilter_colorproc.so
@@ -26,9 +26,11 @@ lib/meshlab/plugins/libfilter_create.so
 lib/meshlab/plugins/libfilter_fractal.so
 lib/meshlab/plugins/libfilter_func.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_photosynth.so
 lib/meshlab/plugins/libfilter_plymc.so
 lib/meshlab/plugins/libfilter_poisson.so
 lib/meshlab/plugins/libfilter_qhull.so
@@ -36,12 +38,11 @@ lib/meshlab/plugins/libfilter_quality.so
 lib/meshlab/plugins/libfilter_sampling.so
 lib/meshlab/plugins/libfilter_select.so
 lib/meshlab/plugins/libfilter_slice.so
-lib/meshlab/plugins/libfilter_splitter.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/libfilterborder.so
 lib/meshlab/plugins/libfiltercreateiso.so
 lib/meshlab/plugins/libfiltergeodesic.so
 lib/meshlab/plugins/libio_3ds.so
@@ -51,19 +52,18 @@ lib/meshlab/plugins/libio_collada.so
 lib/meshlab/plugins/libio_epoch.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_u3d.so
 lib/meshlab/plugins/libio_x3d.so
-lib/meshlab/plugins/libmeshdecorate.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/libsampledecoration.so
 lib/meshlab/plugins/libsampleedit.so
 lib/meshlab/plugins/libsamplefilter.so
-lib/meshlab/plugins/libsamplefilterdoc.so
 lib/meshlab/plugins/libsamplefilterdyn.so
 lib/meshlab/shaders/3Dlabs-license.txt
 lib/meshlab/shaders/Cook-Torrance.frag
@@ -81,44 +81,20 @@ 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
-lib/meshlab/shaders/decorate_shadow/._ssao
-lib/meshlab/shaders/decorate_shadow/._vsm
-lib/meshlab/shaders/decorate_shadow/._vsmb
-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/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/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/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/decorate_shadow/vsmb/blurVSM.frag
 lib/meshlab/shaders/decorate_shadow/vsmb/blurVSM.vert
 lib/meshlab/shaders/decorate_shadow/vsmb/depthVSM.frag
@@ -159,25 +135,11 @@ 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
 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/shadersrm/old/Depth of Field.rfx
 lib/meshlab/shaders/shadersrm/old/GlyphBomb.rfx
 lib/meshlab/shaders/shadersrm/old/ImageBasedLighting.rfx
@@ -186,26 +148,9 @@ 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/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/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