mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Update to 1.3.2

Browse Source 
Release notes:
  http://sf.net/apps/mediawiki/meshlab/index.php?title=Release_Notes_1.3.2
- Unbreak
This commit is contained in:
Pietro Cerutti 2013-05-08 14:09:31 +00:00
parent f4018509c7
commit da6ddfe950
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=317661
12 changed files with 81 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cad/meshlab/Makefile
View File

@ -1,47 +1,41 @@
# ex: ts=8
# New ports collection Makefile for: meshlab
# Date created: 26 October 2010
# Whom: gahr
#
# Created by: gahr
# $FreeBSD$
#
PORTNAME= meshlab
DISTVERSION= 1.3.0
DISTVERSION= 1.3.2
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
DISTNAME= MeshLabSrc_AllInc_v${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
MASTER_SITES= ${MASTER_SITE_LOCAL}/gahr/ \
http://people.freebsd.org/~gahr/distfiles/
MAINTAINER= gahr@FreeBSD.org
COMMENT= A tool for processing and editing 3D triangular meshes
COMMENT= 3D triangular meshes processing and editing tool
EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
LIB_DEPENDS= QtSolutions_SOAP-head:${PORTSDIR}/devel/qt4-qtsolutions-soap
BROKEN= does not build
USE_GL= glew glu
USE_QT4= qmake corelib gui xml opengl network moc uic rcc script
USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui xml \
xmlpatterns opengl network script
USE_DOS2UNIX= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/src
WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}/src
post-patch:
${FIND} ${WRKSRC} -name "*.pro" | ${XARGS} ${REINPLACE_CMD} -e 's|^linux-g++|freebsd-g++|'
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/common/pluginmanager.cpp
do-configure:
cd ${WRKSRC}/external && ${QMAKE} -recursive external.pro
cd ${WRKSRC} && ${QMAKE} -recursive meshlab_full.pro
cd ${WRKSRC}/external && ${QMAKE} -spec ${QMAKESPEC} -recursive external.pro
cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} -recursive meshlab_full.pro
do-build:
cd ${WRKSRC}/external && ${MAKE}
cd ${WRKSRC} && ${MAKE}
do-install:
${INSTALL_DATA} ${WRKSRC}/distrib/libcommon.so.1.0.0 ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/common/libcommon.so.1.0.0 ${PREFIX}/lib
${LN} -sf ${PREFIX}/lib/libcommon.so.1.0.0 ${PREFIX}/lib/libcommon.so.1.0
${LN} -sf ${PREFIX}/lib/libcommon.so.1.0 ${PREFIX}/lib/libcommon.so.1
${LN} -sf ${PREFIX}/lib/libcommon.so.1 ${PREFIX}/lib/libcommon.so

4
cad/meshlab/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (MeshLabSrc_AllInc_v130.tgz) = a1692e52c8d6dbc3ead8b2bcb4585138b65e3f44d1ac97764034b3c4d225a7f9
SIZE (MeshLabSrc_AllInc_v130.tgz) = 12087620
SHA256 (meshlab-1.3.2.tar.gz) = 70b2bdcc8001346b5104e8614cefa9ed9cab055fb6adc04352a19b7f9b66bad6
SIZE (meshlab-1.3.2.tar.gz) = 12774974

19
cad/meshlab/files/patch-common_common.pro Normal file
View File

@ -0,0 +1,19 @@
--- common/common.pro.orig 2013-05-07 10:06:45.000000000 +0200
+++ common/common.pro 2013-05-07 10:09:47.000000000 +0200
@@ -62,6 +62,9 @@
linux-g++-64:CONFIG += dll
linux-g++-64:DESTDIR = ../distrib
+freebsd:CONFIG += dll
+freebsd:DESTDIR = ../distrib
+
win32-msvc2005:CONFIG += staticlib
win32-msvc2008:CONFIG += staticlib
win32-msvc2010:CONFIG += staticlib
@@ -124,5 +127,6 @@
linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead
linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead
linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead
+freebsd:LIBS += -L../external/lib/freebsd -ljhead
#RESOURCES = common.qrc

16
cad/meshlab/files/patch-common_pluginmanager.cpp
View File

@ -1,14 +1,14 @@
--- common/pluginmanager.cpp.orig 2011-02-07 14:11:51.000000000 +0100
+++ common/pluginmanager.cpp 2011-02-07 14:12:33.000000000 +0100
@@ -98,7 +98,11 @@
--- common/pluginmanager.cpp.orig 2012-11-07 11:15:44.000000000 +0100
+++ common/pluginmanager.cpp 2012-11-07 11:16:26.000000000 +0100
@@ -230,7 +230,11 @@
QString PluginManager::getPluginDirPath()
{
+#ifdef __FreeBSD__
+ QDir pluginsDir("%%PREFIX%%/lib/meshlab/");
+ QDir pluginsDir("%%PREFIX%%/lib/meshlab/");
+#else
QDir pluginsDir(getBaseDirPath());
QDir pluginsDir(getBaseDirPath());
+#endif
if(!pluginsDir.exists("plugins"))
//QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory.");
qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory.");
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.");

11
cad/meshlab/files/patch-fgt-filter_ssynth_ssynthres.qrc
View File

@ -1,11 +0,0 @@
--- 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>

14
cad/meshlab/files/patch-glu
View File

@ -1,10 +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 {
#include "SyntopiaCore/Math/Vector3.h"
#include <QGLWidget>
#include <QtOpenGL>
+#include <GL/glu.h>
namespace SyntopiaCore {
namespace GLEngine {

14
cad/meshlab/files/patch-meshlab_full.pro
View File

@ -1,14 +0,0 @@
--- 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 \

36
cad/meshlab/files/patch-meshlab_meshlab.pro
View File

@ -1,28 +1,12 @@
--- 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
--- meshlab/meshlab.pro.orig 2012-05-30 16:32:44.000000000 +0200
+++ meshlab/meshlab.pro 2013-05-08 10:34:55.000000000 +0200
@@ -136,6 +136,9 @@
linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
linux-g++-64:QMAKE_RPATHDIR += ../distrib
+LIBS += -L../external/jhead-2.95 -L../common -lcommon -lGLU -ljhead
+QMAKE_RPATHDIR += ../distrib
+
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.
# We should never be too permissive
# win32-g++:QMAKE_CXXFLAGS += -fpermissive

10
cad/meshlab/files/patch-meshlab_meshlab.qrc
View File

@ -1,10 +0,0 @@
--- 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>

12
cad/meshlab/files/patch-meshlablugins-radianceScalingRenderer.qrc
View File

@ -1,12 +0,0 @@
--- 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>

26
cad/meshlab/files/patch-meshlabserver_meshlabserver.pro
View File

@ -1,21 +1,11 @@
--- 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
--- meshlabserver/meshlabserver.pro.orig 2011-10-14 18:34:48.000000000 +0200
+++ meshlabserver/meshlabserver.pro 2013-05-08 10:36:08.000000000 +0200
@@ -31,6 +31,8 @@
linux-g++-32:QMAKE_RPATHDIR += ../distrib
linux-g++-64: LIBS += -L../distrib -lcommon
linux-g++-64:QMAKE_RPATHDIR += ../distrib
+LIBS += -L../common -lcommon -L../external/jhead-2.95 -ljhead
+QMAKE_RPATHDIR += ../distrib
#CONFIG (release,debug | release) {
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
# win32-msvc2008:release: LIBS += -L../common/release -lcommon

19
cad/meshlab/pkg-plist
View File

@ -6,38 +6,47 @@ lib/libcommon.so
lib/meshlab/meshlab
lib/meshlab/plugins/libdecorate_background.so
lib/meshlab/plugins/libdecorate_base.so
lib/meshlab/plugins/libdecorate_raster_proj.so
lib/meshlab/plugins/libdecorate_shadow.so
lib/meshlab/plugins/libedit_align.so
lib/meshlab/plugins/libedit_arc3D.so
lib/meshlab/plugins/libedit_hole.so
lib/meshlab/plugins/libedit_manipulators.so
lib/meshlab/plugins/libedit_measure.so
lib/meshlab/plugins/libedit_paint.so
lib/meshlab/plugins/libedit_pickpoints.so
lib/meshlab/plugins/libedit_point.so
lib/meshlab/plugins/libedit_quality.so
lib/meshlab/plugins/libedit_select.so
lib/meshlab/plugins/libedit_texture.so
lib/meshlab/plugins/libeditalign.so
lib/meshlab/plugins/libeditmeasure.so
lib/meshlab/plugins/libeditpaint.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_dirt.so
lib/meshlab/plugins/libfilter_fractal.so
lib/meshlab/plugins/libfilter_func.so
lib/meshlab/plugins/libfilter_img_patch_param.so
lib/meshlab/plugins/libfilter_isoparametrization.so
lib/meshlab/plugins/libfilter_layer.so
lib/meshlab/plugins/libfilter_measure.so
lib/meshlab/plugins/libfilter_meshing.so
lib/meshlab/plugins/libfilter_mls.so
lib/meshlab/plugins/libfilter_mutualinfo.so
lib/meshlab/plugins/libfilter_photosynth.so
lib/meshlab/plugins/libfilter_plymc.so
lib/meshlab/plugins/libfilter_poisson.so
lib/meshlab/plugins/libfilter_qhull.so
lib/meshlab/plugins/libfilter_quality.so
lib/meshlab/plugins/libfilter_sampling.so
lib/meshlab/plugins/libfilter_sdfgpu.so
lib/meshlab/plugins/libfilter_select.so
lib/meshlab/plugins/libfilter_slice.so
lib/meshlab/plugins/libfilter_ssynth.so
lib/meshlab/plugins/libfilter_texture.so
lib/meshlab/plugins/libfilter_trioptimize.so
@ -49,7 +58,7 @@ 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_epoch.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