aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/hugin/hugin.SlackBuild11
-rw-r--r--graphics/hugin/hugin.info4
-rw-r--r--graphics/hugin/patch.lensfun-0.3.019
3 files changed, 30 insertions, 4 deletions
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 735986b2e3d9..70dd5f957151 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -7,7 +7,7 @@
# Modified 2011 for version 2011.0.0 by titopoquito
# Modified 2012 for version 2011.4.0 by titopoquito
# Modified 2013 for version 2012.0.0 by titopoquito
-# Modified 2014 for version 2013.0.0 by titopoquito
+# Modified 2014 for version 2013.0.0 and 2014.0.0 by titopoquito
# (titopoquito@gmail.com)
#
# Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hugin
-VERSION=${VERSION:-2013.0.0}
+VERSION=${VERSION:-2014.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -67,6 +67,13 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
+
+# make it compile with lensfun 0.3.0
+# taken from the gentoo-commits.gentoo.org
+# mailing list. Thanks to Francesco Riosa!
+# https://bugs.gentoo.org/show_bug.cgi?id=524700
+patch -p1 < $CWD/patch.lensfun-0.3.0
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/graphics/hugin/hugin.info b/graphics/hugin/hugin.info
index 4c1e7b6fac06..a411fd98b764 100644
--- a/graphics/hugin/hugin.info
+++ b/graphics/hugin/hugin.info
@@ -1,8 +1,8 @@
PRGNAM="hugin"
VERSION="2013.0.0"
HOMEPAGE="http://hugin.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2013.0.0.tar.bz2"
-MD5SUM="cc6c768df2aedc24a9a081754de05f39"
+DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2014.0.0.tar.bz2"
+MD5SUM="711784c27bdb743ddc45dc2c448ac87c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="enblend-enfuse exiftool lensfun libpano13 tclap wxPython"
diff --git a/graphics/hugin/patch.lensfun-0.3.0 b/graphics/hugin/patch.lensfun-0.3.0
new file mode 100644
index 000000000000..ff195c90e041
--- /dev/null
+++ b/graphics/hugin/patch.lensfun-0.3.0
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/show_bug.cgi?id=524700
+
+diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp
+hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp
+--- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp 2014-04-27
+08:26:57.000000000 +0200
++++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp 2014-10-08
+10:44:29.445076647 +0200
+@@ -620,7 +620,9 @@
+ break;
+ case LF_DIST_MODEL_NONE:
+ case LF_DIST_MODEL_POLY5:
++#ifdef LF_DIST_MODEL_FOV1
+ case LF_DIST_MODEL_FOV1:
++#endif
+ default:
+ return false;
+ break;
+