[meshlab/f15] update to upstream 1.3.0a
Eric Smith
brouhaha at fedoraproject.org
Thu Aug 4 05:13:34 UTC 2011
commit 19e047f03d7752af56589695ea530e4b1dca0cfb
Author: Eric Smith <eric at brouhaha.com>
Date: Wed Aug 3 23:13:22 2011 -0600
update to upstream 1.3.0a
meshlab-1.2.3a-plugin-path.patch | 12 ++
meshlab-1.3.0a-cstddef.patch | 45 +++++
meshlab-1.3.0a-ply-numeric.patch | 28 ++++
meshlab-1.3.0a-shader-path.patch | 60 +++++++
meshlab-1.3.0a-sharedlib.patch | 332 ++++++++++++++++++++++++++++++++++++++
meshlab-gcc45.patch | 19 ---
meshlab-plugin-path.patch | 12 --
meshlab-shader-path.patch | 67 --------
meshlab-sharedlib.patch | 282 --------------------------------
meshlab-vcglib-namespace.patch | 12 --
meshlab.spec | 97 ++++++++----
sources | 1 +
12 files changed, 547 insertions(+), 420 deletions(-)
---
diff --git a/meshlab-1.2.3a-plugin-path.patch b/meshlab-1.2.3a-plugin-path.patch
new file mode 100644
index 0000000..4edb6ba
--- /dev/null
+++ b/meshlab-1.2.3a-plugin-path.patch
@@ -0,0 +1,12 @@
+diff -up meshlab-1.2.3a/meshlab/src/common/pluginmanager.cpp.plugin-path meshlab-1.2.3a/meshlab/src/common/pluginmanager.cpp
+--- meshlab-1.2.3a/meshlab/src/common/pluginmanager.cpp.plugin-path 2010-04-28 00:30:57.000000000 -0700
++++ meshlab-1.2.3a/meshlab/src/common/pluginmanager.cpp 2011-01-30 19:46:12.000000000 -0800
+@@ -98,7 +98,7 @@ QString PluginManager::getBaseDirPath()
+
+ QString PluginManager::getPluginDirPath()
+ {
+- QDir pluginsDir(getBaseDirPath());
++ QDir pluginsDir(QString(PLUGIN_DIR));
+ 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.");
diff --git a/meshlab-1.3.0a-cstddef.patch b/meshlab-1.3.0a-cstddef.patch
new file mode 100644
index 0000000..8b5fc1f
--- /dev/null
+++ b/meshlab-1.3.0a-cstddef.patch
@@ -0,0 +1,45 @@
+From: Teemu Ikonen <tpikonen at gmail.com>
+Subject: Include <cstddef> on files using offsetoff (closes: #625053)
+X-git-branch: p/cstddef
+
+ vcglib/wrap/io_tetramesh/import_ply.h | 1 +
+ vcglib/wrap/io_trimesh/import_ply.h | 1 +
+ vcglib/wrap/ply/plystuff.h | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/vcglib/wrap/io_tetramesh/import_ply.h b/vcglib/wrap/io_tetramesh/import_ply.h
+index 0da4c1f..8370e48 100644
+--- a/vcglib/wrap/io_tetramesh/import_ply.h
++++ b/vcglib/wrap/io_tetramesh/import_ply.h
+@@ -36,6 +36,7 @@ created
+ #include<wrap/ply/io_mask.h>
+ #include<wrap/io_tetramesh/io_ply.h>
+ #include<vcg/complex/tetramesh/allocate.h>
++#include <cstddef>
+
+
+
+diff --git a/vcglib/wrap/io_trimesh/import_ply.h b/vcglib/wrap/io_trimesh/import_ply.h
+index 249a417..0e8c4dc 100644
+--- a/vcglib/wrap/io_trimesh/import_ply.h
++++ b/vcglib/wrap/io_trimesh/import_ply.h
+@@ -157,6 +157,7 @@ Initial commit
+ #include<vcg/complex/trimesh/create/platonic.h>
+ #include<vcg/space/color4.h>
+ #include <vector>
++#include <cstddef>
+
+ namespace vcg {
+ namespace tri {
+diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
+index 3e41e63..4761e9f 100644
+--- a/vcglib/wrap/ply/plystuff.h
++++ b/vcglib/wrap/ply/plystuff.h
+@@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching support for ply files. First working vers
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <cstddef>
+ #ifdef WIN32
+ #include <io.h>
+ #endif
diff --git a/meshlab-1.3.0a-ply-numeric.patch b/meshlab-1.3.0a-ply-numeric.patch
new file mode 100644
index 0000000..d9060ac
--- /dev/null
+++ b/meshlab-1.3.0a-ply-numeric.patch
@@ -0,0 +1,28 @@
+From: Teemu Ikonen <tpikonen at gmail.com>
+Subject: Fix reading of .ply files in locales in comma separator locales
+X-git-branch: p/ply_numeric
+
+ meshlab/src/meshlab/main.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/meshlab/src/meshlab/main.cpp b/meshlab/src/meshlab/main.cpp
+index 6a74830..1fd1c18 100644
+--- a/meshlab/src/meshlab/main.cpp
++++ b/meshlab/src/meshlab/main.cpp
+@@ -25,12 +25,16 @@
+ #include <QMessageBox>
+ #include "mainwindow.h"
+
++using namespace std;
++
+ int main(int argc, char *argv[])
+ {
+ QApplication app(argc, argv);
+ QLocale::setDefault(QLocale::C);
+ QCoreApplication::setOrganizationName("VCG");
+ QCoreApplication::setApplicationName("MeshLab");
++
++ std::setlocale(LC_NUMERIC, "C");
+
+ if(argc>1)
+ {
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<QAction*> 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 <stdio.h>
+ #include <stdlib.h>
+-#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 <qhull/qhull.h>
++#include <qhull/mem.h>
++#include <qhull/qset.h>
++#include <qhull/geom.h>
++#include <qhull/merge.h>
++#include <qhull/poly.h>
++#include <qhull/io.h>
++#include <qhull/stat.h>
+ #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 <local_parametrization.h>
+ #include <mesh_operators.h>
+-#include <lm.h>
++#include <levmar.h>
+ #include <uv_grid.h>
+
+ #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 <vcg/space/color4.h>
+ #include <dual_coord_optimization.h>
+ #include <float.h>
+-#include <lm.h>
++#include <levmar.h>
+ #ifndef _MESHLAB
+ #include <wrap/io_trimesh/export_ply.h>
+ #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.spec b/meshlab.spec
index fa720cf..2fb343e 100644
--- a/meshlab.spec
+++ b/meshlab.spec
@@ -1,24 +1,29 @@
Summary: A system for processing and editing unstructured 3D triangular meshes
Name: meshlab
-Version: 1.2.2
-Release: 6%{?dist}
-URL: http://meshlab.sourceforge.net/
+Version: 1.3.0a
+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
-Patch1: meshlab-plugin-path.patch
-Patch2: meshlab-shader-path.patch
+Patch0: meshlab-1.3.0a-sharedlib.patch
+Patch1: meshlab-1.2.3a-plugin-path.patch
+Patch2: meshlab-1.3.0a-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
+# Patch to fix FTBFS due to missing include
+# from Teemu Ikonen <tpikonen at gmail.com>
+Patch3: meshlab-1.3.0a-cstddef.patch
-# Remove direct invocation of constructors to make GCC 4.5 happy
-Patch4: meshlab-gcc45.patch
+# Patch to fix reading of .ply files in comma separator locales
+# from Teemu Ikonen <tpikonen at gmail.com>
+Patch4: meshlab-1.3.0a-ply-numeric.patch
License: GPLv2+ and BSD
Group: Applications/Multimedia
@@ -43,12 +48,18 @@ 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
+%patch -P 3 -p1 -b .ply-numeric
+%patch -P 4 -p1 -b .cstddef
# Turn of execute permissions on source files to avoid rpmlint
# errors and warnings for the debuginfo package
@@ -58,14 +69,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 +110,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,15 +176,21 @@ 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
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Aug 03 2011 Eric Smith <eric at brouhaha.com> - 1.3.0a-1
+- update to latest upstream release
+- added patch from Teemu Ikonen to fix FTBFS
+- added patch from Teemu Ikonen to fix reading of .ply files in comma
+ separator locales
+
+* Tue Oct 05 2010 jkeating - 1.2.2-5.1
+- Rebuilt for gcc bug 634757
* Fri Sep 10 2010 Eric Smith <eric at brouhaha.com> - 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
More information about the scm-commits
mailing list