[meshlab] Update to 1.3.1 Rebase patches Add new patches to add needed includes and disable openctm support un
Orion Poplawski
orion at fedoraproject.org
Fri Oct 21 20:23:47 UTC 2011
commit 996b77ae4a691f6f004b371b73674303548f849d
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Oct 21 14:23:46 2011 -0600
Update to 1.3.1
Rebase patches
Add new patches to add needed includes and disable openctm support until
openctm is packaged
meshlab-1.3.0a-cstddef.patch | 45 ----
meshlab-1.3.0a-ply-numeric.patch | 28 --
meshlab-1.3.1-cstddef.patch | 33 +++
meshlab-1.3.1-glu.patch | 23 ++
meshlab-1.3.1-noctm.patch | 11 +
meshlab-1.3.1-ply-numeric.patch | 12 +
...r-path.patch => meshlab-1.3.1-shader-path.patch | 24 +--
...haredlib.patch => meshlab-1.3.1-sharedlib.patch | 262 ++++++++++----------
meshlab.spec | 30 ++-
sources | 2 +-
10 files changed, 237 insertions(+), 233 deletions(-)
---
diff --git a/meshlab-1.3.1-cstddef.patch b/meshlab-1.3.1-cstddef.patch
new file mode 100644
index 0000000..35a43be
--- /dev/null
+++ b/meshlab-1.3.1-cstddef.patch
@@ -0,0 +1,33 @@
+diff -up meshlab-1.3.1/vcglib/wrap/io_tetramesh/import_ply.h.cstddef meshlab-1.3.1/vcglib/wrap/io_tetramesh/import_ply.h
+--- meshlab-1.3.1/vcglib/wrap/io_tetramesh/import_ply.h.cstddef 2011-01-25 00:53:39.000000000 -0700
++++ meshlab-1.3.1/vcglib/wrap/io_tetramesh/import_ply.h 2011-10-21 14:02:55.553245328 -0600
+@@ -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 -up meshlab-1.3.1/vcglib/wrap/io_trimesh/import_ply.h.cstddef meshlab-1.3.1/vcglib/wrap/io_trimesh/import_ply.h
+--- meshlab-1.3.1/vcglib/wrap/io_trimesh/import_ply.h.cstddef 2011-07-29 11:40:13.000000000 -0600
++++ meshlab-1.3.1/vcglib/wrap/io_trimesh/import_ply.h 2011-10-21 14:03:33.629858444 -0600
+@@ -28,6 +28,7 @@
+ #include<wrap/io_trimesh/io_mask.h>
+ #include<wrap/io_trimesh/io_ply.h>
+ #include<vcg/complex/algorithms/create/platonic.h>
++#include<cstddef>
+
+ namespace vcg {
+ namespace tri {
+diff -up meshlab-1.3.1/vcglib/wrap/ply/plystuff.h.cstddef meshlab-1.3.1/vcglib/wrap/ply/plystuff.h
+--- meshlab-1.3.1/vcglib/wrap/ply/plystuff.h.cstddef 2011-01-25 00:53:42.000000000 -0700
++++ meshlab-1.3.1/vcglib/wrap/ply/plystuff.h 2011-10-21 14:02:55.555245256 -0600
+@@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching s
+ #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.1-glu.patch b/meshlab-1.3.1-glu.patch
new file mode 100644
index 0000000..63b1396
--- /dev/null
+++ b/meshlab-1.3.1-glu.patch
@@ -0,0 +1,23 @@
+diff -up meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp.glu meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
+--- meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp.glu 2011-06-06 01:48:49.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2011-10-21 13:33:56.119545281 -0600
+@@ -6,6 +6,7 @@
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "SyntopiaCore/Logging/Logging.h"
+ #include "SyntopiaCore/Misc/MiniParser.h"
++#include <GL/glu.h>
+
+ using namespace SyntopiaCore::Math;
+ using namespace SyntopiaCore::Misc;
+diff -up meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h.glu meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
+--- meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h.glu 2011-06-06 01:48:49.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2011-10-21 13:31:11.786431683 -0600
+@@ -2,6 +2,7 @@
+
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "Object3D.h"
++#include <GL/glu.h>
+
+ namespace SyntopiaCore {
+ namespace GLEngine {
+
diff --git a/meshlab-1.3.1-noctm.patch b/meshlab-1.3.1-noctm.patch
new file mode 100644
index 0000000..430eb28
--- /dev/null
+++ b/meshlab-1.3.1-noctm.patch
@@ -0,0 +1,11 @@
+diff -up meshlab-1.3.1/meshlab/src/meshlab_full.pro.noctm meshlab-1.3.1/meshlab/src/meshlab_full.pro
+--- meshlab-1.3.1/meshlab/src/meshlab_full.pro.noctm 2011-09-15 09:08:56.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlab_full.pro 2011-10-21 13:54:10.984358343 -0600
+@@ -9,7 +9,6 @@ SUBDIRS = common \
+ meshlabplugins/io_3ds\
+ meshlabplugins/io_bre\
+ meshlabplugins/io_collada \
+- meshlabplugins/io_ctm \
+ meshlabplugins/io_epoch \
+ meshlabplugins/io_json \
+ meshlabplugins/io_u3d\
diff --git a/meshlab-1.3.1-ply-numeric.patch b/meshlab-1.3.1-ply-numeric.patch
new file mode 100644
index 0000000..509a773
--- /dev/null
+++ b/meshlab-1.3.1-ply-numeric.patch
@@ -0,0 +1,12 @@
+diff -up meshlab-1.3.1/meshlab/src/meshlab/main.cpp.ply-numeric meshlab-1.3.1/meshlab/src/meshlab/main.cpp
+--- meshlab-1.3.1/meshlab/src/meshlab/main.cpp.ply-numeric 2011-09-14 04:42:55.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlab/main.cpp 2011-10-21 14:16:50.910980112 -0600
+@@ -31,6 +31,8 @@ int main(int argc, char *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.1-shader-path.patch
similarity index 60%
rename from meshlab-1.3.0a-shader-path.patch
rename to meshlab-1.3.1-shader-path.patch
index bf73fef..8aafcc7 100644
--- a/meshlab-1.3.0a-shader-path.patch
+++ b/meshlab-1.3.1-shader-path.patch
@@ -1,6 +1,6 @@
-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
+diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
+--- meshlab-1.3.0/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp.shader-path 2011-01-25 00:49:30.000000000 -0700
++++ meshlab-1.3.0/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2011-08-03 16:48:05.000000000 -0600
@@ -55,7 +55,7 @@ QList<QAction*> RenderRFX::actions()
void RenderRFX::initActionList()
@@ -10,18 +10,6 @@ diff -up meshlab-1.3.0/meshlab/src/fgt/render_rfx/render_rfx.cpp.shader-path mes
#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
@@ -46,9 +34,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.sh
#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
+diff -up meshlab-1.3.0/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp.shader-path meshlab-1.3.0/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp
+--- meshlab-1.3.0/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp.shader-path 2011-01-25 00:50:00.000000000 -0700
++++ meshlab-1.3.0/meshlab/src/plugins_experimental/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");
diff --git a/meshlab-1.3.0a-sharedlib.patch b/meshlab-1.3.1-sharedlib.patch
similarity index 78%
rename from meshlab-1.3.0a-sharedlib.patch
rename to meshlab-1.3.1-sharedlib.patch
index 2cd5968..6ad652c 100644
--- a/meshlab-1.3.0a-sharedlib.patch
+++ b/meshlab-1.3.1-sharedlib.patch
@@ -1,6 +1,6 @@
diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/meshlab/src/common/common.pro
---- meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib 2011-01-24 23:49:48.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/common/common.pro 2011-10-05 19:59:01.000000000 -0700
+--- meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib 2011-09-14 04:42:54.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/common/common.pro 2011-10-21 11:47:40.281026085 -0600
@@ -1,7 +1,4 @@
VCGDIR = ../../../vcglib
-GLEWDIR = ../external/glew-1.5.1
@@ -9,7 +9,7 @@ diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/mes
win32-msvc2005:DESTDIR = ../distrib
win32-msvc2008:DESTDIR = ../distrib
-@@ -34,15 +31,10 @@ mkdir ../distrib/meshlab.app/Contents/Ma
+@@ -36,15 +33,10 @@ mkdir ../distrib/meshlab.app/Contents/Ma
fi; \
cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/"
INCLUDEPATH *= ../.. \
@@ -26,7 +26,7 @@ diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/mes
win32-msvc2005:CONFIG += staticlib
win32-msvc2008:CONFIG += staticlib
-@@ -56,7 +48,6 @@ QT += script
+@@ -59,7 +51,6 @@ QT += script
TARGET =
DEPENDPATH += .
INCLUDEPATH += .
@@ -34,16 +34,18 @@ diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/mes
win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
-@@ -83,5 +74,4 @@ SOURCES += filterparameter.cpp \
+@@ -86,7 +77,6 @@ SOURCES += filterparameter.cpp \
scriptinterface.cpp \
- mlparameter.cpp \
xmlfilterinfo.cpp \
+ mlapplication.cpp \
- $$GLEWCODE \
meshlabdocumentxml.cpp
+
+ # win32-msvc2005: RCC_DIR = $(ConfigurationName)
diff -up meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib meshlab-1.3.1/meshlab/src/external/external.pro
---- meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib 2011-01-24 23:49:46.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/external/external.pro 2011-10-05 19:59:01.000000000 -0700
-@@ -2,9 +2,5 @@ config += debug_and_release
+--- meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib 2011-09-15 10:29:13.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/external/external.pro 2011-10-21 13:44:01.888567468 -0600
+@@ -2,10 +2,5 @@ config += debug_and_release
TEMPLATE = subdirs
@@ -51,13 +53,57 @@ diff -up meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib meshlab-1.3.1
- 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
+- structuresynth/structuresynth.pro \
+- OpenCTM-1.0.3/openctm.pro
++SUBDIRS = structuresynth/structuresynth.pro \
# openkinect/openkinect.pro
-diff -up meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro
---- meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib 2011-01-24 23:49:30.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro 2011-10-05 19:59:01.000000000 -0700
-@@ -6,15 +6,11 @@ SOURCES += filter_func.cpp
+diff -up meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro
+--- meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib 2011-06-06 01:47:12.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro 2011-10-21 13:39:02.054507411 -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 -lGLU
+ 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.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib 2011-06-06 01:47:26.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2011-10-21 11:47:40.282026049 -0600
+@@ -6,15 +6,11 @@ SOURCES += filter_func.cpp
TARGET = filter_func
@@ -74,9 +120,57 @@ diff -up meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib mes
-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.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro
---- meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro.sharedlib 2011-02-15 01:39:46.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro 2011-10-05 19:59:01.000000000 -0700
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-06-06 01:47:26.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-10-21 11:47:40.282026049 -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.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-06-23 01:25:10.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2011-10-21 11:47:40.283026013 -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.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-06-23 01:25:10.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2011-10-21 11:47:40.284025977 -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.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib 2011-06-06 01:47:13.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro 2011-10-21 11:47:40.284025977 -0600
@@ -1,17 +1,15 @@
include (../../shared.pri)
@@ -100,9 +194,9 @@ diff -up meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro.s
+linux-g++:LIBS += -lqtsoap
+
QT += network
-diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro
---- meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib 2011-01-24 23:49:27.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2011-10-05 19:59:01.000000000 -0700
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib 2011-06-06 01:47:14.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2011-10-21 11:47:40.285025940 -0600
@@ -8,28 +8,8 @@ HEADERS += filter_qhull.h \
SOURCES += filter_qhull.cpp \
qhull_tools.cpp
@@ -136,10 +230,10 @@ diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib m
-TARGET = filter_qhull
\ No newline at end of file
+TARGET = filter_qhull
-diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h
---- meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib 2011-01-24 23:49:27.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h 2011-10-05 19:59:01.000000000 -0700
-@@ -55,14 +55,14 @@ extern "C"
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib 2011-06-06 01:47:14.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2011-10-21 11:47:40.285025940 -0600
+@@ -55,14 +55,14 @@ extern "C"
#endif
#include <stdio.h>
#include <stdlib.h>
@@ -162,100 +256,9 @@ diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib mesh
#if defined(__cplusplus)
}
#endif
-diff -up meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro
---- meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib 2011-02-15 01:39:47.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro 2011-10-05 20:00:09.000000000 -0700
-@@ -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.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
---- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-01-24 23:50:05.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-10-05 19:59:01.000000000 -0700
-@@ -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.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
---- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-01-24 23:50:05.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2011-10-05 19:59:01.000000000 -0700
-@@ -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.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
---- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-01-24 23:50:05.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2011-10-05 19:59:01.000000000 -0700
-@@ -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.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
---- meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-01-24 23:49:55.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-10-05 19:59:01.000000000 -0700
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-06-06 01:47:19.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-10-21 11:47:40.286025903 -0600
@@ -14,7 +14,7 @@ SOURCES += meshio.cpp \
TARGET = io_3ds
@@ -277,8 +280,8 @@ diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib me
# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
---- meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2011-01-24 23:50:02.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-10-05 19:59:01.000000000 -0700
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2011-06-06 01:47:23.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-10-21 11:47:40.286025903 -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
@@ -298,8 +301,8 @@ diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedli
mac:LIBS += -lbz2
diff -up meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro
---- meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-01-24 23:49:46.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro 2011-10-05 20:01:25.000000000 -0700
+--- meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-06-06 01:47:03.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro 2011-10-21 11:47:40.287025867 -0600
@@ -1,5 +1,3 @@
-GLEWDIR = ../external/glew-1.5.1
-
@@ -320,7 +323,7 @@ diff -up meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib mes
#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
+@@ -43,7 +37,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC
#DEFINES += GLEW_STATIC
@@ -330,8 +333,8 @@ diff -up meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib mes
CONFIG += console
diff -up meshlab-1.3.1/meshlab/src/shared.pri.sharedlib meshlab-1.3.1/meshlab/src/shared.pri
---- meshlab-1.3.1/meshlab/src/shared.pri.sharedlib 2011-01-24 23:50:20.000000000 -0800
-+++ meshlab-1.3.1/meshlab/src/shared.pri 2011-10-05 19:59:01.000000000 -0700
+--- meshlab-1.3.1/meshlab/src/shared.pri.sharedlib 2011-06-06 01:47:27.000000000 -0600
++++ meshlab-1.3.1/meshlab/src/shared.pri 2011-10-21 11:47:40.287025867 -0600
@@ -8,7 +8,6 @@ QT += xmlpatterns
QT += script
@@ -340,7 +343,7 @@ diff -up meshlab-1.3.1/meshlab/src/shared.pri.sharedlib meshlab-1.3.1/meshlab/sr
mac:LIBS += ../../common/libcommon.dylib
-@@ -34,7 +33,7 @@ win32-msvc2008:DEFINES += GLEW_STATIC
+@@ -36,7 +35,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC
# DEFINES += VCG_USE_EIGEN
# CONFIG += warn_off
@@ -349,10 +352,3 @@ diff -up meshlab-1.3.1/meshlab/src/shared.pri.sharedlib meshlab-1.3.1/meshlab/sr
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 6c5fc50..216a144 100644
--- a/meshlab.spec
+++ b/meshlab.spec
@@ -1,10 +1,10 @@
Summary: A system for processing and editing unstructured 3D triangular meshes
Name: meshlab
-Version: 1.3.0a
+Version: 1.3.1
Release: 1%{?dist}
URL: http://meshlab.sourceforge.net/`
-Source0: http://downloads.sourceforge.net/%{name}/MeshLabSrc_AllInc_v130a.tgz
+Source0: http://downloads.sourceforge.net/%{name}/MeshLabSrc_AllInc_v131.tgz
Source1: meshlab-48x48.xpm
# Meshlab v131 tarball is missing the docs directory. Reported upstream,
@@ -13,17 +13,23 @@ 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-1.3.0a-sharedlib.patch
+Patch0: meshlab-1.3.1-sharedlib.patch
Patch1: meshlab-1.2.3a-plugin-path.patch
-Patch2: meshlab-1.3.0a-shader-path.patch
+Patch2: meshlab-1.3.1-shader-path.patch
# Patch to fix FTBFS due to missing include
# from Teemu Ikonen <tpikonen at gmail.com>
-Patch3: meshlab-1.3.0a-cstddef.patch
+Patch3: meshlab-1.3.1-cstddef.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
+Patch4: meshlab-1.3.1-ply-numeric.patch
+
+# Add #include <GL/glu.h> to various files
+Patch5: meshlab-1.3.1-glu.patch
+
+# Disable io_ctm until openctm is packaged
+Patch6: meshlab-1.3.1-noctm.patch
License: GPLv2+ and BSD
Group: Applications/Multimedia
@@ -61,8 +67,10 @@ 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 .ply-numeric
-%patch -P 4 -p1 -b .cstddef
+%patch -P 3 -p1 -b .cstddef
+%patch -P 4 -p1 -b .ply-numeric
+%patch -P 5 -p1 -b .glu
+%patch -P 6 -p1 -b .noctm
# Turn of execute permissions on source files to avoid rpmlint
# errors and warnings for the debuginfo package
@@ -196,6 +204,12 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/meshlab.png
%changelog
+* Fri Oct 21 2011 Orion Poplawski <orion at cora.nwra.com> - 1.3.1-1
+- Update to 1.3.1
+- Rebase patches
+- Add new patches to add needed includes and disable openctm support until
+ openctm is packaged
+
* Wed Oct 05 2011 Eric Smith <eric at brouhaha.com> - 1.3.0a-2
- removed bundled qtsoap, use shared library from Fedora package
- fix rpath handling for internal-only library
diff --git a/sources b/sources
index fb9c609..d610e33 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-46c14a0fce7bed03113d54807f3c19bc MeshLabSrc_AllInc_v130a.tgz
+da8c1eb07f219896dbcffe35111d21b1 MeshLabSrc_AllInc_v131.tgz
f06107dd01cbe0d6519dbb759ae84c11 MeshLabSrc_v122.tar.gz
More information about the scm-commits
mailing list