[packages/meshlab] - raw from FC
arekm
arekm at pld-linux.org
Thu Apr 30 17:39:27 CEST 2015
commit cf6fe618c33fa7f4a3fdb56da69411048c56a515
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Apr 30 17:39:14 2015 +0200
- raw from FC
meshlab-1.3.1-glu.patch | 23 ++
meshlab-1.3.1-ply-numeric.patch | 12 +
meshlab-1.3.2-cstddef.patch | 34 +++
meshlab-1.3.2-gcc47.patch | 12 +
meshlab-1.3.2-include-path-double-slash.patch | 24 ++
meshlab-1.3.2-noctm.patch | 11 +
meshlab-1.3.2-plugin-path.patch | 12 +
meshlab-1.3.2-shader-path.patch | 48 +++
meshlab-1.3.2-sharedlib.patch | 413 ++++++++++++++++++++++++++
meshlab-1.3.2-vert-swap.patch | 12 +
meshlab-48x48.xpm | 170 +++++++++++
meshlab.spec | 225 ++++++++++++++
12 files changed, 996 insertions(+)
---
diff --git a/meshlab.spec b/meshlab.spec
new file mode 100644
index 0000000..316dc3b
--- /dev/null
+++ b/meshlab.spec
@@ -0,0 +1,225 @@
+Summary: A system for processing and editing unstructured 3D triangular meshes
+Name: meshlab
+Version: 1.3.2
+Release: 0.1
+License: GPLv2+ and BSD and Public Domain
+Group: Applications/Multimedia
+URL: http://meshlab.sourceforge.net/
+
+Source0: http://downloads.sourceforge.net/meshlab/MeshLabSrc_AllInc_v132.tgz
+# Source0-md5: 3cba61f6d34559f98129d9d0a3126f81
+Source1: %{name}-48x48.xpm
+
+# Meshlab v131 tarball is missing the docs directory. Reported upstream,
+# but for now we'll extract them from the v122 tarball.
+Source2: http://downloads.sourceforge.net/meshlab/MeshLabSrc_v122.tar.gz
+# Source2-md5: f06107dd01cbe0d6519dbb759ae84c11
+
+# Fedora-specific patches to use shared libraries, and to put plugins and
+# shaders in appropriate directories
+Patch0: %{name}-1.3.2-sharedlib.patch
+Patch1: %{name}-1.3.2-plugin-path.patch
+Patch2: %{name}-1.3.2-shader-path.patch
+
+# Patch to fix FTBFS due to missing include of <cstddef>
+# from Teemu Ikonen <tpikonen at gmail.com>
+# Also added a missing include of <unistd.h>
+Patch3: %{name}-1.3.2-cstddef.patch
+
+# Patch to fix reading of .ply files in comma separator locales
+# from Teemu Ikonen <tpikonen at gmail.com>
+Patch4: %{name}-1.3.1-ply-numeric.patch
+
+# Add #include <GL/glu.h> to various files
+Patch5: %{name}-1.3.1-glu.patch
+
+# Disable io_ctm until openctm is packaged
+Patch6: %{name}-1.3.2-noctm.patch
+
+# Change m.vert.math::Swap() to m.vert.swap()
+# See Debian bug 667276
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667276
+Patch9: %{name}-1.3.2-vert-swap.patch
+
+# Yet another incompatibility with GCC 4.7
+Patch10: %{name}-1.3.2-gcc47.patch
+
+# Include paths shouldn't have consecutive double slashes. Causes
+# a problem for debugedit, used by rpmbuild to extract debuginfo.
+Patch11: %{name}-1.3.2-include-path-double-slash.patch
+
+BuildRequires: bzip2-devel
+BuildRequires: glew-devel
+BuildRequires: levmar-devel
+BuildRequires: lib3ds-devel
+BuildRequires: muparser-devel
+BuildRequires: qhull-devel
+BuildRequires: qt-devel
+BuildRequires: qtsoap-devel
+
+BuildRequires: ImageMagick
+BuildRequires: chrpath
+BuildRequires: desktop-file-utils
+
+%description
+MeshLab is an open source, portable, and extensible system for the
+processing and editing of unstructured 3D triangular meshes. The
+system is aimed to help the processing of the typical not-so-small
+unstructured models arising in 3D scanning, providing a set of tools
+for editing, cleaning, healing, inspecting, rendering and converting
+these kinds of meshes.
+
+%prep
+%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
+
+%patch0 -P 0 -p1 -b .sharedlib
+%patch0 -P 1 -p1 -b .plugin-path
+%patch0 -P 2 -p1 -b .shader-path
+%patch0 -P 3 -p1 -b .cstddef
+%patch0 -P 4 -p1 -b .ply-numeric
+%patch0 -P 5 -p1 -b .glu
+%patch0 -P 6 -p1 -b .noctm
+%patch0 -P 9 -p1 -b .vert-swap
+%patch0 -P 10 -p1 -b .gcc47
+%patch0 -P 11 -p1 -b .include-path-double-slash
+
+# Turn of execute permissions on source files to avoid rpmlint
+# errors and warnings for the debuginfo package
+find . \( -name *.h -o -name *.cpp -o -name *.inl \) -a -executable \
+ -exec chmod -x {} \;
+
+# 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*,qtsoap*}
+
+%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/external
+qmake-qt4 -recursive external.pro
+# Note: -fPIC added to make jhead link properly; don't know why this wasn't
+# also an issue with structuresynth
+%{__make} \
+ CFLAGS="%{optflags} -fPIC"
+cd ..
+qmake-qt4 -recursive meshlab_full.pro
+%{__make} \
+ CFLAGS="%{optflags}" \
+ DEFINES="-D__DISABLE_AUTO_STATS__ -DPLUGIN_DIR=\\\"%{_libdir}/%{name}\\\""
+
+# process icon
+convert %{SOURCE1} meshlab.png
+
+# create desktop file
+cat <<EOF >meshlab.desktop
+[Desktop Entry]
+Name=meshlab
+GenericName=MeshLab 3D triangular mesh processing and editing
+Exec=meshlab
+Icon=meshlab
+Terminal=false
+Type=Application
+Categories=Graphics;
+EOF
+
+# convert doc files from ISO-8859-1 to UTF-8 encoding:
+cd ../docs
+for f in contrib_Gangemi_Vannini.txt contrib_Buzzelli_Mazzanti.txt
+do
+ iconv -fiso88591 -tutf8 $f >$f.new
+ touch -r $f $f.new
+ mv $f.new $f
+done
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# The QMAKE_RPATHDIR stuff puts in the path to the compile-time location
+# of libcommon, which won't work at runtime, so we change the rpath here.
+# The use of rpath will cause an rpmlint error, but the Fedora Packaging
+# Guidelines specifically allow use of an rpath for internal libraries:
+# http://fedoraproject.org/wiki/Packaging:Guidelines#Rpath_for_Internal_Libraries
+# Ideally upstream would rename the library to libmeshlab, libmeshlabcommon,
+# or the like, so that we could put it in the system library directory
+# and avoid rpath entirely.
+chrpath -r %{_libdir}/meshlab meshlab/src/distrib/{meshlab,meshlabserver}
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -p meshlab/src/distrib/meshlab \
+ meshlab/src/distrib/meshlabserver \
+ $RPM_BUILD_ROOT%{_bindir}
+
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -p meshlab/docs/meshlab.1 \
+ meshlab/docs/meshlabserver.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1
+
+install -d $RPM_BUILD_ROOT%{_libdir}/meshlab
+install -p meshlab/src/distrib/libcommon.so.1.0.0 \
+ $RPM_BUILD_ROOT%{_libdir}/meshlab
+ln -s libcommon.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/meshlab/libcommon.so.1.0
+ln -s libcommon.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/meshlab/libcommon.so.1
+ln -s libcommon.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/meshlab/libcommon.so
+
+install -d $RPM_BUILD_ROOT%{_libdir}/meshlab/plugins
+install -p meshlab/src/distrib/plugins/*.so \
+ $RPM_BUILD_ROOT%{_libdir}/meshlab/plugins
+
+install -d $RPM_BUILD_ROOT%{_datadir}/meshlab/shaders
+install -p meshlab/src/distrib/shaders/*.{frag,gdp,vert} \
+ $RPM_BUILD_ROOT%{_datadir}/meshlab/shaders
+
+install -d $RPM_BUILD_ROOT%{_datadir}/meshlab/shaders/shadersrm
+install -p meshlab/src/distrib/shaders/shadersrm/*.rfx \
+ $RPM_BUILD_ROOT%{_datadir}/meshlab/shaders/shadersrm
+
+install -d $RPM_BUILD_ROOT%{_datadir}/meshlab/textures
+
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p meshlab/src/meshlab.png \
+ $RPM_BUILD_ROOT%{_pixmapsdir}
+
+install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -p meshlab/src/meshlab.desktop \
+ $RPM_BUILD_ROOT%{_desktopdir}
+
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/meshlab.desktop
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc meshlab/docs/contrib_Buzzelli_Mazzanti.txt
+%doc meshlab/docs/contrib_Gangemi_Vannini.txt
+%doc meshlab/docs/contrib_Latronico_Venturi.txt
+%doc meshlab/docs/contrib_Mochi_Portelli_Vacca.txt
+%doc meshlab/docs/gpl.txt
+%doc meshlab/docs/history.txt
+%doc meshlab/docs/privacy.txt
+%doc meshlab/docs/README.linux
+%doc meshlab/docs/readme.txt
+%doc meshlab/docs/ToDo.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
+
+%attr(755,root,root) %{_bindir}/meshlab
+%attr(755,root,root) %{_bindir}/meshlabserver
+%{_libdir}/meshlab
+%{_datadir}/meshlab
+%{_mandir}/man1/*.1.*
+%{_desktopdir}/meshlab.desktop
+%{_pixmapsdir}/meshlab.png
+
+%changelog
+
+%clean
+rm -rf $RPM_BUILD_ROOT
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-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.2-cstddef.patch b/meshlab-1.3.2-cstddef.patch
new file mode 100644
index 0000000..ad6c13c
--- /dev/null
+++ b/meshlab-1.3.2-cstddef.patch
@@ -0,0 +1,34 @@
+diff -up meshlab-1.3.2/vcglib/wrap/io_tetramesh/import_ply.h.cstddef meshlab-1.3.2/vcglib/wrap/io_tetramesh/import_ply.h
+--- meshlab-1.3.2/vcglib/wrap/io_tetramesh/import_ply.h.cstddef 2011-01-25 00:53:39.000000000 -0700
++++ meshlab-1.3.2/vcglib/wrap/io_tetramesh/import_ply.h 2012-09-30 02:40:19.697251228 -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.2/vcglib/wrap/io_trimesh/import_ply.h.cstddef meshlab-1.3.2/vcglib/wrap/io_trimesh/import_ply.h
+--- meshlab-1.3.2/vcglib/wrap/io_trimesh/import_ply.h.cstddef 2012-06-27 04:07:33.000000000 -0600
++++ meshlab-1.3.2/vcglib/wrap/io_trimesh/import_ply.h 2012-09-30 02:40:19.699251228 -0600
+@@ -29,6 +29,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.2/vcglib/wrap/ply/plystuff.h.cstddef meshlab-1.3.2/vcglib/wrap/ply/plystuff.h
+--- meshlab-1.3.2/vcglib/wrap/ply/plystuff.h.cstddef 2011-01-25 00:53:42.000000000 -0700
++++ meshlab-1.3.2/vcglib/wrap/ply/plystuff.h 2012-09-30 02:49:41.399295985 -0600
+@@ -57,6 +57,8 @@ Cleaning of the automatic bbox caching s
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <cstddef>
++#include <unistd.h>
+ #ifdef WIN32
+ #include <io.h>
+ #endif
diff --git a/meshlab-1.3.2-gcc47.patch b/meshlab-1.3.2-gcc47.patch
new file mode 100644
index 0000000..aa52c70
--- /dev/null
+++ b/meshlab-1.3.2-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.gcc47 meshlab-1.3.2/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.gcc47 2013-02-26 09:39:14.395035444 -0700
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-02-26 09:39:40.578034587 -0700
+@@ -40,7 +40,7 @@ public:
+
+ //! Reset histogram data.
+ void Clear() {
+- this->::Clear();
++ Histogram<ScalarType>::Clear();
+ CV.clear();
+ }
+ /*
diff --git a/meshlab-1.3.2-include-path-double-slash.patch b/meshlab-1.3.2-include-path-double-slash.patch
new file mode 100644
index 0000000..a7c0407
--- /dev/null
+++ b/meshlab-1.3.2-include-path-double-slash.patch
@@ -0,0 +1,24 @@
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer.h.include-path-double-slash meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer.h.include-path-double-slash 2013-02-28 22:51:16.572824421 -0700
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer.h 2013-02-28 22:51:54.298823186 -0700
+@@ -25,7 +25,7 @@
+ #define SPLATRENDERER_H
+
+ #include <QObject>
+-#include <common//interfaces.h>
++#include <common/interfaces.h>
+ #include <wrap/gl/shaders.h>
+ class QGLFramebufferObject;
+
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer_plugin.h.include-path-double-slash meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer_plugin.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer_plugin.h.include-path-double-slash 2013-02-28 22:51:22.492824227 -0700
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/render_splatting/splatrenderer_plugin.h 2013-02-28 22:52:05.766822811 -0700
+@@ -25,7 +25,7 @@
+ #define SPLATRENDERERPLUGIN_H
+
+ #include <QObject>
+-#include <common//interfaces.h>
++#include <common/interfaces.h>
+ #include <wrap/gl/splatting_apss/splatrenderer.h>
+
+ class QGLFramebufferObject;
diff --git a/meshlab-1.3.2-noctm.patch b/meshlab-1.3.2-noctm.patch
new file mode 100644
index 0000000..af083b1
--- /dev/null
+++ b/meshlab-1.3.2-noctm.patch
@@ -0,0 +1,11 @@
+diff -up meshlab-1.3.2/meshlab/src/meshlab_full.pro.noctm meshlab-1.3.2/meshlab/src/meshlab_full.pro
+--- meshlab-1.3.2/meshlab/src/meshlab_full.pro.noctm 2012-08-02 06:15:32.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlab_full.pro 2012-09-30 01:06:53.282804493 -0600
+@@ -9,7 +9,6 @@ SUBDIRS = common \
+ meshlabplugins/io_3ds\
+ meshlabplugins/io_bre\
+ meshlabplugins/io_collada \
+- meshlabplugins/io_ctm \
+ meshlabplugins/io_json \
+ meshlabplugins/io_u3d\
+ meshlabplugins/io_tri\
diff --git a/meshlab-1.3.2-plugin-path.patch b/meshlab-1.3.2-plugin-path.patch
new file mode 100644
index 0000000..f520d46
--- /dev/null
+++ b/meshlab-1.3.2-plugin-path.patch
@@ -0,0 +1,12 @@
+diff -up meshlab-1.3.2/meshlab/src/common/pluginmanager.cpp.plugin-path meshlab-1.3.2/meshlab/src/common/pluginmanager.cpp
+--- meshlab-1.3.2/meshlab/src/common/pluginmanager.cpp.plugin-path 2012-07-30 23:42:56.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/common/pluginmanager.cpp 2012-09-30 01:02:35.418783945 -0600
+@@ -230,7 +230,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.2-shader-path.patch b/meshlab-1.3.2-shader-path.patch
new file mode 100644
index 0000000..96ba521
--- /dev/null
+++ b/meshlab-1.3.2-shader-path.patch
@@ -0,0 +1,48 @@
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path 2012-03-21 12:05:01.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2012-09-30 01:05:20.110797069 -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.2/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path 2011-10-14 10:36:13.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp 2012-09-30 01:03:57.643790497 -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.2/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp.shader-path meshlab-1.3.2/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp.shader-path 2012-03-21 12:05:02.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2012-09-30 01:03:57.641790497 -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.2/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp.shader-path meshlab-1.3.2/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp
+--- meshlab-1.3.2/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp.shader-path 2011-10-14 10:31:04.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp 2012-09-30 01:03:57.644790497 -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.2-sharedlib.patch b/meshlab-1.3.2-sharedlib.patch
new file mode 100644
index 0000000..7084fe7
--- /dev/null
+++ b/meshlab-1.3.2-sharedlib.patch
@@ -0,0 +1,413 @@
+diff -up meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib meshlab-1.3.2/meshlab/src/common/common.pro
+--- meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib 2012-07-30 23:42:56.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/common/common.pro 2013-02-26 09:43:25.574027223 -0700
+@@ -1,9 +1,6 @@
+ include (../general.pri)
+ EXIF_DIR = ../external/jhead-2.95
+
+-
+-GLEWCODE = $$GLEWDIR/src/glew.c
+-
+ win32-msvc2005:DESTDIR = ../distrib
+ win32-msvc2008:DESTDIR = ../distrib
+ win32-msvc2010:DESTDIR = ../distrib
+@@ -52,8 +49,7 @@ echo "linked shader dir"; \
+ fi;\
+ "
+ INCLUDEPATH *= ../.. \
+- $$VCGDIR \
+- $$GLEWDIR/include
++ $$VCGDIR
+ TEMPLATE = lib
+ linux-g++:CONFIG += dll
+ linux-g++:DESTDIR = ../distrib
+@@ -75,7 +71,6 @@ QT += script
+ TARGET =
+ DEPENDPATH += .
+ INCLUDEPATH += . $$EXIF_DIR
+-DEFINES += GLEW_STATIC
+ win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
+ win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
+
+@@ -106,7 +101,6 @@ SOURCES += filterparameter.cpp \
+ mlapplication.cpp \
+ scriptsyntax.cpp \
+ searcher.cpp \
+- $$GLEWCODE \
+ meshlabdocumentxml.cpp \
+ meshlabdocumentbundler.cpp
+
+diff -up meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib meshlab-1.3.2/meshlab/src/external/external.pro
+--- meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib 2012-05-30 08:24:24.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/external/external.pro 2013-02-26 09:43:25.574027223 -0700
+@@ -2,11 +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 \
+- OpenCTM-1.0.3/openctm.pro \
++SUBDIRS = structuresynth/structuresynth.pro \
+ jhead-2.95/jhead-2.95.pro
+-# openkinect/openkinect.pro
+diff -up meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro
+--- meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib 2012-05-30 08:32:44.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro 2013-02-26 09:43:25.575027223 -0700
+@@ -129,7 +129,7 @@ win32-g++:LIBS += -L../external/
+ # win32-g++:release:LIBS += -L../common/release -lcommon
+ #}
+
+-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
++linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
+ linux-g++:QMAKE_RPATHDIR += ../distrib
+ linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
+ linux-g++-32:QMAKE_RPATHDIR += ../distrib
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib 2013-02-26 10:05:31.025983842 -0700
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2013-02-26 10:08:53.259977223 -0700
+@@ -32,16 +32,13 @@ RESOURCES = edit_arc3D.qrc
+ 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
++linux-g++-32:LIBS += -lbz2
++linux-g++-64: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.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib 2011-10-14 10:38:01.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2013-02-26 09:43:25.575027223 -0700
+@@ -6,15 +6,13 @@ 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 += $$MACLIBDIR/libmuparser.a
+-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a
++linux-g++:LIBS += -lmuparser
+ linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a
+ linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a
+ win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2011-10-14 10:37:59.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2013-02-26 09:43:25.576027223 -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
+@@ -47,7 +46,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++:LIBS += -llevmar
+ linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar
+ linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar
+ macx:LIBS += $$MACLIBDIR/liblevmar.a
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2011-10-14 10:37:59.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2013-02-26 09:43:25.576027223 -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.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2011-10-14 10:37:59.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2013-02-26 09:43:25.577027223 -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.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib 2012-05-30 07:57:47.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2013-02-26 09:43:25.577027223 -0700
+@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
+
+ #include <list>
+
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+
+ struct LevmarCorrelation {
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib 2012-05-30 07:57:47.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2013-02-26 09:43:25.578027223 -0700
+@@ -5,7 +5,7 @@
+ #include "alignset.h"
+
+ #include "parameters.h"
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+ #include <iostream>
+ #include <fstream>
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib 2011-10-14 10:35:23.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro 2013-02-26 09:43:25.579027223 -0700
+@@ -1,17 +1,15 @@
+ include (../../shared.pri)
+
+-QTSOAPDIR = ../../external/qtsoap-2.7_1/src
+-
+-INCLUDEPATH += $$QTSOAPDIR
++INCLUDEPATH += /usr/include/QtSoap
+
+ HEADERS += filter_photosynth.h \
+- synthData.h \
+- $$QTSOAPDIR/qtsoap.h
++ synthData.h
+
+ SOURCES += filter_photosynth.cpp \
+- downloader.cpp \
+- $$QTSOAPDIR/qtsoap.cpp
++ downloader.cpp
+
+ TARGET = filter_photosynth
+
++linux-g++:LIBS += -lqtsoap
++
+ QT += network
+diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib 2011-10-14 10:35:34.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2013-02-26 09:43:25.580027223 -0700
+@@ -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.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib 2011-10-14 10:35:34.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2013-02-26 09:43:25.581027223 -0700
+@@ -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.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
+--- meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2011-10-14 10:36:53.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2013-02-26 09:43:25.582027223 -0700
+@@ -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.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro
+--- meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-10-14 10:34:48.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro 2013-02-26 09:43:25.583027223 -0700
+@@ -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.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h
+--- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib 2012-04-05 03:05:12.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2013-02-26 09:43:25.583027223 -0700
+@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
+
+ #include <list>
+
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+
+ struct LevmarCorrelation {
+diff -up meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h
+--- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib 2012-04-05 03:05:12.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2013-02-26 09:43:25.584027223 -0700
+@@ -5,7 +5,7 @@
+ #include "alignset.h"
+
+ #include "parameters.h"
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+ #include <iostream>
+ #include <fstream>
+diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h
+--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib 2011-10-14 10:30:46.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h 2013-02-26 09:43:25.585027223 -0700
+@@ -30,7 +30,7 @@
+ #include <vcg/complex/allocate.h>
+ #include <vcg/complex/algorithms/subset.h>
+ #include <vcg/space/index/grid_static_ptr.h>
+-#include <lib/levmar/lm.h>
++#include <levmar.h>
+
+ #include "frame.h"
+
+@@ -313,4 +313,4 @@ static void eval_only_k( double *x,doubl
+
+ };// end of class
+
+-}// end of subspace
+\ No newline at end of file
++}// end of subspace
+diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h
+--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib 2012-06-27 03:34:59.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h 2013-02-26 09:43:25.620027222 -0700
+@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
+
+ #include <list>
+
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+
+ struct LevmarCorrelation {
+diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h
+--- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib 2012-06-27 03:34:59.000000000 -0600
++++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h 2013-02-26 09:43:25.621027222 -0700
+@@ -5,7 +5,7 @@
+ #include "alignset.h"
+
+ #include "parameters.h"
+-#include "../../external/levmar-2.3/lm.h"
++#include <levmar.h>
+
+ #include <iostream>
+ #include <fstream>
+diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro
+--- meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib 2013-02-26 10:07:51.957979230 -0700
++++ meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro 2013-02-26 10:08:26.850978087 -0700
+@@ -30,16 +30,13 @@ 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
++linux-g++-32:LIBS += -lbz2
++linux-g++-64: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 --git a/meshlab-1.3.2-vert-swap.patch b/meshlab-1.3.2-vert-swap.patch
new file mode 100644
index 0000000..4e2c1a4
--- /dev/null
+++ b/meshlab-1.3.2-vert-swap.patch
@@ -0,0 +1,12 @@
+diff -up meshlab-1.3.2/vcglib/wrap/gl/trimesh.h.vert-swap meshlab-1.3.2/vcglib/wrap/gl/trimesh.h
+--- meshlab-1.3.2/vcglib/wrap/gl/trimesh.h.vert-swap 2012-09-30 01:23:32.071884081 -0600
++++ meshlab-1.3.2/vcglib/wrap/gl/trimesh.h 2012-09-30 01:27:38.281903698 -0600
+@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_
+ }
+ }
+
+- m.vert.math::Swap(newvert);
++ m.vert.swap(newvert); // see Debian bug 667276
+ m.vn=m.vert.size();
+ }
+
diff --git a/meshlab-48x48.xpm b/meshlab-48x48.xpm
new file mode 100644
index 0000000..08dcc6d
--- /dev/null
+++ b/meshlab-48x48.xpm
@@ -0,0 +1,170 @@
+/* XPM */
+static char *meshlab__[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 116 2",
+" c #060606",
+". c #0B0B0B",
+"X c #0E120D",
+"o c #101A0F",
+"O c #141414",
+"+ c #141C13",
+"@ c #1B1C1B",
+"# c #221F1F",
+"$ c #182416",
+"% c #1E201D",
+"& c #212A1E",
+"* c #23361F",
+"= c #242424",
+"- c #2C2B2B",
+"; c #312E2E",
+": c #253223",
+"> c #303E2A",
+", c #313131",
+"< c #383535",
+"1 c #323C31",
+"2 c #3B3C3B",
+"3 c #32492D",
+"4 c #374434",
+"5 c #374C30",
+"6 c #3B4C36",
+"7 c #345331",
+"8 c #3E613A",
+"9 c #45623F",
+"0 c #444444",
+"q c #4B4B4B",
+"w c #4F544E",
+"e c #535353",
+"r c #5B5A5A",
+"t c #645E5E",
+"y c #53694B",
+"u c #4A7347",
+"i c #4E724C",
+"p c #4D7C49",
+"a c #53744D",
+"s c #507E4C",
+"d c #5A6059",
+"f c #587652",
+"g c #547950",
+"h c #5B795A",
+"j c #636363",
+"k c #6C6C6C",
+"l c #6B736B",
+"z c #747474",
+"x c #7B7B7B",
+"c c #54824F",
+"v c #558450",
+"b c #578952",
+"n c #5D8F58",
+"m c #5D9258",
+"M c #63975D",
+"N c #62985C",
+"B c #6F8268",
+"V c #708B6F",
+"C c #679C60",
+"Z c #739566",
+"A c #728B70",
+"S c #799177",
+"D c #7A9C70",
+"F c #7A9279",
+"G c #71A16A",
+"H c #73A96B",
+"J c #7EB476",
+"K c #83937C",
+"L c #84A775",
+"P c #87A978",
+"I c #83BA7B",
+"U c #838383",
+"Y c #8B8787",
+"T c #8C8C8C",
+"R c #948B8B",
+"E c #849583",
+"W c #8C9E8B",
+"Q c #949494",
+"! c #9B9B9B",
+"~ c #8FA18E",
+"^ c #90A08E",
+"/ c #89BF80",
+"( c #94BD86",
+") c #92A291",
+"_ c #9FA09F",
+"` c #A3A3A3",
+"' c #ABA4A4",
+"] c #A5ACA4",
+"[ c #ABABAB",
+"{ c #A8B3A8",
+"} c #B3B3B3",
+"| c #BCB4B4",
+" . c #BDBDBD",
+".. c #8CC282",
+"X. c #91C386",
+"o. c #93C689",
+"O. c #9CC58B",
+"+. c #97C88B",
+"@. c #9CCA8E",
+"#. c #9BCB90",
+"$. c #A1CC93",
+"%. c #B7C1B7",
+"&. c #BCC1BC",
+"*. c #C3C3C3",
+"=. c #CCC3C3",
+"-. c #CCCCCC",
+";. c #D4D4D4",
+":. c #DAD6D6",
+">. c #DCDCDC",
+",. c #E1DFDF",
+"<. c #E3E3E3",
+"1. c #EAEAEA",
+"2. c #F0EEEE",
+"3. c #F4F4F4",
+"4. c #F8F8F8",
+"5. c None",
+/* pixels */
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.<.<.<.<.<.<.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.>.>.<.<.<.<.<.<.<.<.<.<.<.>.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.>.>.>.<.<.<.<.<.<.<.>.>.>.>.>.>.>.:.;.;.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.>.>.>.<.<.<.<.<.<.>.>.>.>.>.:.:.:.;.;.;.;.-.-.*.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.>.>.<.<.<.<.<.<.<.>.>.>.>.:.;.;.;.;.;.-.-.-.-.*.*. .5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.<.<.<.<.<.<.<.<.<.>.>.>.>.:.;.;.-.-.-.-.-.-.*.*.*. . .} [ ! 5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.<.<.<.<.<.<.<.<.<.>.>.>.:.;.;.-.-.-.-.*.*.*.*.*. . . .[ U z k z 5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.<.<.<.1.1.1.<.<.<.>.>.:.;.;.;.-.-.*.*.*.*.*. . . . .! T r r 0 e < , 5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.<.<.1.1.1.1.1.<.<.>.>.:.;.;.-.*.*.*. . . . . .} [ Q z q 0 < 0 q r j k T 5.5.5.5.5.5.",
+"5.5.5.5.5.5.<.<.1.1.1.1.1.<.>.>.:.;.-.-.*.*. . . . . .} ! Y z 0 2 e 0 q k U Q ! [ } 5.5.5.5.5.5.",
+"5.5.5.5.5.<.<.1.1.1.1.1.<.<.>.:.;.;.-.*.*. . . .} } ` U r e 0 2 e k z z Q ` [ } | . .5.5.5.5.5.",
+"5.5.5.5.<.<.<.1.1.1.1.<.<.>.:.;.-.-.*.*. . . .} k k j q e r z z U T Q ! ` ` ` ` ' [ [ } 5.5.5.5.",
+"5.5.5.5.<.<.<.1.1.1.<.<.>.:.;.-.-.*.*. . .} ! x e k k j x Y U U T T T T T T T T Q Q ! ` 5.5.5.5.",
+"5.5.5.>.<.<.<.1.1.<.<.<.:.;.-.-.*.*. . .[ T z j U x U Y T Y U x x x z z z z x x U U T Q ! 5.5.5.",
+"5.5.5.>.<.<.<.1.<.<.<.>.;.-.*.*.*. . .[ Q Q Q ! Q U x r r j q e q q r r r j j j k z x U Y 5.5.5.",
+"5.5.5.>.<.<.<.<.<.<.>.:.-.*.*. . . . .} [ ! U x j q 2 , < , , - = , < , 2 0 0 q e j k z j < 5.5.",
+"5.5.:.>.<.<.<.<.<.<.>.;.-.*. . . . .} ` T j e q , = = = = @ @ O O @ @ @ = - - < 0 e r r 2 , 5.5.",
+"5.5.:.>.<.<.<.<.<.>.;.-.*. . . . .[ Q k q < , = O O O . . . . . . . O @ = = - 2 , = = 5.5.",
+"5.5.;.>.<.<.<.<.>.:.;.*. . . .} ` T j 2 - @ O . O @ & : : $ 2 q 0 < = O . . . . O @ @ = = - 5.5.",
+"5.;.:.>.<.<.<.<.>.;.-.*. . .} ! x r , @ O = % X + > y f a 7 l ` ! Y k , . . O @ @ = - - 5.",
+"5.;.:.>.<.<.<.<.>.;.-.*. .[ T k 0 = . % d ] w X o 5 L ( J v E 3.1.,.| r . . O @ @ - , 5.",
+"5.;.:.<.<.1.<.>.:.-.*. .} Q k 0 @ O & 6 B K 4 o $ 9 ( #.I b W 4.4.1.=.t . . O O @ = - , < 5.",
+"5.;.>.<.1.1.<.>.;.-.*. .! z q @ O + 3 a D P 9 * 3 Z $.o.J p { 4.4.1.=.e . . O - - , , , , < 5.",
+"5.:.>.<.1.1.>.:.;.*. .[ x e = @ q 1 8 G X.$.O.( O.$.#./ C i <.4.4.<.| ; . O O O - , , , , , < 5.",
+"5.>.<.1.1.<.>.;.-.*.} ! k < O < z x 9 M I o. at .@.$.+...H v W 3.4.3.:.R @ @ @ @ = - , , , , , < 5.",
+"5.>.<.1.<.<.:.;.-. .} Q j = . 2 ! -.E u N I ....X.I H s A >.4.4.2.=.t O = - , 2 2 , , , , , , 5.",
+"5.<.<.<.<.>.;.-.*. .[ T j 2 O - T ;.1.] h s b m n c g ^ <.4.4.3.>.R # = - , 2 e r < , , , , < 5.",
+"5.5.<.<.>.:.;.-.*.} [ Q k q , @ = q Q *.&.) F V S ~ %.1.4.4.3.,.' < @ - , , r x z 2 , , , , 5.5.",
+"5.5.<.>.>.;.-.*. .} ' Q z e 2 - = O O , r _ *.>.1.3.4.4.4.3.:.Y , @ , 0 0 q z T U 0 , , , , 5.5.",
+"5.5.>.>.;.-.*.*. .} [ ! U k e 2 < , = O . . @ < r k x T Y j - @ - 2 2 e j U Q ` ! q , , , , 5.5.",
+"5.5.5.:.;.-.*. . . .[ ` Q x k e q 0 0 2 - @ @ @ O O O O @ @ = 2 2 q 0 z U Q [ } ` q , , , , 5.5.",
+"5.5.5.;.-.*. . . . .} ' ! T U z k j r r e - , - , < < 2 0 < < e j j x T [ } . .` q , , , 5.5.5.",
+"5.5.5.-.*.*. . . . . .} ` ! Q T U x z z k r r 0 r q j e k j q r T x [ } . . . .! 0 , , , 5.5.5.",
+"5.5.5.5.*. . . . . . . .} [ ` ! Q T Y U U x x k U k x x Y U U U ` [ . . . . . .Q 0 , , 5.5.5.5.",
+"5.5.5.5. . . . . . . . . .} } [ ` ! ! Q Q Q Q Q ! Q ! ` ' [ } } . . . . . . . .T 2 , , 5.5.5.5.",
+"5.5.5.5.5. . . . . . . . . . . .} } } [ [ [ [ [ } } } . . . . . . . . . . . . .U 2 , 5.5.5.5.5.",
+"5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .} z < 5.5.5.5.5.5.",
+"5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .[ r , 5.5.5.5.5.5.",
+"5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .! 0 5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .Y 5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5."
+};
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/meshlab.git/commitdiff/cf6fe618c33fa7f4a3fdb56da69411048c56a515
More information about the pld-cvs-commit
mailing list