aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2014-12-27 12:15:34 +0000
committerRobby Workman <rworkman@slackbuilds.org>2014-12-27 23:14:49 -0600
commitedb035d06a052b3dd4bebcadba7456813976bf2d (patch)
tree4a5b04b71d258eec0c5f2cc7556b96b2b893c666
parent478fc82c3363396c70db02b111fba7b25460000b (diff)
graphics/meshlab: Fix build on i486.
New external dep mpir was previously internal (and x86_64 only). Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--graphics/meshlab/meshlab.SlackBuild4
-rw-r--r--graphics/meshlab/meshlab.info2
2 files changed, 4 insertions, 2 deletions
diff --git a/graphics/meshlab/meshlab.SlackBuild b/graphics/meshlab/meshlab.SlackBuild
index 122fff357fce5..309d2aa3e4fd8 100644
--- a/graphics/meshlab/meshlab.SlackBuild
+++ b/graphics/meshlab/meshlab.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=meshlab
VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCNAM=MeshLabSrc_AllInc
@@ -77,6 +77,8 @@ find -L . \
patch -p1 < $CWD/plystuff.diff
# fix silly lapack error in ancient levmar (thanks to net147 over at Arch)
patch -p1 -d meshlab < $CWD/lapack.patch
+# use external mpir -- meshlab ships x86_64 static libs, but no src or libs for i486
+sed -i -e '/mpir/d' meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
# Build all the dependencies. These will be statically linked into meshlab.
# (Horrible duplication and many out of date, but avoids version clashes)
diff --git a/graphics/meshlab/meshlab.info b/graphics/meshlab/meshlab.info
index 9a2f6999f8ed6..0e02c692e157d 100644
--- a/graphics/meshlab/meshlab.info
+++ b/graphics/meshlab/meshlab.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/meshlab/MeshLabSrc_AllInc_v133.tgz"
MD5SUM="cbdd83d4f3ed69e7a9837c34ebae307a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lapack"
+REQUIRES="lapack mpir"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"