summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/hugin/README2
-rw-r--r--graphics/hugin/hugin.SlackBuild13
-rw-r--r--graphics/hugin/hugin.info12
-rw-r--r--graphics/hugin/libpng14-fix.diff19
4 files changed, 14 insertions, 32 deletions
diff --git a/graphics/hugin/README b/graphics/hugin/README
index 66867e1fbf..e76be8a821 100644
--- a/graphics/hugin/README
+++ b/graphics/hugin/README
@@ -4,6 +4,6 @@ into a complete immersive panorama, stitch any series of overlapping
pictures and much more.
This requires libpano13 and either wxPython, wxGTK, or wxX11 to build,
-and exiftool, enblend-enfuse, autopano-sift-C are required for it to run.
+and exiftool as well as enblend-enfuse are required for it to run.
This build was only tested with wxPython, so consider that when choosing.
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 3b77b4dfa4..c906e6d4f9 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -4,6 +4,8 @@
#
# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
# All rights reserved.
+# Modified 2011 for version 2011.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:
@@ -23,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hugin
-VERSION=2009.4.0
+VERSION=2011.0.0
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,19 +62,19 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-patch -p1 < $CWD/libpng14-fix.diff
-
cmake \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-DLIB_SUFFIX="$LIBDIRSUFFIX" \
- -DCMAKE_INSTALL_PREFIX=/usr .
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release .
make
make install DESTDIR=$PKG
@@ -81,7 +83,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mv $PKG/usr/share/man $PKG/usr
-gzip -9 $PKG/usr/man/man?/*.?
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL_cmake LICENCE_VIGRA README README_JP \
diff --git a/graphics/hugin/hugin.info b/graphics/hugin/hugin.info
index fb2d200162..cbdc98f990 100644
--- a/graphics/hugin/hugin.info
+++ b/graphics/hugin/hugin.info
@@ -1,10 +1,10 @@
PRGNAM="hugin"
-VERSION="2009.4.0"
+VERSION="2011.0.0"
HOMEPAGE="http://hugin.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2009.4.0.tar.gz"
-MD5SUM="ed197d35213a46c77489f512cb8ff191"
+DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2011.0.0.tar.bz2"
+MD5SUM="ac8a129b4c3021233df6d9368c8164cf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+MAINTAINER="titopoquito"
+EMAIL="titopoquito@gmail.com"
+APPROVED="Niels Horn"
diff --git a/graphics/hugin/libpng14-fix.diff b/graphics/hugin/libpng14-fix.diff
deleted file mode 100644
index c6db4691a8..0000000000
--- a/graphics/hugin/libpng14-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-
-diff -r 827cc1b11702 -r f978e43bbdd4 src/foreign/vigra/vigra_impex/png.cxx
---- a/src/foreign/vigra/vigra_impex/png.cxx Mon Aug 20 12:59:12 2007 +0000
-+++ b/src/foreign/vigra/vigra_impex/png.cxx Mon Feb 01 15:10:49 2010 +0000
-@@ -271,8 +271,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
-
-
-
-