Page MenuHomeFreeBSD
Files F150801041

D24686.id72660.diff
No OneTemporary
Actions

D24686.id72660.diff
View Options

Index: cad/Makefile
===================================================================
--- cad/Makefile
+++ cad/Makefile
@@ -74,6 +74,7 @@
SUBDIR += logisim
SUBDIR += magic
SUBDIR += meshdev
+ SUBDIR += meshlab
SUBDIR += netgen
SUBDIR += netgen-lvs
SUBDIR += ngspice_rework
Index: cad/meshlab/Makefile
===================================================================
--- cad/meshlab/Makefile
+++ cad/meshlab/Makefile
@@ -2,64 +2,41 @@
# $FreeBSD$
PORTNAME= meshlab
-PORTVERSION= 1.3.3
-PORTREVISION= 10
+DISTVERSIONPREFIX= Meshlab-
+DISTVERSION= 2020.05
CATEGORIES= cad
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
-DISTNAME= MeshLabSrc_AllInc_v${PORTVERSION:C|\.||g}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= lbartoletti@tuxfamily.org
COMMENT= 3D triangular meshes processing and editing tool
LICENSE= GPLv2
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
+BUILD_DEPENDS= ${LOCALBASE}/include/vcglib/img/img.h:devel/vcglib
+LIB_DEPENDS= libmpirxx.so:math/mpir
-BROKEN_aarch64= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_armv6= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_armv7= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
-BROKEN_powerpc64= fails to compile: mc_lookup_table.h:316:5: narrowing conversion of '-1' from 'int' to 'char' inside { }
-
-EXTRACT_DEPENDS=gtar:archivers/gtar
-LIB_DEPENDS= libQtSolutions_SOAP-head.so:devel/qt4-qtsolutions-soap \
- libmpir.so:math/mpir
-
-USES= compiler:c++11-lib dos2unix qmake qt:4 tar:tgz
-USE_CXXSTD= c++11
-USE_GL= glew glu
-USE_QT= moc_build rcc_build uic_build corelib gui xml \
- xmlpatterns opengl network script
+USES= dos2unix gl qmake:outsource qt:5
+USE_GL= gl glu glew
+USE_QT= buildtools_build core gui network \
+ opengl script xml xmlpatterns widgets
+USE_GITHUB= yes
+GH_ACCOUNT= cnr-isti-vclab
USE_LDCONFIG= yes
-DOS2UNIX_FILES= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
- external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp \
- meshlabplugins/edit_arc3D/fillImage.cpp \
- meshlabplugins/filter_csg/intercept.h \
- meshlabplugins/filter_photosynth/downloader.cpp
-EXTRACT_CMD= gtar
-QMAKE_SOURCE_PATH= ${WRKSRC}/meshlab_full.pro
-WRKSRC= ${WRKDIR}/${PORTNAME}/src
+QMAKE_SOURCE_PATH= ${WRKSRC}/src/meshlab.pro
-pre-configure:
- ${MV} "${WRKSRC}/distrib/shaders/electronic microscope.gdp" \
- ${WRKSRC}/distrib/shaders/electronic_microscope.gdp
- ${MV} "${WRKSRC}/distrib/shaders/shadersrm/old/Depth of Field.rfx" \
- ${WRKSRC}/distrib/shaders/shadersrm/old/Depth_of_Field.rfx
- ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
- ${WRKSRC}/common/pluginmanager.cpp
+DOS2UNIX_GLOB= *.c *.cpp *.h
-.if defined(MAINTAINER_MODE)
- ${FIND} ${WRKSRC}/../../ -name "*.pro" | ${XARGS} \
- ${REINPLACE_CMD} -e '/^CONFIG +=/s|$$| debug|'
-.endif
+post-patch:
+ ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/general.pri
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
- cd ${WRKSRC}/distrib/plugins && ${INSTALL_LIB} *.so ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
+ cd ${BUILD_WRKSRC}/distrib/plugins && ${INSTALL_LIB} *.so ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/shaders
cd ${WRKSRC}/distrib/shaders && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/meshlab/shaders
- ${INSTALL_PROGRAM} ${WRKSRC}/distrib/meshlab ${STAGEDIR}${PREFIX}/lib/meshlab
- ${LN} -sf ../lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin
-
+ ${INSTALL_LIB} ${BUILD_WRKSRC}/distrib/lib/* ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/distrib/meshlab ${STAGEDIR}${PREFIX}/lib/meshlab
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/distrib/meshlabserver ${STAGEDIR}${PREFIX}/lib/meshlab
+ ${RLN} ${STAGEDIR}${PREFIX}/lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin
+ ${RLN} ${STAGEDIR}${PREFIX}/lib/meshlab/meshlabserver ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: cad/meshlab/distinfo
===================================================================
--- cad/meshlab/distinfo
+++ cad/meshlab/distinfo
@@ -1,2 +1,3 @@
-SHA256 (MeshLabSrc_AllInc_v133.tgz) = c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f
-SIZE (MeshLabSrc_AllInc_v133.tgz) = 13390531
+TIMESTAMP = 1588449862
+SHA256 (cnr-isti-vclab-meshlab-Meshlab-2020.05_GH0.tar.gz) = a1d6528bc6e81a57e9b88f9d944ba0df18924b3f74ca474237949bdc28e4f9b9
+SIZE (cnr-isti-vclab-meshlab-Meshlab-2020.05_GH0.tar.gz) = 85076785
Index: cad/meshlab/files/patch-src_general.pri
===================================================================
--- /dev/null
+++ cad/meshlab/files/patch-src_general.pri
@@ -0,0 +1,11 @@
+--- src/general.pri.orig 2020-05-02 21:17:23 UTC
++++ src/general.pri
+@@ -9,7 +9,7 @@
+ DEFINES += MESHLAB_SCALAR=float
+
+ # VCG directory
+-VCGDIR = $$MESHLAB_SOURCE_DIRECTORY/../vcglib
++VCGDIR = %%LOCALBASE%%/include/vcglib
+
+ include(find_system_libs.pri)
+
Index: cad/meshlab/files/patch-src_meshlab_glarea.cpp
===================================================================
--- /dev/null
+++ cad/meshlab/files/patch-src_meshlab_glarea.cpp
@@ -0,0 +1,10 @@
+--- src/meshlab/glarea.cpp.orig 2020-06-04 09:00:54 UTC
++++ src/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include <QFileDialog>
+ #include <QClipboard>
+ #include <QLocale>
++#include <QPainterPath>
+
+ #include <wrap/gl/picking.h>
+ #include <wrap/qt/trackball.h>
Index: cad/meshlab/files/patch-src_meshlab_meshlab.pro
===================================================================
--- /dev/null
+++ cad/meshlab/files/patch-src_meshlab_meshlab.pro
@@ -0,0 +1,14 @@
+--- src/meshlab/meshlab.pro.orig 2020-05-03 08:34:34 UTC
++++ src/meshlab/meshlab.pro
+@@ -143,9 +143,9 @@ macx:QMAKE_POST_LINK += "\
+ # win32-g++:release:LIBS += -L../common/release -lcommon
+ #}
+
+-linux:LIBS += \
++LIBS += \
+ -lmeshlab-common -lGLU \
+- -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -ljhead
++ -L$$MESHLAB_DISTRIB_DIRECTORY/lib -L$$EXIF_DIR -ljhead
+
+ !CONFIG(system_glew) {
+ INCLUDEPATH *= $$GLEWDIR/include
Index: cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro
===================================================================
--- /dev/null
+++ cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro
@@ -0,0 +1,13 @@
+--- src/meshlabserver/meshlabserver.pro.orig 2020-05-02 21:24:46 UTC
++++ src/meshlabserver/meshlabserver.pro
+@@ -29,7 +29,9 @@ macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/C
+
+ win32-msvc:LIBS += -lopengl32 -lGLU32 -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common
+ win32-g++:LIBS += -lmeshlab-common
+-linux:LIBS += -lmeshlab-common
++LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common
++
++
+
+ win32-msvc:DEFINES += GLEW_STATIC
+
Index: cad/meshlab/files/patch-src_shared.pri
===================================================================
--- /dev/null
+++ cad/meshlab/files/patch-src_shared.pri
@@ -0,0 +1,11 @@
+--- src/shared.pri.orig 2020-05-02 21:26:35 UTC
++++ src/shared.pri
+@@ -12,7 +12,7 @@ QT += script
+ mac:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/libmeshlab-common.dylib
+ win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/meshlab-common.lib -lopengl32 -lGLU32
+ win32-g++:LIBS += -lmeshlab-common -lopengl32 -lGLU32
+-linux:LIBS += -lmeshlab-common -lGL -lGLU
++LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common -lGL -lGLU
+
+ win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
+
Index: cad/meshlab/pkg-plist
===================================================================
--- cad/meshlab/pkg-plist
+++ cad/meshlab/pkg-plist
@@ -1,29 +1,29 @@
bin/meshlab
+bin/meshlabserver
+lib/libmeshlab-common.so
+lib/libmeshlab-common.so.1
+lib/libmeshlab-common.so.1.0
+lib/libmeshlab-common.so.1.0.0
lib/meshlab/meshlab
+lib/meshlab/meshlabserver
lib/meshlab/plugins/libdecorate_background.so
lib/meshlab/plugins/libdecorate_base.so
lib/meshlab/plugins/libdecorate_raster_proj.so
lib/meshlab/plugins/libdecorate_shadow.so
lib/meshlab/plugins/libedit_align.so
-lib/meshlab/plugins/libedit_arc3D.so
-lib/meshlab/plugins/libedit_hole.so
lib/meshlab/plugins/libedit_manipulators.so
lib/meshlab/plugins/libedit_measure.so
+lib/meshlab/plugins/libedit_mutualcorrs.so
lib/meshlab/plugins/libedit_paint.so
-lib/meshlab/plugins/libedit_pickpoints.so
lib/meshlab/plugins/libedit_point.so
lib/meshlab/plugins/libedit_quality.so
lib/meshlab/plugins/libedit_referencing.so
+lib/meshlab/plugins/libedit_sample.so
lib/meshlab/plugins/libedit_select.so
-lib/meshlab/plugins/libedit_texture.so
-lib/meshlab/plugins/libfilter_aging.so
lib/meshlab/plugins/libfilter_ao.so
-lib/meshlab/plugins/libfilter_autoalign.so
-lib/meshlab/plugins/libfilter_bnpts.so
lib/meshlab/plugins/libfilter_camera.so
lib/meshlab/plugins/libfilter_clean.so
lib/meshlab/plugins/libfilter_color_projection.so
-lib/meshlab/plugins/libfilter_colorize.so
lib/meshlab/plugins/libfilter_colorproc.so
lib/meshlab/plugins/libfilter_create.so
lib/meshlab/plugins/libfilter_createiso.so
@@ -38,29 +38,31 @@
lib/meshlab/plugins/libfilter_measure.so
lib/meshlab/plugins/libfilter_meshing.so
lib/meshlab/plugins/libfilter_mls.so
+lib/meshlab/plugins/libfilter_mutualglobal.so
lib/meshlab/plugins/libfilter_mutualinfo.so
-lib/meshlab/plugins/libfilter_photosynth.so
lib/meshlab/plugins/libfilter_plymc.so
-lib/meshlab/plugins/libfilter_poisson.so
lib/meshlab/plugins/libfilter_qhull.so
lib/meshlab/plugins/libfilter_quality.so
+lib/meshlab/plugins/libfilter_sample.so
+lib/meshlab/plugins/libfilter_sample_dyn.so
+lib/meshlab/plugins/libfilter_sample_gpu.so
lib/meshlab/plugins/libfilter_sampling.so
+lib/meshlab/plugins/libfilter_screened_poisson.so
lib/meshlab/plugins/libfilter_sdfgpu.so
lib/meshlab/plugins/libfilter_select.so
+lib/meshlab/plugins/libfilter_sketchfab.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/libfilter_voronoi.so
lib/meshlab/plugins/libio_3ds.so
lib/meshlab/plugins/libio_base.so
lib/meshlab/plugins/libio_bre.so
lib/meshlab/plugins/libio_collada.so
lib/meshlab/plugins/libio_ctm.so
lib/meshlab/plugins/libio_expe.so
-lib/meshlab/plugins/libio_gts.so
lib/meshlab/plugins/libio_json.so
-lib/meshlab/plugins/libio_m.so
lib/meshlab/plugins/libio_pdb.so
lib/meshlab/plugins/libio_tri.so
lib/meshlab/plugins/libio_txt.so
@@ -68,11 +70,6 @@
lib/meshlab/plugins/libio_x3d.so
lib/meshlab/plugins/librender_gdp.so
lib/meshlab/plugins/librender_radiance_scaling.so
-lib/meshlab/plugins/librender_rfx.so
-lib/meshlab/plugins/librender_splatting.so
-lib/meshlab/plugins/libsampleedit.so
-lib/meshlab/plugins/libsamplefilter.so
-lib/meshlab/plugins/libsamplefilterdyn.so
lib/meshlab/shaders/3Dlabs-license.txt
lib/meshlab/shaders/Cook-Torrance.frag
lib/meshlab/shaders/Cook-Torrance.gdp
@@ -115,7 +112,7 @@
lib/meshlab/shaders/dimple.frag
lib/meshlab/shaders/dimple.gdp
lib/meshlab/shaders/dimple.vert
-lib/meshlab/shaders/electronic_microscope.gdp
+lib/meshlab/shaders/electronic microscope.gdp
lib/meshlab/shaders/envmap.frag
lib/meshlab/shaders/envmap.gdp
lib/meshlab/shaders/envmap.vert
@@ -148,7 +145,7 @@
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/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

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 5, 3:44 AM (21 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30866759
Default Alt Text
D24686.id72660.diff (11 KB)

Event Timeline