diff options
-rw-r--r-- | .SRCINFO | 61 | ||||
-rw-r--r-- | 3ds.patch | 27 | ||||
-rw-r--r-- | PKGBUILD | 165 | ||||
-rw-r--r-- | bzip2.patch | 26 | ||||
-rw-r--r-- | cpp11_abs.patch | 21 | ||||
-rw-r--r-- | external.patch | 18 | ||||
-rw-r--r-- | filter_measure.patch | 10 | ||||
-rw-r--r-- | filter_mutualinfo.patch | 9 | ||||
-rw-r--r-- | filter_sketchfab.patch | 10 | ||||
-rw-r--r-- | filter_voronoi.patch | 9 | ||||
-rw-r--r-- | fix_locale.patch | 19 | ||||
-rw-r--r-- | import_bundle_out.patch | 38 | ||||
-rw-r--r-- | lapack.patch | 11 | ||||
-rw-r--r-- | levmar.patch | 112 | ||||
-rw-r--r-- | meshlab.desktop | 14 | ||||
-rw-r--r-- | meshlab.install | 11 | ||||
-rw-r--r-- | meshlabserver_GLU.patch | 17 | ||||
-rw-r--r-- | mpir.patch | 16 | ||||
-rw-r--r-- | muparser.patch | 14 | ||||
-rw-r--r-- | plugin_dir.patch | 22 | ||||
-rw-r--r-- | qt5.11.patch | 53 | ||||
-rw-r--r-- | rpath.patch | 36 | ||||
-rw-r--r-- | screened_poisson.patch | 18 | ||||
-rw-r--r-- | shaders_dir.patch | 89 | ||||
-rw-r--r-- | ssynth.patch | 26 |
25 files changed, 32 insertions, 820 deletions
@@ -1,19 +1,21 @@ pkgbase = meshlab pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) - pkgver = 2016.12 - pkgrel = 10 + pkgver = 2020.05 + pkgrel = 1 url = http://www.meshlab.net - install = meshlab.install arch = i686 arch = x86_64 license = GPL2 + makedepends = cmake + makedepends = eigen3 + makedepends = ninja makedepends = git makedepends = muparser makedepends = levmar makedepends = lib3ds makedepends = mpir depends = bzip2 - depends = desktop-file-utils + depends = glew depends = glu depends = openssl-1.0 depends = qt5-base @@ -25,53 +27,10 @@ pkgbase = meshlab optdepends = levmar: for isoparametrization and mutualcorrs plugins optdepends = muparser: for filer_func plugins optdepends = mpir: for Constructive Solid Geometry operation filters - provides = meshlab - source = git+https://github.com/cnr-isti-vclab/meshlab.git#tag=v2016.12 - source = git+https://github.com/cnr-isti-vclab/vcglib.git#tag=v1.0.1 - source = filter_measure.patch - source = filter_mutualinfo.patch - source = filter_sketchfab.patch - source = filter_voronoi.patch - source = ssynth.patch - source = screened_poisson.patch - source = plugin_dir.patch - source = shaders_dir.patch - source = external.patch - source = 3ds.patch - source = levmar.patch - source = muparser.patch - source = bzip2.patch - source = meshlabserver_GLU.patch - source = cpp11_abs.patch - source = fix_locale.patch - source = mpir.patch - source = rpath.patch - source = import_bundle_out.patch - source = qt5.11.patch - source = meshlab.desktop - md5sums = SKIP - md5sums = SKIP - md5sums = 0caa5aaa57606f75c3f85d60f2acb8b3 - md5sums = eb33c073855934882c1f79952d4af9ea - md5sums = 68c616d8819bb0bdaeb02afdec8a4cfa - md5sums = 02992b2e2bc657577fbf0b88f85fdecd - md5sums = fcf9148ad21706f4fef558a254bee4e2 - md5sums = 1a52bfc2afb96bf43d0c29ded3d19710 - md5sums = f13d58ca07fa74b3d7c8f7f9d4ee6a93 - md5sums = 753dd4753081ddb428f4db8eaefe9009 - md5sums = 038494125d7bd422074fc5635c5579ca - md5sums = e51b027eb9d78b82de73c4724b3928cf - md5sums = 1a53a92e12f74520b36e38d9a2311834 - md5sums = 64caafa96bef4208d641e889099eba26 - md5sums = 616b0dcf018f46a490867028d6ddc533 - md5sums = ca962601b06fac1fb2b6bf0b408777ad - md5sums = c1cfb910d20db49ec195d9918036e3c3 - md5sums = 5b59b23cf66e42f8b3d3eabe466b3eaa - md5sums = 5df295c21de5bac8d6073528823d975a - md5sums = 78bf780b3353fe212a77eb91db6f6b6c - md5sums = 765a59b64dd05b74f6a4bdf3962a1d93 - md5sums = 819d54d1b5e0f6b4dfbe13bbee8d9dac - md5sums = 18aed0a21276a22325bf8c32166fb110 + source = meshlab::git+https://github.com/cnr-isti-vclab/meshlab.git + source = vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git + sha256sums = SKIP + sha256sums = SKIP pkgname = meshlab diff --git a/3ds.patch b/3ds.patch deleted file mode 100644 index 287f2bd5cb4b..000000000000 --- a/3ds.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ../meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2016-10-31 00:00:28.662690502 +0100 -+++ meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2016-11-01 00:28:59.485188734 +0100 -@@ -14,7 +14,7 @@ - - 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,11 +25,11 @@ - 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 -+linux-g++-32:LIBS += -l3ds -+linux-g++-64:LIBS += -l3ds - --# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds -+unix:LIBS += -l3ds - - # mac:LIBS -= -l3ds - # mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a @@ -1,166 +1,45 @@ +#!/hint/bash # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com> pkgname=meshlab -pkgver=2016.12 -pkgrel=10 +pkgver=2020.05 +pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') url="http://www.meshlab.net" -provides=('meshlab') license=('GPL2') -depends=('bzip2' 'desktop-file-utils' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns') -makedepends=('git' 'muparser' 'levmar' 'lib3ds' 'mpir') +depends=('bzip2' 'glew' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns') +makedepends=('cmake' 'eigen3' 'ninja' 'git' 'muparser' 'levmar' 'lib3ds' 'mpir') optdepends=('u3d: for U3D and IDTF file support' 'lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support' 'levmar: for isoparametrization and mutualcorrs plugins' 'muparser: for filer_func plugins' 'mpir: for Constructive Solid Geometry operation filters') -#options=(debug !strip) #also create openctm(aur) jhead-lib structuresynth-lib to handle last dep -install="${pkgname}.install" -source=("git+https://github.com/cnr-isti-vclab/meshlab.git#tag=v2016.12" - "git+https://github.com/cnr-isti-vclab/vcglib.git#tag=v1.0.1" - "filter_measure.patch" - "filter_mutualinfo.patch" - "filter_sketchfab.patch" - "filter_voronoi.patch" - "ssynth.patch" - "screened_poisson.patch" - "plugin_dir.patch" - "shaders_dir.patch" - "external.patch" - "3ds.patch" - "levmar.patch" - "muparser.patch" - "bzip2.patch" - "meshlabserver_GLU.patch" - "cpp11_abs.patch" - "fix_locale.patch" - "mpir.patch" - "rpath.patch" - "import_bundle_out.patch" - "qt5.11.patch" - "meshlab.desktop") -md5sums=('SKIP' - 'SKIP' - '0caa5aaa57606f75c3f85d60f2acb8b3' - 'eb33c073855934882c1f79952d4af9ea' - '68c616d8819bb0bdaeb02afdec8a4cfa' - '02992b2e2bc657577fbf0b88f85fdecd' - 'fcf9148ad21706f4fef558a254bee4e2' - '1a52bfc2afb96bf43d0c29ded3d19710' - 'f13d58ca07fa74b3d7c8f7f9d4ee6a93' - '753dd4753081ddb428f4db8eaefe9009' - '038494125d7bd422074fc5635c5579ca' - 'e51b027eb9d78b82de73c4724b3928cf' - '1a53a92e12f74520b36e38d9a2311834' - '64caafa96bef4208d641e889099eba26' - '616b0dcf018f46a490867028d6ddc533' - 'ca962601b06fac1fb2b6bf0b408777ad' - 'c1cfb910d20db49ec195d9918036e3c3' - '5b59b23cf66e42f8b3d3eabe466b3eaa' - '5df295c21de5bac8d6073528823d975a' - '78bf780b3353fe212a77eb91db6f6b6c' - '765a59b64dd05b74f6a4bdf3962a1d93' - '819d54d1b5e0f6b4dfbe13bbee8d9dac' - '18aed0a21276a22325bf8c32166fb110') +source=("$pkgname::git+https://github.com/cnr-isti-vclab/meshlab.git" + "vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git" + ) +sha256sums=('SKIP' + 'SKIP' + ) prepare() { - cd ${srcdir}/${pkgname} - - # remove bundled headers and libraries - rm -fr src/external/{inc,lib} - - msg "truncate external lib" - patch -Np1 -i ../external.patch - msg "fix rpath" - patch -Np1 -i ../rpath.patch - msg "fix meshlab/src/plugins_experimental/io_TXT/ case sensitive path" - mv src/plugins_experimental/io_TXT/io_txt.pro src/plugins_experimental/io_TXT/io_TXT.pro - msg "fix meshalbserver missing -lGLU" - patch -Np1 -i ../meshlabserver_GLU.patch - msg "fix cpp11 abs()" - patch -Np1 -i ../cpp11_abs.patch - msg "fix decimal separator problem" - patch -Np1 -i ../fix_locale.patch - msg "using system mpir lib" - patch -Np1 -i ../mpir.patch - msg "using system bzip2 lib" - patch -Np1 -i ../bzip2.patch - msg "using system muparser lib" - patch -Np1 -i ../muparser.patch - msg "using system levmar lib" - patch -Np1 -i ../levmar.patch - msg "using system 3ds lib" - patch -Np1 -i ../3ds.patch - msg "move plugins to /usr/lib/plugins" - patch -Np1 -i ../plugin_dir.patch - msg "move shaders to /usr/share/meshlab/shaders" - patch -Np1 -i ../shaders_dir.patch - msg "fix screened poisson linux compilation" - patch -Np1 -i ../screened_poisson.patch - msg "compile ssynth with -fopenmp flag" - patch -Np1 -i ../ssynth.patch - - msg "fix filter measure plugin" - patch -Np1 -i ../filter_measure.patch - msg "fix filter mutualinfo plugin" - patch -Np1 -i ../filter_mutualinfo.patch - msg "fix filter skatchfab plugin" - patch -Np1 -i ../filter_sketchfab.patch - msg "fix filter voronoi.patch" - patch -Np1 -i ../filter_voronoi.patch - msg "fix qt5.11 compatibility" - patch -Np1 -i ../qt5.11.patch - - msg "fix bundel/nvm ReadHeader" - cd ${srcdir}/vcglib - patch -Np1 -i ../import_bundle_out.patch + git -C "${srcdir}/${pkgname}" submodule init + git -C "${srcdir}/${pkgname}" config submodule.vcglib.url "$srcdir"/vcglib + git -C "${srcdir}/${pkgname}" submodule update } -build() { - cd "${srcdir}/meshlab/src" - msg "build external libraries" - cd external - qmake external.pro -r - make - - msg "build meshlab" - cd .. - qmake meshlab_full.pro -r - make +build() { + local cmake_flags=( '-DALLOW_SYSTEM_QHULL=OFF' + '-DCMAKE_INSTALL_PREFIX=/usr' + ) + cmake "${cmake_flags[@]}" -G Ninja -B "${srcdir}/build" -S "${srcdir}/meshlab/src" +# shellcheck disable=SC2086 # allow MAKEFLAGS to split when passing multiple flags. + ninja ${MAKEFLAGS:--j1} -C "${srcdir}/build" } package() { - cd "${srcdir}/meshlab/src/distrib" - - # install meshlab - install -d -m755 ${pkgdir}/usr/bin - install -d -m755 ${pkgdir}/usr/lib/meshlab - install -d -m755 ${pkgdir}/usr/share/meshlab - install -t ${pkgdir}/usr/bin meshlab* - install -t ${pkgdir}/usr/lib/meshlab libcommon* - - cp -a plugins ${pkgdir}/usr/lib/meshlab - cp -a shaders ${pkgdir}/usr/share/meshlab - cp -a textures ${pkgdir}/usr/share/meshlab - cp -a sample ${pkgdir}/usr/share/meshlab - - - - # install man pages - install -d -m755 "${pkgdir}/usr/share/man/man1" - install -m644 "${srcdir}/meshlab/docs/meshlab.1" "${pkgdir}"/usr/share/man/man1 - install -m644 "${srcdir}/meshlab/docs/meshlabserver.1" "${pkgdir}"/usr/share/man/man1 - - # install icons - install -d -m755 "${pkgdir}/usr/share/pixmaps" - install -m644 "${srcdir}/meshlab/src/meshlab/images/eye_cropped.png" "${pkgdir}/usr/share/pixmaps/meshlab.png" - - # install desktop entry - install -d -m755 "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/meshlab.desktop" "${pkgdir}/usr/share/applications" - sed -i "s#Version=.*#Version=$pkgver#" "${pkgdir}/usr/share/applications/meshlab.desktop" + DESTDIR="$pkgdir" ninja -C "${srcdir}/build" install } # vim:set ts=2 sw=2 et: diff --git a/bzip2.patch b/bzip2.patch deleted file mode 100644 index 49a822aa746e..000000000000 --- a/bzip2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur -r meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro ---- meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2016-10-31 21:31:43.301625217 +0100 -+++ meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2016-10-31 21:36:46.694965117 +0100 -@@ -35,9 +35,9 @@ - win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/bz2.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/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
- mac:LIBS += -lbz2
-
- win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
-@@ -48,9 +48,6 @@ - win32-msvc2015: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
-
-
- CONFIG(release, debug|release) {
diff --git a/cpp11_abs.patch b/cpp11_abs.patch deleted file mode 100644 index 6078b92c4c9c..000000000000 --- a/cpp11_abs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur meshlab.orig/src/meshlabplugins/edit_quality/eqhandle.cpp meshlab/src/meshlabplugins/edit_quality/eqhandle.cpp ---- meshlab.orig/src/meshlabplugins/edit_quality/eqhandle.cpp 2016-10-30 14:07:42.211338698 +0100 -+++ meshlab/src/meshlabplugins/edit_quality/eqhandle.cpp 2016-10-30 14:08:26.774164177 +0100 - -@@ -30,6 +30,7 @@ - #include "eqhandle.h" - #include <QMouseEvent> - #include <QGraphicsSceneMouseEvent> -+#include "math.h" /* fabs() */ - - EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, - EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, -@@ -83,7 +83,7 @@ - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = abs(newPos.x()-pos().x()); -+ qreal handleOffset = fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits<float>::epsilon()) - { diff --git a/external.patch b/external.patch deleted file mode 100644 index f815e3e4640f..000000000000 --- a/external.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/external/external.pro b/src/external/external.pro -index 7bd97f6..93ed196 100644 ---- meshlab.orig/src/external/external.pro -+++ meshlab/src/external/external.pro -@@ -2,11 +2,6 @@ config += debug_and_release - - TEMPLATE = subdirs - --SUBDIRS = bzip2-1.0.5/bzip2-1.0.5.pro \ -- muparser_v225/src \ -- levmar-2.3/levmar-2.3.pro \ -- structuresynth-1.5/structuresynth.pro \ -+SUBDIRS = structuresynth-1.5/structuresynth.pro \ - OpenCTM-1.0.3/openctm.pro \ -- jhead-2.95/jhead-2.95.pro \ -- lib3ds-1.3.0/lib3ds/lib3ds.pro --# openkinect/openkinect.pro -+ jhead-2.95/jhead-2.95.pro diff --git a/filter_measure.patch b/filter_measure.patch deleted file mode 100644 index 9d82fd44098d..000000000000 --- a/filter_measure.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/meshlabplugins/filter_measure/filter_measure.pro b/src/meshlabplugins/filter_measure/filter_measure.pro -index 3f781354..2dec69f4 100644 ---- a/src/meshlabplugins/filter_measure/filter_measure.pro -+++ b/src/meshlabplugins/filter_measure/filter_measure.pro -@@ -6,4 +6,4 @@ TARGET = filter_measure - #PRE_TARGETDEPS += filter_measure.xml - - macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml" -- -+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -sf "$$TARGET".xml lib"$$TARGET".xml" diff --git a/filter_mutualinfo.patch b/filter_mutualinfo.patch deleted file mode 100644 index 24c6eeea1dc6..000000000000 --- a/filter_mutualinfo.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro -index f3eabaa7..a65c0cce 100644 ---- a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro -+++ b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro -@@ -21,3 +21,4 @@ SOURCES += filter_mutualinfo.cpp \ - TARGET = filter_mutualinfo
-
- macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml"
-+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -sf "$$TARGET".xml lib"$$TARGET".xml"
diff --git a/filter_sketchfab.patch b/filter_sketchfab.patch deleted file mode 100644 index 55ccee47b611..000000000000 --- a/filter_sketchfab.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/plugins_experimental/filter_sketchfab/filter_sketchfab.pro b/src/plugins_experimental/filter_sketchfab/filter_sketchfab.pro -index 75674cf2..9f7f0542 100644 ---- a/src/plugins_experimental/filter_sketchfab/filter_sketchfab.pro -+++ b/src/plugins_experimental/filter_sketchfab/filter_sketchfab.pro -@@ -5,4 +5,4 @@ SOURCES += filter_sketchfab.cpp $$VCGDIR//wrap/ply/plylib.cpp - TARGET = filter_sketchfab - #PRE_TARGETDEPS += filter_sketchfab.xml - macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml" -- -+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -sf "$$TARGET".xml lib"$$TARGET".xml" diff --git a/filter_voronoi.patch b/filter_voronoi.patch deleted file mode 100644 index 1df521ecca20..000000000000 --- a/filter_voronoi.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/meshlabplugins/filter_voronoi/filter_voronoi.pro b/src/meshlabplugins/filter_voronoi/filter_voronoi.pro -index 423f1573..03b83a33 100644 ---- a/src/meshlabplugins/filter_voronoi/filter_voronoi.pro -+++ b/src/meshlabplugins/filter_voronoi/filter_voronoi.pro -@@ -8,3 +8,4 @@ TARGET = filter_voronoi - #PRE_TARGETDEPS += filter_voronoi.xml - - macx:QMAKE_POST_LINK = "rsync -u "$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; rsync -u ../../distrib/plugins/"$$TARGET".xml "$$TARGET".xml" -+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -sf "$$TARGET".xml lib"$$TARGET".xml" diff --git a/fix_locale.patch b/fix_locale.patch deleted file mode 100644 index 343507d497b8..000000000000 --- a/fix_locale.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur meshlab.orig/src/meshlab/main.cpp meshlab/src/meshlab/main.cpp ---- meshlab.orig/src/meshlab/main.cpp 2016-10-30 19:47:18.130692500 +0100 -+++ meshlab/src/meshlab/main.cpp 2016-10-30 19:49:14.529497595 +0100 -@@ -20,6 +20,7 @@ - * for more details. * - * * - ****************************************************************************/ -+#include <locale.h> - #include <common/mlapplication.h> - #include <QMessageBox> - #include "mainwindow.h" -@@ -29,6 +30,7 @@ - { - - MeshLabApplication app(argc, argv); -+ setlocale(LC_ALL, "C"); - QLocale::setDefault(QLocale::C); - QCoreApplication::setOrganizationName(MeshLabApplication::organization()); - #if QT_VERSION >= 0x050100 diff --git a/import_bundle_out.patch b/import_bundle_out.patch deleted file mode 100644 index f3afd9a6e36a..000000000000 --- a/import_bundle_out.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/wrap/io_trimesh/import_nvm.h b/wrap/io_trimesh/import_nvm.h -index bebe7c36..f797da9d 100644 ---- vcglib/wrap/io_trimesh/import_nvm.h -+++ b/wrap/io_trimesh/import_nvm.h -@@ -85,14 +85,6 @@ static bool ReadHeader(FILE *fp,unsigned int &num_cams){ - return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
-
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
-diff --git a/wrap/io_trimesh/import_out.h b/wrap/io_trimesh/import_out.h -index 01331bc5..c2cd86fe 100644 ---- vcglib/wrap/io_trimesh/import_out.h -+++ b/wrap/io_trimesh/import_out.h -@@ -85,14 +85,6 @@ static bool ReadHeader(FILE *fp,unsigned int &num_cams, unsigned int &num_points - return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
-
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
diff --git a/lapack.patch b/lapack.patch deleted file mode 100644 index 81c094634050..000000000000 --- a/lapack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h ---- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 -+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 -@@ -27,7 +27,6 @@ - - /* specify whether to use LAPACK or not. The first option is strongly recommended */ - #define HAVE_LAPACK /* use LAPACK */ -- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */ - - /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to - * retain working memory between calls. Such a choice, however, renders these routines diff --git a/levmar.patch b/levmar.patch deleted file mode 100644 index a43a2aeb1e6f..000000000000 --- a/levmar.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- ../meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2016-10-31 00:00:30.266005497 +0100 -+++ meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2016-10-31 21:55:34.158322851 +0100 -@@ -51,9 +51,9 @@ - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/levmar.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/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
-+linux-g++-32:LIBS += -llevmar
-+linux-g++-64:LIBS += -llevmar
- macx:LIBS += $$MACLIBDIR/liblevmar.a
-
- # Please never ever uncomment this...
-diff -Naur -r ../meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h ---- ../meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2016-10-31 00:00:30.692667284 +0100 -+++ meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2016-10-31 22:10:49.158342653 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h ---- ../meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2016-10-31 00:00:30.692667284 +0100 -+++ meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2016-10-31 22:11:16.808343251 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff -Naur -r ../meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h ---- ../meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h 2016-10-31 00:00:08.816250885 +0100 -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h 2016-10-31 22:23:35.671692575 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h ---- ../meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h 2016-10-31 00:00:08.816250885 +0100 -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h 2016-10-31 22:24:05.935026562 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff -Naur -r ../meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h ---- ../meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2016-10-31 00:00:09.476243333 +0100 -+++ meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2016-10-31 22:30:06.391701030 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/plugins_experimental/filter_mutualglobal/solver.h meshlab/src/plugins_experimental/filter_mutualglobal/solver.h ---- ../meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2016-10-31 00:00:09.476243333 +0100 -+++ meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2016-10-31 22:29:02.815032988 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff --git a/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro b/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -index 049bec6..84f6ca9 100644 ---- a/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -@@ -1,7 +1,7 @@ - include (../../shared.pri)
-
-
--HEADERS = += ./alignset.h \
-+HEADERS += ./alignset.h \
- ./levmarmethods.h \
- ./mutual.h \
- ./parameters.h \
-@@ -29,8 +29,8 @@ FORMS = edit_mutualcorrsDialog.ui - win32-msvc2013: LIBS += ../../external/lib/win32-msvc2013/levmar.lib
- win32-msvc2015: LIBS += ../../external/lib/win32-msvc2015/levmar.lib
- win32-g++:LIBS += -L../../external -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
-+linux-g++-32:LIBS += -llevmar
-+linux-g++-64:LIBS += -llevmar
- macx:LIBS += $$MACLIBDIR/liblevmar.a
-
diff --git a/meshlab.desktop b/meshlab.desktop deleted file mode 100644 index b232e3eb81f2..000000000000 --- a/meshlab.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=$pkgver -Name=MeshLab -Name[en_GB]=MeshLab -GenericName=Mesh processing -GenericName[en_GB]=Mesh processing -Comment=View and process meshes -Type=Application -Exec=meshlab %U -TryExec=meshlab -Icon=/usr/share/pixmaps/meshlab.png -Terminal=false -MimeType=model/mesh;application/x-3ds;image/x-3ds;application/sla; -Categories=Graphics;3DGraphics;Viewer;Qt; diff --git a/meshlab.install b/meshlab.install deleted file mode 100644 index 24f85f2328bd..000000000000 --- a/meshlab.install +++ /dev/null @@ -1,11 +0,0 @@ -## arg 1: the new package version -post_install() { - update-desktop-database -q -} - -## arg 1: the old package version -post_remove() { - update-desktop-database -q -} - -# vim:set ts=2 sw=2 et: diff --git a/meshlabserver_GLU.patch b/meshlabserver_GLU.patch deleted file mode 100644 index 4b2ac58b6a39..000000000000 --- a/meshlabserver_GLU.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- meshlab.orig/src/meshlabserver/meshlabserver.pro 2016-10-30 12:35:34.339895028 +0100 -+++ meshlab/src/meshlabserver/meshlabserver.pro 2016-10-30 12:34:55.426965662 +0100 -@@ -29,11 +29,11 @@ - win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-g++: LIBS += -L../distrib -lcommon --linux-g++: LIBS += -L../distrib -lcommon -+linux-g++: LIBS += -L../distrib -lcommon -lGLU - linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab --linux-g++-32: LIBS += -L../distrib -lcommon -+linux-g++-32: LIBS += -L../distrib -lcommon -lGLU - linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab --linux-g++-64: LIBS += -L../distrib -lcommon -+linux-g++-64: LIBS += -L../distrib -lcommon -lGLU - linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon diff --git a/mpir.patch b/mpir.patch deleted file mode 100644 index 9e0829b6942c..000000000000 --- a/mpir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro -index 52147b1..f41385d 100644 ---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro -+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro -@@ -20,7 +20,7 @@ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../exte - win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib --linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 --linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a --linux-g++-64:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmpirxx.a ../../external/lib/linux-g++-64/libmpir.a -+unix:LIBS += -lmpirxx -lmpir -+linux-g++-:LIBS += -lmpirxx -lmpir -+linux-g++-32:LIBS += -lmpirxx -lmpir -+linux-g++-64:LIBS += -lmpirxx -lmpir diff --git a/muparser.patch b/muparser.patch deleted file mode 100644 index d500a17d767f..000000000000 --- a/muparser.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur ../meshlab/src/meshlabplugins/filter_func/filter_func.pro meshlab/src/meshlabplugins/filter_func/filter_func.pro ---- ../meshlab/src/meshlabplugins/filter_func/filter_func.pro 2016-10-31 00:00:30.459336619 +0100 -+++ meshlab/src/meshlabplugins/filter_func/filter_func.pro 2016-10-31 21:42:47.134972919 +0100 -@@ -19,7 +19,7 @@ - win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
-
- macx:LIBS += $$MACLIBDIR/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
-+linux-g++-32:LIBS += -lmuparser
-+linux-g++-64:LIBS += -lmuparser
- win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
diff --git a/plugin_dir.patch b/plugin_dir.patch deleted file mode 100644 index 7e373e512fe3..000000000000 --- a/plugin_dir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp -index 5354055c..12386a90 100644 ---- a/src/common/pluginmanager.cpp -+++ meshlab/src/common/pluginmanager.cpp -@@ -189,7 +189,7 @@ QString PluginManager::osDependentFileBaseName(const QString &plname) - - QString PluginManager::getBaseDirPath() - { -- QDir baseDir(qApp->applicationDirPath()); -+ QDir baseDir("/usr/share/meshlab"); - - #if defined(Q_OS_WIN) - // Windows: -@@ -211,7 +211,7 @@ QString PluginManager::getBaseDirPath() - - QString PluginManager::getDefaultPluginDirPath() - { -- QDir pluginsDir(getBaseDirPath()); -+ QDir pluginsDir("/usr/lib/meshlab"); - 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/qt5.11.patch b/qt5.11.patch deleted file mode 100644 index ea7d1fab880f..000000000000 --- a/qt5.11.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp -index ab9a7c08..5bbd859a 100644 ---- a/src/meshlabserver/mainserver.cpp -+++ b/src/meshlabserver/mainserver.cpp -@@ -897,7 +897,7 @@ int main(int argc, char *argv[]) - } - - if (meshDocument.size() < outmeshlist.size()) -- fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size())); -+ fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size()); - else - { - for (int ii = 0; ii < outmeshlist.size(); ++ii) -@@ -911,7 +911,7 @@ int main(int argc, char *argv[]) - fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename)); - } - else -- fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename)); -+ fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename)); - } - - } -diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp -index 2097a5ba..09cce489 100644 ---- a/src/meshlabplugins/edit_paint/paintbox.cpp -+++ b/src/meshlabplugins/edit_paint/paintbox.cpp -@@ -32,11 +32,11 @@ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, fl - - QIcon undo = undo_button->icon(); - undo_button->setDefaultAction(stacks->createUndoAction(undo_button)); -- undo_button->defaultAction()->setIcon(undo); -+ undo_button->setIcon(undo); - - QIcon redo = redo_button->icon(); - redo_button->setDefaultAction(stacks->createRedoAction(redo_button)); -- redo_button->defaultAction()->setIcon(redo); -+ redo_button->setIcon(redo); - - setUndoStack(parent); - -diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h -index a62d3b51..9ff9e5a5 100644 ---- a/src/meshlabplugins/render_gdp/shaderDialog.h -+++ b/src/meshlabplugins/render_gdp/shaderDialog.h -@@ -29,6 +29,8 @@ - #include <common/meshmodel.h> - #include <QLabel> - #include <QDockWidget> -+#include <QSlider> -+#include <QLineEdit> - #include "shaderStructs.h" - #include "ui_shaderDialog.h" - #include <QMap> diff --git a/rpath.patch b/rpath.patch deleted file mode 100644 index 393c609b9988..000000000000 --- a/rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 -+++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 -@@ -130,11 +130,11 @@ - #} - - linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro ---- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 -+++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 -@@ -26,11 +26,11 @@ - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon - linux-g++: LIBS += -L../distrib -lcommon --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-32: LIBS += -L../distrib -lcommon --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-64: LIBS += -L../distrib -lcommon --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/screened_poisson.patch b/screened_poisson.patch deleted file mode 100644 index c75c997d9a08..000000000000 --- a/screened_poisson.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -index 814bd31f..e04ad802 100644 ---- a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -+++ meshlab/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -@@ -2,6 +2,7 @@ include (../../shared.pri) - - macx:QMAKE_CXX = clang++-mp-3.9 - macx:QMAKE_LFLAGS += -L/opt/local/lib/libomp -lomp -+linux:QMAKE_LFLAGS += -lgomp - macx:QMAKE_CXXFLAGS_RELEASE+= -O3 -DRELEASE -funroll-loops -ffast-math -Wno-sign-compare -Wno-unused-parameter - - QMAKE_CXXFLAGS+=-fopenmp -@@ -22,4 +23,5 @@ DEFINES += FOR_RELEASE - - #PRE_TARGETDEPS += ./filter_screened_poisson.xml - macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml" -+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -sf "$$TARGET".xml lib"$$TARGET".xml" - diff --git a/shaders_dir.patch b/shaders_dir.patch deleted file mode 100644 index 432b15078c57..000000000000 --- a/shaders_dir.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/meshlabplugins/render_gdp/meshrender.cpp b/src/meshlabplugins/render_gdp/meshrender.cpp -index 5841ce66..3e0cbe5e 100644 ---- a/src/meshlabplugins/render_gdp/meshrender.cpp -+++ meshlab/src/meshlabplugins/render_gdp/meshrender.cpp -@@ -29,6 +29,9 @@ - #include <QTextStream> - #include "../../meshlab/glarea.h" - -+#include <common/pluginmanager.h> -+ -+ - using namespace std; - using namespace vcg; - -@@ -38,7 +41,7 @@ void MeshShaderRenderPlugin::initActionList() { - qaNone->setCheckable(false); - actionList << qaNone;*/ - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins") - shadersDir.cdUp(); -diff --git a/src/meshlabplugins/render_gdp/shaderDialog.cpp b/src/meshlabplugins/render_gdp/shaderDialog.cpp -index 13157579..1f14b7bf 100644 ---- a/src/meshlabplugins/render_gdp/shaderDialog.cpp -+++ meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp -@@ -32,6 +32,8 @@ - #include <QCheckBox> - #include <QPushButton> - -+#include <common/pluginmanager.h> -+ - #define DECFACTOR 100000.0f - - using namespace vcg; -@@ -317,7 +319,7 @@ void ShaderDialog::changeTexturePath(int i) { - void ShaderDialog::browseTexturePath(int i) { - QFileDialog fd(0,"Choose new texture"); - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") - shadersDir.cdUp(); -diff --git a/src/plugins_experimental/render_splatpyramid/dialog.cpp b/src/plugins_experimental/render_splatpyramid/dialog.cpp -index 589ba482..f0225c40 100644 ---- a/src/plugins_experimental/render_splatpyramid/dialog.cpp -+++ meshlab/src/plugins_experimental/render_splatpyramid/dialog.cpp -@@ -3,6 +3,8 @@ - #include <QFileDialog> - #include <QMessageBox> - -+#include <common/pluginmanager.h> -+ - - #define DECFACTOR 100000.0f - -@@ -123,7 +125,7 @@ void Dialog::changeTexturePath(int i) { - void Dialog::browseTexturePath(int i) { - QFileDialog fd(0,"Choose new texture"); - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") - shadersDir.cdUp(); -diff --git a/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -index a4915d10..d6325aa4 100644 ---- a/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -+++ meshlab/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -@@ -18,6 +18,8 @@ - #include <QTextStream> - #include <wrap/gl/trimesh.h> - -+#include <common/pluginmanager.h> -+ - //#include <QGLFramebufferObject> - - //#include "GL/glut.h" -@@ -85,7 +87,7 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &, - objects[i].setRendererType( render_mode ); - - /// Sets the path to the meshlab's shaders directory -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) - shadersDir.cdUp(); diff --git a/ssynth.patch b/ssynth.patch deleted file mode 100644 index 459c0f411e27..000000000000 --- a/ssynth.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/external/structuresynth-1.5/structuresynth.pro b/src/external/structuresynth-1.5/structuresynth.pro -index b946f88b..a019ba48 100644 ---- a/src/external/structuresynth-1.5/structuresynth.pro -+++ b/src/external/structuresynth-1.5/structuresynth.pro -@@ -2,6 +2,8 @@ TEMPLATE = lib - TARGET = ssynth - CONFIG += staticlib - -+QMAKE_CXXFLAGS+=-fopenmp -+ - DEPENDPATH += . \ - ssynth \ - ssynth/StructureSynth/Model \ -diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.pro b/src/meshlabplugins/filter_ssynth/filter_ssynth.pro -index 5ab0cd36..dd5506a7 100644 ---- a/src/meshlabplugins/filter_ssynth/filter_ssynth.pro -+++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.pro -@@ -18,6 +18,8 @@ win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/ssynth.lib - win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/ssynth.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/libssynth.a - linux-g++:LIBS += ../../external/lib/linux-g++/libssynth.a -+linux-g++:LIBS += -lgomp -+QMAKE_CXXFLAGS+=-fopenmp - macx:LIBS += ../../external/lib/macx64/libssynth.a - TARGET = filter_ssynth - TEMPLATE = lib |