summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/hugin/README4
-rw-r--r--graphics/hugin/hugin.SlackBuild18
-rw-r--r--graphics/hugin/hugin.info8
-rw-r--r--graphics/hugin/patch.lensfun-0.3.019
4 files changed, 12 insertions, 37 deletions
diff --git a/graphics/hugin/README b/graphics/hugin/README
index 87809f1047..05cf86b958 100644
--- a/graphics/hugin/README
+++ b/graphics/hugin/README
@@ -2,3 +2,7 @@ An easy to use cross-platform panoramic imaging toolchain based on
Panorama Tools. With hugin you can assemble a mosaic of photographs
into a complete immersive panorama, stitch any series of overlapping
pictures and much more.
+Since version 2015.0.0 the external lensfun library is replaced by
+an internal database. vigra now has to be compiled with OpenEXR
+support. And last but not least hugin now ships an own blender tool
+which you could use instead of enblend.
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 70dd5f9571..f7915c45b6 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -3,12 +3,8 @@
# Slackware build script for Hugin
#
# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2011-2015 by titopoquito (titopoquito@gmail.com)
# All rights reserved.
-# 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 and 2014.0.0 by titopoquito
-# (titopoquito@gmail.com)
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
@@ -28,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hugin
-VERSION=${VERSION:-2014.0.0}
+VERSION=${VERSION:-2015.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -68,18 +64,12 @@ 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 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cmake \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
@@ -99,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
mv $PKG/usr/share/man $PKG/usr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL_cmake LICENCE_VIGRA README README_JP \
+cp -a AUTHORS COPYING ChangeLog INSTALL_cmake README README_JP \
TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/hugin/hugin.info b/graphics/hugin/hugin.info
index aae0d08df6..965382733d 100644
--- a/graphics/hugin/hugin.info
+++ b/graphics/hugin/hugin.info
@@ -1,10 +1,10 @@
PRGNAM="hugin"
-VERSION="2014.0.0"
+VERSION="2015.0.0"
HOMEPAGE="http://hugin.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2014.0.0.tar.bz2"
-MD5SUM="711784c27bdb743ddc45dc2c448ac87c"
+DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2015.0.0.tar.bz2"
+MD5SUM="fda7d06f296d3d8ded5b03b0062642cd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="enblend-enfuse exiftool lensfun libpano13 tclap wxPython"
+REQUIRES="enblend-enfuse exiftool libpano13 tclap wxPython"
MAINTAINER="titopoquito"
EMAIL="titopoquito@gmail.com"
diff --git a/graphics/hugin/patch.lensfun-0.3.0 b/graphics/hugin/patch.lensfun-0.3.0
deleted file mode 100644
index ff195c90e0..0000000000
--- a/graphics/hugin/patch.lensfun-0.3.0
+++ /dev/null
@@ -1,19 +0,0 @@
-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;
-