summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--mpir.patch5
3 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index edf0378cf41d..0b4a5dd1272a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = meshlab
pkgdesc = System for processing and editing triangular meshes
pkgver = 1.3.3
- pkgrel = 3
+ pkgrel = 4
url = http://meshlab.sourceforge.net/
install = meshlab.install
arch = i686
@@ -27,7 +27,7 @@ pkgbase = meshlab
md5sums = cbdd83d4f3ed69e7a9837c34ebae307a
md5sums = 65d7ff92ad2d6e74119af9c0e377bb37
md5sums = 4139d3217f1540c67306545213126391
- md5sums = 581064adf1319814a33b05d0af37a340
+ md5sums = 308f1b90f7de56f9df1485808713ed53
md5sums = 2cc1246fc1b01029ae762c82a7dbf364
md5sums = 1df4ee299f4ad996a05e80d9cf5e5389
md5sums = 32a52b0a8dab1b4816b028b463e7fd9c
diff --git a/PKGBUILD b/PKGBUILD
index a2469921a289..ac4ca484d0b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jonathan Liu <net147@gmail.com>
pkgname=meshlab
pkgver=1.3.3
-pkgrel=3
+pkgrel=4
pkgdesc="System for processing and editing triangular meshes"
arch=('i686' 'x86_64')
url="http://meshlab.sourceforge.net/"
@@ -21,7 +21,7 @@ noextract=("MeshLabSrc_AllInc_v${pkgver//./}.tgz")
md5sums=('cbdd83d4f3ed69e7a9837c34ebae307a'
'65d7ff92ad2d6e74119af9c0e377bb37'
'4139d3217f1540c67306545213126391'
- '581064adf1319814a33b05d0af37a340'
+ '308f1b90f7de56f9df1485808713ed53'
'2cc1246fc1b01029ae762c82a7dbf364'
'1df4ee299f4ad996a05e80d9cf5e5389'
'32a52b0a8dab1b4816b028b463e7fd9c'
diff --git a/mpir.patch b/mpir.patch
index a3f8d051d891..9a318daf0172 100644
--- a/mpir.patch
+++ b/mpir.patch
@@ -1,10 +1,11 @@
diff -Nur 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 2014-04-02 02:59:31.000000000 +1100
-+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000
-@@ -18,6 +18,4 @@
++++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2015-08-26 11:48:18.782952141 +1000
+@@ -18,6 +18,5 @@
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
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
-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++:LIBS += -lmpirxx -lmpir