diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | external.patch | 16 | ||||
-rw-r--r-- | levmar.patch | 51 | ||||
-rw-r--r-- | mpir.patch | 13 |
5 files changed, 49 insertions, 45 deletions
@@ -1,7 +1,7 @@ pkgbase = meshlab-git pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) pkgver = 1.3.4_r8497062 - pkgrel = 1 + pkgrel = 2 url = http://meshlab.sourceforge.net/ install = meshlab-git.install arch = i686 @@ -22,7 +22,7 @@ pkgbase = meshlab-git depends = qt5-script provides = meshlab conflicts = meshlab - source = git+https://github.com/bartoszek/meshlab.git + source = git+https://github.com/cnr-isti-vclab/meshlab.git source = git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel source = external.patch source = 3ds.patch @@ -1,6 +1,6 @@ # Maintainer: bartus <aur@bartus.33mail.com> pkgname=meshlab-git -pkgver=1.3.4_r8497062 +pkgver=1.3.4_r4915 pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('bzip2' 'muparser' 'levmar' 'lib3ds' 'desktop-file-utils' 'glu' 'mpir' #also create openctm(aur) jhead-lib structuresynth-lib to handle last dep makedepends=('git' 'subversion') install="${pkgname}.install" -source=("git+https://github.com/bartoszek/meshlab.git" +source=("git+https://github.com/cnr-isti-vclab/meshlab.git" "git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel" "external.patch" "3ds.patch" @@ -27,15 +27,15 @@ source=("git+https://github.com/bartoszek/meshlab.git" "meshlab.desktop") md5sums=('SKIP' 'SKIP' - 'e7c45c73829afe804e1c7f6cd19856c9' + '038494125d7bd422074fc5635c5579ca' 'e51b027eb9d78b82de73c4724b3928cf' - 'f1c1d99c92ff296edf9a8f346dd07b3a' + '1a53a92e12f74520b36e38d9a2311834' '64caafa96bef4208d641e889099eba26' '616b0dcf018f46a490867028d6ddc533' '5d87f00356539f84f37f873f304eb11e' 'c1cfb910d20db49ec195d9918036e3c3' '5b59b23cf66e42f8b3d3eabe466b3eaa' - 'bee3a1ea8bf98200314029330b537e58' + '5df295c21de5bac8d6073528823d975a' '2cc1246fc1b01029ae762c82a7dbf364' '18aed0a21276a22325bf8c32166fb110') diff --git a/external.patch b/external.patch index 333a0f5b71d2..f815e3e4640f 100644 --- a/external.patch +++ b/external.patch @@ -1,6 +1,8 @@ ---- ../meshlab/src/external/external.pro 2016-10-30 23:59:56.109729632 +0100 -+++ meshlab/src/external/external.pro 2016-11-01 00:35:20.501863647 +0100 -@@ -2,11 +2,6 @@ +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 @@ -8,9 +10,9 @@ - muparser_v225/src \ - levmar-2.3/levmar-2.3.pro \ - structuresynth-1.5/structuresynth.pro \ -+SUBDIRS = 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 +- jhead-2.95/jhead-2.95.pro \ +- lib3ds-1.3.0/lib3ds/lib3ds.pro -# openkinect/openkinect.pro -+ jhead-2.95/jhead-2.95.pro ++ jhead-2.95/jhead-2.95.pro diff --git a/levmar.patch b/levmar.patch index 34c28aad6da9..a43a2aeb1e6f 100644 --- a/levmar.patch +++ b/levmar.patch @@ -37,32 +37,6 @@ diff -Naur -r ../meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h meshla #include <iostream>
#include <fstream>
-diff -Naur -r ../meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro ---- ../meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro 2016-10-31 00:00:08.816250885 +0100 -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro 2016-10-31 22:22:39.511691359 +0100 -@@ -1,7 +1,7 @@ - include (../../shared.pri)
-
-
--HEADERS = += ./alignset.h \
-+HEADERS += ./alignset.h \
- ./levmarmethods.h \
- ./mutual.h \
- ./parameters.h \
-@@ -28,9 +28,9 @@ -
- 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 -llevmar
--linux-g++-32:LIBS += -L../../external -llevmar
--linux-g++-64:LIBS += -L../../external -llevmar
-+win32-g++:LIBS += -L../../external/lib/win32-g++ -llevmar
-+linux-g++:LIBS += -llevmar
-+linux-g++-32:LIBS += -llevmar
-+linux-g++-64:LIBS += -llevmar
- macx:LIBS += $$MACLIBDIR/liblevmar.a
-
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 @@ -111,3 +85,28 @@ diff -Naur -r ../meshlab/src/plugins_experimental/filter_mutualglobal/solver.h m #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/mpir.patch b/mpir.patch index dab2c375bc22..9e0829b6942c 100644 --- a/mpir.patch +++ b/mpir.patch @@ -1,11 +1,14 @@ -diff -Naur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro ---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2016-10-31 01:44:11.031564544 +0100 -+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2016-10-31 01:45:21.254082268 +0100 -@@ -20,5 +20,7 @@ +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++-64:INCLUDEPATH += ../../external/inc/linux-g++-64/mpir-2.4.0 +-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 |