From 663cfdadad4164a9adf5f1a8a891a891aad0d3a3 Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Aug 04 2011 01:57:06 +0000 Subject: Updated to latest upstream. --- diff --git a/.gitignore b/.gitignore index f818290..4e3cc27 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ MeshLabSrc_v122.tar.gz +/MeshLabSrc_AllInc_v130a.tgz diff --git a/meshlab-1.3.0a-shader-path.patch b/meshlab-1.3.0a-shader-path.patch new file mode 100644 index 0000000..bf73fef --- /dev/null +++ b/meshlab-1.3.0a-shader-path.patch @@ -0,0 +1,60 @@ +diff -up meshlab-1.3.0/meshlab/src/fgt/render_rfx/render_rfx.cpp.shader-path meshlab-1.3.0/meshlab/src/fgt/render_rfx/render_rfx.cpp +--- meshlab-1.3.0/meshlab/src/fgt/render_rfx/render_rfx.cpp.shader-path 2011-01-25 00:49:30.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/fgt/render_rfx/render_rfx.cpp 2011-08-03 16:48:05.000000000 -0600 +@@ -55,7 +55,7 @@ QList 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 -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp +--- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path 2011-01-25 00:50:07.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp 2011-08-03 16:48:05.000000000 -0600 +@@ -808,7 +808,7 @@ void AmbientOcclusionPlugin::applyOcclus + + void AmbientOcclusionPlugin::set_shaders(char *shaderName, GLuint &v, GLuint &f, GLuint &pr) + { +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++ QDir shadersDir = QDir("/usr/share/meshlab"); + + + #if defined(Q_OS_WIN) +diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp +--- meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path 2011-01-25 00:50:00.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2011-08-03 16:48:05.000000000 -0600 +@@ -39,7 +39,7 @@ void MeshShaderRenderPlugin::initActionL + 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 -up meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp +--- meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path 2011-01-25 00:50:00.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp 2011-08-03 16:48:05.000000000 -0600 +@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int + 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 -up meshlab-1.3.0/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp +--- meshlab-1.3.0/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path 2011-01-25 00:50:00.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp 2011-08-03 16:48:05.000000000 -0600 +@@ -123,7 +123,7 @@ void Dialog::changeTexturePath(int i) { + void Dialog::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-1.3.0a-sharedlib.patch b/meshlab-1.3.0a-sharedlib.patch new file mode 100644 index 0000000..d746bb9 --- /dev/null +++ b/meshlab-1.3.0a-sharedlib.patch @@ -0,0 +1,332 @@ +diff -up meshlab-1.3.0/meshlab/src/common/common.pro.sharedlib meshlab-1.3.0/meshlab/src/common/common.pro +--- meshlab-1.3.0/meshlab/src/common/common.pro.sharedlib 2011-01-25 00:49:48.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/common/common.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -1,7 +1,4 @@ + VCGDIR = ../../../vcglib +-GLEWDIR = ../external/glew-1.5.1 +-GLEWCODE = $$GLEWDIR/src/glew.c +- + + win32-msvc2005:DESTDIR = ../distrib + win32-msvc2008:DESTDIR = ../distrib +@@ -34,15 +31,10 @@ mkdir ../distrib/meshlab.app/Contents/Ma + fi; \ + cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/" + INCLUDEPATH *= ../.. \ +- $$VCGDIR \ +- $$GLEWDIR/include ++ $$VCGDIR + TEMPLATE = lib + linux-g++:CONFIG += dll + linux-g++:DESTDIR = ../distrib +-linux-g++-32:CONFIG += dll +-linux-g++-32:DESTDIR = ../distrib +-linux-g++-64:CONFIG += dll +-linux-g++-64:DESTDIR = ../distrib + + win32-msvc2005:CONFIG += staticlib + win32-msvc2008:CONFIG += staticlib +@@ -56,7 +48,6 @@ QT += script + TARGET = + DEPENDPATH += . + INCLUDEPATH += . +-DEFINES += GLEW_STATIC + win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS + +@@ -83,5 +74,4 @@ SOURCES += filterparameter.cpp \ + scriptinterface.cpp \ + mlparameter.cpp \ + xmlfilterinfo.cpp \ +- $$GLEWCODE \ + meshlabdocumentxml.cpp +diff -up meshlab-1.3.0/meshlab/src/external/external.pro.sharedlib meshlab-1.3.0/meshlab/src/external/external.pro +--- meshlab-1.3.0/meshlab/src/external/external.pro.sharedlib 2011-01-25 00:49:46.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/external/external.pro 2011-08-03 17:18:55.000000000 -0600 +@@ -2,9 +2,5 @@ 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 \ +- structuresynth/structuresynth.pro ++SUBDIRS = structuresynth/structuresynth.pro + # openkinect/openkinect.pro +diff -up meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro +--- meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib 2011-01-25 00:49:30.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -6,15 +6,11 @@ SOURCES += filter_func.cpp + + TARGET = filter_func + +-INCLUDEPATH += ../../external/muparser_v132/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 + macx:LIBS += ../../external/lib/macx/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 -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro +--- meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib 2011-01-25 00:49:27.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -8,28 +8,8 @@ HEADERS += filter_qhull.h \ + 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 ++INCLUDEPATH += /usr/include/qhull + +-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 +\ No newline at end of file ++TARGET = filter_qhull +diff -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h +--- meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib 2011-01-25 00:49:27.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h 2011-08-03 17:14:44.000000000 -0600 +@@ -55,14 +55,14 @@ extern "C" + #endif + #include + #include +-#include "../../external/qhull-2003.1/src/qhull.h" +-#include "../../external/qhull-2003.1/src/mem.h" +-#include "../../external/qhull-2003.1/src/qset.h" +-#include "../../external/qhull-2003.1/src/geom.h" +-#include "../../external/qhull-2003.1/src/merge.h" +-#include "../../external/qhull-2003.1/src/poly.h" +-#include "../../external/qhull-2003.1/src/io.h" +-#include "../../external/qhull-2003.1/src/stat.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #if defined(__cplusplus) + } + #endif +diff -up meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro +--- meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro.sharedlib 2011-02-15 02:39:47.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -1,5 +1,4 @@ + VCGDIR = ../../../vcglib +-GLEWDIR = ../external/glew-1.5.1 + #CONFIG += debug_and_release + DESTDIR = ../distrib + +@@ -7,8 +6,7 @@ DESTDIR = ../distrib + # DEFINES += VCG_USE_EIGEN + # CONFIG += warn_off + INCLUDEPATH *= ../.. \ +- $$VCGDIR \ +- $$GLEWDIR/include ++ $$VCGDIR + DEPENDPATH += $$VCGDIR \ + $$VCGDIR/vcg \ + $$VCGDIR/wrap +@@ -107,8 +105,7 @@ mac:QMAKE_CXX = g++-4.2 + + INCLUDEPATH += . \ + .. \ +- ../../../vcglib \ +- $$GLEWDIR/include ++ ../../../vcglib + CONFIG += stl + + macx:LIBS += ../common/libcommon.dylib +@@ -128,12 +125,8 @@ win32-g++:LIBS += -L../distrib - + # win32-g++:release:LIBS += -L../common/release -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 + + + # uncomment in your local copy only in emergency cases. +diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro +--- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-01-25 00:50:05.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -23,8 +23,7 @@ HEADERS += ./diamond_sampler.h \ + SOURCES += ./filter_isoparametrization.cpp + + TARGET = filter_isoparametrization +-INCLUDEPATH += ./ \ +- ../../external/levmar-2.3/ ++INCLUDEPATH += ./ + + win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP + win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP +@@ -41,9 +40,7 @@ win32-msvc.net:LIBS += ../../external/li + win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib + win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib + win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar +-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar +-linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar +-linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar ++linux-g++:LIBS += -llevmar + macx:LIBS += ../../../src/external/lib/macx/liblevmar.a + + # Please never ever uncomment this... +diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h +--- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-01-25 00:50:05.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2011-08-03 17:14:44.000000000 -0600 +@@ -14,7 +14,7 @@ + + #include + #include +-#include ++#include + #include + + #include "opt_patch.h" +diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h +--- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-01-25 00:50:05.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2011-08-03 17:14:44.000000000 -0600 +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #ifndef _MESHLAB + #include + #endif +diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro +--- meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-01-25 00:49:55.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -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/li + 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 -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro +--- meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2011-01-25 00:50:02.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -30,16 +30,11 @@ QT += xml + 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 + + mac:LIBS += -lbz2 + +diff -up meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro +--- meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-01-25 00:49:46.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro 2011-08-03 17:14:44.000000000 -0600 +@@ -1,5 +1,3 @@ +-GLEWDIR = ../external/glew-1.5.1 +- + HEADERS = + + SOURCES = mainserver.cpp +@@ -25,12 +23,8 @@ win32-msvc2005: LIBS += -L../distrib -l + 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 + # win32-msvc2008:release: LIBS += -L../common/release -lcommon +@@ -43,7 +37,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC + + #DEFINES += GLEW_STATIC + +-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include ++INCLUDEPATH += . .. ../../../vcglib + CONFIG += stl + CONFIG += console + +diff -up meshlab-1.3.0/meshlab/src/shared.pri.sharedlib meshlab-1.3.0/meshlab/src/shared.pri +--- meshlab-1.3.0/meshlab/src/shared.pri.sharedlib 2011-01-25 00:50:20.000000000 -0700 ++++ meshlab-1.3.0/meshlab/src/shared.pri 2011-08-03 17:14:44.000000000 -0600 +@@ -8,7 +8,6 @@ QT += xmlpatterns + QT += script + + VCGDIR = ../../../../vcglib +-GLEWDIR = ../../external/glew-1.5.1 + + mac:LIBS += ../../common/libcommon.dylib + +@@ -34,7 +33,7 @@ win32-msvc2008:DEFINES += GLEW_STATIC + # DEFINES += VCG_USE_EIGEN + # CONFIG += warn_off + +-INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include ++INCLUDEPATH *= ../.. $$VCGDIR /usr/include/GLEW + DEPENDPATH += $$VCGDIR + + # Uncomment these if you want to experiment with newer gcc compilers +@@ -73,4 +72,4 @@ contains(TEMPLATE,lib) { + + + win32-msvc2005: RCC_DIR = $(ConfigurationName) +- win32-msvc2008: RCC_DIR = $(ConfigurationName) +\ No newline at end of file ++ win32-msvc2008: RCC_DIR = $(ConfigurationName) diff --git a/meshlab-gcc45.patch b/meshlab-gcc45.patch deleted file mode 100644 index c93f718..0000000 --- a/meshlab-gcc45.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp.gcc45 meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp ---- meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp.gcc45 2010-09-10 19:04:04.955733001 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlab/filterparameter.cpp 2010-09-10 19:17:12.800733003 -0700 -@@ -535,7 +535,7 @@ void RichParameterFactory::create( const - - if(type=="RichEnum") - { -- QStringList list = QStringList::QStringList(); -+ QStringList list = QStringList(); - unsigned int enum_card = np.attribute(QString("enum_cardinality")).toUInt(); - - for(int i=0;i RenderRFX::actions() - - void RenderRFX::initActionList() - { -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = QDir("/usr/share/meshlab"); - - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path 2010-02-02 19:12:32.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp 2010-02-02 19:13:24.000000000 -0800 -@@ -818,7 +818,7 @@ void AmbientOcclusionPlugin::applyOcclus - - void AmbientOcclusionPlugin::set_shaders(char *shaderName, GLuint &v, GLuint &f, GLuint &pr) - { -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = QDir("/usr/share/meshlab"); - - - #if defined(Q_OS_WIN) -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path 2010-02-02 19:23:58.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2010-02-02 19:24:20.000000000 -0800 -@@ -110,7 +110,7 @@ void MeshShaderRenderPlugin::initActionL - 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 -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path 2010-02-02 19:27:14.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp 2010-02-02 19:27:52.000000000 -0800 -@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int - 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(); -@@ -372,4 +372,4 @@ void ShaderDialog::reloadTexture(int i) - glTexParameteri( shaderInfo->textureInfo[i].Target, GL_TEXTURE_WRAP_R, shaderInfo->textureInfo[i].WrapR ); - - glarea->updateGL(); --} -\ No newline at end of file -+} -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path 2010-02-02 19:15:34.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp 2010-02-02 19:16:07.000000000 -0800 -@@ -123,7 +123,7 @@ void Dialog::changeTexturePath(int i) { - void Dialog::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-sharedlib.patch b/meshlab-sharedlib.patch deleted file mode 100644 index 60b1d40..0000000 --- a/meshlab-sharedlib.patch +++ /dev/null @@ -1,282 +0,0 @@ -diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro ---- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib 2009-05-20 08:27:47.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -7,7 +7,7 @@ SOURCES = filter_func.cpp\ - - TARGET = filter_func - --INCLUDEPATH += ../../external/muparser_v130/include -+INCLUDEPATH += - - # Note: we need static libs so when building muparser lib use - # ./configure --enable-shared=no -@@ -15,5 +15,5 @@ INCLUDEPATH += ../../external/muparser_v - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib - macx:LIBS += ../../external/lib/macx/libmuparser.a --linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a -+linux-g++:LIBS += -lmuparser - win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a -\ No newline at end of file -diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro ---- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib 2009-03-05 16:09:52.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -12,29 +12,8 @@ SOURCES = filter_qhull.cpp \ - ../../meshlab/filterparameter.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 -+INCLUDEPATH += /usr/include/qhull - --SOURCES += ../../external/qhull-2003.1/src/geom.c \ -- ../../external/qhull-2003.1/src/geom2.c \ -- $$GLEWCODE \ -- ../../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 -\ No newline at end of file -diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h ---- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib 2009-05-30 09:08:03.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h 2010-01-26 17:22:25.000000000 -0800 -@@ -55,14 +55,14 @@ extern "C" - #endif - #include - #include --#include "../../external/qhull-2003.1/src/qhull.h" --#include "../../external/qhull-2003.1/src/mem.h" --#include "../../external/qhull-2003.1/src/qset.h" --#include "../../external/qhull-2003.1/src/geom.h" --#include "../../external/qhull-2003.1/src/merge.h" --#include "../../external/qhull-2003.1/src/poly.h" --#include "../../external/qhull-2003.1/src/io.h" --#include "../../external/qhull-2003.1/src/stat.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #if defined(__cplusplus) - } - #endif -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro.sharedlib 2009-07-06 09:45:12.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -1,13 +1,11 @@ - VCGDIR = ../../../vcglib --GLEWDIR = ../external/glew-1.5.1 --GLEWCODE = $$GLEWDIR/src/glew.c --DEFINES *= GLEW_STATIC -+LIBS += -lGLEW - CONFIG += debug_and_release precompile_header - # uncomment to try Eigen - # DEFINES += VCG_USE_EIGEN - # CONFIG += warn_off - --INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include -+INCLUDEPATH *= ../.. $$VCGDIR - DEPENDPATH += $$VCGDIR $$VCGDIR/vcg $$VCGDIR/wrap - - PRECOMPILED_HEADER = mainwindow.h -@@ -51,8 +49,7 @@ SOURCES = main.cpp \ - changetexturename.cpp \ - stdpardialog.cpp \ - $$VCGDIR/wrap/gui/trackball.cpp\ -- $$VCGDIR/wrap/gui/trackmode.cpp \ -- $$GLEWCODE -+ $$VCGDIR/wrap/gui/trackmode.cpp - - FORMS = ui/layerDialog.ui \ - ui/filterScriptDialog.ui \ -@@ -102,9 +99,7 @@ mac:QMAKE_CXX=g++-4.2 - # macx-g++:QMAKE_CXXFLAGS_RELEASE -= -Os - # macx-g++:QMAKE_CXXFLAGS_RELEASE += -O3 - --DEFINES += GLEW_STATIC -- --INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include -+INCLUDEPATH += . .. ../../../vcglib - CONFIG += stl - - # uncomment in your local copy only in emergency cases. -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro.sharedlib 2009-05-18 08:12:15.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -30,7 +30,6 @@ SOURCES += edit_phototex_factory.cpp \ - src/QuadTree/QuadTreeNode.cpp \ - $$VCGDIR/wrap/gui/trackball.cpp\ - $$VCGDIR/wrap/gui/trackmode.cpp \ -- $$GLEWDIR/src/glew.c \ - ../../meshlab/filterparameter.cpp \ - ../../meshlab/stdpardialog.cpp - -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2010-01-26 17:53:15.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2010-01-26 17:53:44.000000000 -0800 -@@ -28,8 +28,7 @@ SOURCES = ./filter_isoparametrizat - $$GLEWCODE - - TARGET = filter_isoparametrization --INCLUDEPATH += ./ \ -- ../../external/levmar-2.3/ -+INCLUDEPATH += ./ - - win32-msvc2005:QMAKE_CXXFLAGS += /openmp - win32-msvc2008:QMAKE_CXXFLAGS += /openmp -@@ -40,7 +39,7 @@ win32-msvc.net:LIBS += ../../external/li - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib - win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar --linux-g++:LIBS += -L../../external/lib/win32-gcc -llevmar -+linux-g++:LIBS += -llevmar - macx:LIBS += ../../external/lib/macx/liblevmar.a - - QMAKE_CXXFLAGS += -fpermissive -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2010-01-26 17:51:30.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2010-01-26 17:51:56.000000000 -0800 -@@ -12,7 +12,7 @@ - #include - #include - #include --#include -+#include - #include - #include "opt_patch.h" - #include "local_optimization.h" -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2010-01-26 17:51:37.000000000 -0800 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2010-01-26 17:52:11.000000000 -0800 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - //#include - -@@ -914,4 +914,4 @@ public: - - }; - --#endif -\ No newline at end of file -+#endif -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2009-07-06 09:45:12.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -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,7 +25,7 @@ win32-msvc.net:LIBS += ../../external/li - 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++:LIBS += -l3ds - - # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds - -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2009-09-01 01:33:26.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -31,12 +31,12 @@ QT += xml - 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++: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++:INCLUDEPATH += - - mac:LIBS += -lbz2 - unix:LIBS += -lbz2 -diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro ---- meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2009-05-20 07:51:45.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro 2010-01-26 17:22:25.000000000 -0800 -@@ -1,5 +1,4 @@ --GLEWDIR = ../external/glew-1.5.1 --GLEWCODE = $$GLEWDIR/src/glew.c -+LIBS += -lGLEW - - HEADERS = ../meshlab/interfaces.h \ - ../meshlab/meshmodel.h \ -@@ -10,8 +9,7 @@ SOURCES = mainserver.cpp \ - ../meshlab/meshmodel.cpp \ - ../meshlab/filterscript.cpp \ - ../meshlab/filterparameter.cpp \ -- ../meshlab/plugin_support.cpp \ -- $$GLEWCODE -+ ../meshlab/plugin_support.cpp - - # to add windows icon - RC_FILE = ../meshlab/meshlab.rc -@@ -22,11 +20,9 @@ QT += xml opengl - # the awful min/max macros of windows and the limits max - win32:DEFINES += NOMINMAX - --DEFINES += GLEW_STATIC -- --INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include -+INCLUDEPATH += . .. ../../../vcglib - CONFIG += stl - CONFIG += console - - # Mac specific Config required to avoid to make application bundles --CONFIG -= app_bundle -\ No newline at end of file -+CONFIG -= app_bundle -diff -up meshlab-snapshot-svn3524/meshlab/src/shared.pri.sharedlib meshlab-snapshot-svn3524/meshlab/src/shared.pri ---- meshlab-snapshot-svn3524/meshlab/src/shared.pri.sharedlib 2009-07-07 08:12:05.000000000 -0700 -+++ meshlab-snapshot-svn3524/meshlab/src/shared.pri 2010-01-26 17:22:25.000000000 -0800 -@@ -6,15 +6,14 @@ CONFIG += plugin - QT += xml - - VCGDIR = ../../../../vcglib --GLEWDIR = ../../external/glew-1.5.1 --GLEWCODE = $$GLEWDIR/src/glew.c --DEFINES *= GLEW_STATIC -+GLEWCODE = -+LIBS += -lGLEW - - # uncomment to try Eigen - # DEFINES += VCG_USE_EIGEN - # CONFIG += warn_off - --INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include -+INCLUDEPATH *= ../.. $$VCGDIR /usr/include/GL - - # Uncomment these if you want to experiment with newer gcc compilers - # (here using the one provided with macports) diff --git a/meshlab-vcglib-namespace.patch b/meshlab-vcglib-namespace.patch deleted file mode 100644 index 3ca143e..0000000 --- a/meshlab-vcglib-namespace.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr meshlab-snapshot-svn3524.orig/vcglib/vcg/complex/trimesh/hole.h meshlab-snapshot-svn3524/vcglib/vcg/complex/trimesh/hole.h ---- meshlab-snapshot-svn3524.orig/vcglib/vcg/complex/trimesh/hole.h 2008-11-26 09:58:15.000000000 -0800 -+++ meshlab-snapshot-svn3524/vcglib/vcg/complex/trimesh/hole.h 2010-01-22 14:04:28.000000000 -0800 -@@ -201,7 +201,7 @@ - assert(e0.IsBorder()); - e1=e0; - e1.NextB(); -- n=Normal(*this); -+ n=vcg::Normal(*this); - ComputeQuality(); - ComputeAngle(); - } diff --git a/meshlab.spec b/meshlab.spec index 2befb1c..ffa5f37 100644 --- a/meshlab.spec +++ b/meshlab.spec @@ -1,24 +1,21 @@ Summary: A system for processing and editing unstructured 3D triangular meshes Name: meshlab -Version: 1.2.2 -Release: 7%{?dist} -URL: http://meshlab.sourceforge.net/ +Version: 1.3.0 +Release: 1%{?dist} +URL: http://meshlab.sourceforge.net/` -Source0: http://downloads.sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/MeshLabSrc_AllInc_v130a.tgz Source1: meshlab-48x48.xpm +# Meshlab v130a tarball is missing the docs directory. Reported upstream, +# but for now we'll extract them from the v122 tarball. +Source2: http://downloads/sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz + # Fedora-specific patches to use shared libraries, and to put plugins and # shaders in appropriate directories -Patch0: meshlab-sharedlib.patch +Patch0: meshlab-1.3.0a-sharedlib.patch Patch1: meshlab-plugin-path.patch -Patch2: meshlab-shader-path.patch - -# patch to fix C++ namespace conflict -# http://sourceforge.net/tracker/?func=detail&aid=2872526&group_id=149444&atid=774731 -Patch3: meshlab-vcglib-namespace.patch - -# Remove direct invocation of constructors to make GCC 4.5 happy -Patch4: meshlab-gcc45.patch +Patch2: meshlab-1.3.0a-shader-path.patch License: GPLv2+ and BSD Group: Applications/Multimedia @@ -43,12 +40,16 @@ for editing, cleaning, healing, inspecting, rendering and converting these kinds of meshes. %prep -%setup -q -n meshlab-snapshot-svn3524 +%setup -q -c %{name}-%{version} + +# get the missing docs directory from the old tarball +%setup -q -T -D -a 2 +mv meshlab-snapshot-svn3524/meshlab/docs meshlab/docs +rm -rf meshlab-snapshot-svn3524 + %patch -P 0 -p1 -b .sharedlib %patch -P 1 -p1 -b .plugin-path %patch -P 2 -p1 -b .shader-path -%patch -P 3 -p1 -b .vcglib-namespace -%patch -P 4 -p1 -b .gcc45 # Turn of execute permissions on source files to avoid rpmlint # errors and warnings for the debuginfo package @@ -58,14 +59,18 @@ find . \( -name *.h -o -name *.cpp -o -name *.inl \) -a -executable \ # Remove bundled library sources, since we use the Fedora packaged # libraries rm -rf vcglib/wrap/system +rm -rf meshlab/src/external/{ann*,bzip2*,glew*,levmar*,lib3ds*,muparser*,ode*,qhull*} %build # Build instructions from the wiki: # http://meshlab.sourceforge.net/wiki/index.php/Compiling_V122 # Note that the build instructions in README.linux are out of date. -cd meshlab/src -%{_qt4_qmake} -recursive meshlabv12.pro +cd meshlab/src/external +%{_qt4_qmake} -recursive external.pro +make %{?_smp_mflags} CFLAGS="%{optflags}" +cd .. +%{_qt4_qmake} -recursive meshlab_full.pro make %{?_smp_mflags} CFLAGS="%{optflags}" \ DEFINES="-D__DISABLE_AUTO_STATS__ -DPLUGIN_DIR=\\\"%{_libdir}/%{name}\\\"" @@ -95,35 +100,55 @@ done %install rm -rf %{buildroot} + install -d -m 755 %{buildroot}%{_bindir} -install -p -m 755 meshlab/src/meshlab/meshlab \ - meshlab/src/meshlabserver/meshlabserver \ +install -p -m 755 meshlab/src/distrib/meshlab \ + meshlab/src/distrib/meshlabserver \ %{buildroot}%{_bindir} + install -d -m 755 %{buildroot}%{_mandir}/man1 install -p -m 644 meshlab/docs/meshlab.1 \ meshlab/docs/meshlabserver.1 \ %{buildroot}%{_mandir}/man1 + +install -d -m 755 %{buildroot}%{_libdir}/meshlab +install -p -m 755 meshlab/src/distrib/libcommon.so.1.0.0 \ + %{buildroot}%{_libdir}/meshlab +ln -s libcommon.so.1.0.0 %{buildroot}%{_libdir}/meshlab/libcommon.so.1.0 +ln -s libcommon.so.1.0.0 %{buildroot}%{_libdir}/meshlab/libcommon.so.1 +ln -s libcommon.so.1.0.0 %{buildroot}%{_libdir}/meshlab/libcommon.so + install -d -m 755 %{buildroot}%{_libdir}/meshlab/plugins -install -p -m 755 meshlab/src/meshlab/plugins/*.so \ +install -p -m 755 meshlab/src/distrib/plugins/*.so \ %{buildroot}%{_libdir}/meshlab/plugins + install -d -m 755 %{buildroot}%{_datadir}/meshlab/shaders -install -p -m 644 meshlab/src/meshlab/shaders/*.{frag,gdp,vert} \ +install -p -m 644 meshlab/src/distrib/shaders/*.{frag,gdp,vert} \ %{buildroot}%{_datadir}/meshlab/shaders -install -d -m 755 %{buildroot}%{_datadir}/meshlab/shadersrm -install -p -m 644 meshlab/src/meshlab/shadersrm/*.rfx \ - %{buildroot}%{_datadir}/meshlab/shadersrm + +install -d -m 755 %{buildroot}%{_datadir}/meshlab/shaders/shadersrm +install -p -m 644 meshlab/src/distrib/shaders/shadersrm/*.rfx \ + %{buildroot}%{_datadir}/meshlab/shaders/shadersrm + install -d -m 755 %{buildroot}%{_datadir}/meshlab/textures + install -d -m 755 %{buildroot}%{_datadir}/pixmaps install -p -m 644 meshlab/src/meshlab.png \ %{buildroot}%{_datadir}/pixmaps + install -d -m 755 %{buildroot}%{_datadir}/applications install -p -m 644 meshlab/src/meshlab.desktop \ %{buildroot}%{_datadir}/applications + desktop-file-validate %{buildroot}%{_datadir}/applications/meshlab.desktop %clean rm -rf %{buildroot} +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) %{_bindir}/meshlab @@ -141,18 +166,18 @@ rm -rf %{buildroot} %doc meshlab/docs/README.linux %doc meshlab/docs/readme.txt %doc meshlab/docs/ToDo.txt -%doc meshlab/src/meshlab/shaders/3Dlabs-license.txt -%doc meshlab/src/meshlab/shaders/LightworkDesign-license.txt +%doc meshlab/src/distrib/shaders/3Dlabs-license.txt +%doc meshlab/src/distrib/shaders/LightworkDesign-license.txt %doc meshlab/src/meshlabplugins/filter_poisson/license.txt %{_datadir}/applications/meshlab.desktop %{_datadir}/pixmaps/meshlab.png %changelog -* Mon Jun 20 2011 ajax@redhat.com - 1.2.2-7 -- Rebuild for new glew soname +* Wed Aug 03 2011 Eric Smith - 1.3.0-1 +- update to latest upstream release -* Tue Feb 08 2011 Fedora Release Engineering - 1.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Tue Oct 05 2010 jkeating - 1.2.2-5.1 +- Rebuilt for gcc bug 634757 * Fri Sep 10 2010 Eric Smith - 1.2.2-5 - Remove direct invocation of constructor to make GCC 4.5 happy diff --git a/sources b/sources index ad60494..20a558d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f06107dd01cbe0d6519dbb759ae84c11 MeshLabSrc_v122.tar.gz +46c14a0fce7bed03113d54807f3c19bc MeshLabSrc_AllInc_v130a.tgz