hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

graphics/hugin: Updated for version 2012.0.0. 

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
This commit is contained in:
titopoquito 2013-04-25 18:57:24 -03:00 committed by Niels Horn
parent 68c3666b9e
commit 12f3f79877
3 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
graphics/hugin/hugin-gcc47.patch
View File

@ -1,33 +0,0 @@
diff -r 658ded2153f2 src/celeste/Utilities.h
--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
+++ b/src/celeste/Utilities.h Sat Jan 07 19:38:25 2012 +0000
@@ -33,6 +33,8 @@
#include <stdio.h>
#ifdef _WINDOWS
#include "direct.h"
+#else
+#include <unistd.h>
#endif
using namespace std;
diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h
--- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100
+++ b/src/foreign/zthread/include/zthread/Guard.h Sat Jan 07 19:38:25 2012 +0000
@@ -428,7 +428,7 @@
template <class U, class V>
Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
- LockingPolicy::shareScope(*this, extract(g));
+ LockingPolicy::shareScope(*this, this->extract(g));
}
@@ -458,7 +458,7 @@
template <class U, class V>
Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
- LockingPolicy::transferScope(*this, extract(g));
+ LockingPolicy::transferScope(*this, this->extract(g));
}

11
graphics/hugin/hugin.SlackBuild
View File

@ -5,7 +5,8 @@
# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA # Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
# All rights reserved. # All rights reserved.
# Modified 2011 for version 2011.0.0 by titopoquito # Modified 2011 for version 2011.0.0 by titopoquito
# Modified 2012 for version 2011.4.0 by titopoquito # Modified 2012 for version 2011.4.0 by titopoquito
# Modified 2013 for version 2012.0.0 by titopoquito
# (titopoquito@gmail.com) # (titopoquito@gmail.com)
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is
@ -26,8 +27,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hugin PRGNAM=hugin
VERSION=2011.4.0 VERSION=2012.0.0
BUILD=${BUILD:-2} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -68,10 +69,6 @@ cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
chmod -R u+w,go+r-w,a-s . chmod -R u+w,go+r-w,a-s .
# apply patch to make compilation work with gcc 4.7
# patch taken from https://bugs.launchpad.net/hugin/+bug/913250
patch -p1 < $CWD/hugin-gcc47.patch
cmake \ cmake \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \

8
graphics/hugin/hugin.info
View File

@ -1,10 +1,10 @@
PRGNAM="hugin" PRGNAM="hugin"
VERSION="2011.4.0" VERSION="2012.0.0"
HOMEPAGE="http://hugin.sourceforge.net/" HOMEPAGE="http://hugin.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2011.4.0.tar.bz2" DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2012.0.0.tar.bz2"
MD5SUM="3e4866dbbc7974972604aa18580eae0e" MD5SUM="6a4fb2585eb3539ba6769cf4557f6e88"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="enblend-enfuse exiftool libpano13 tclap wxPython" REQUIRES="enblend-enfuse exiftool lensfun libpano13 tclap wxPython"
MAINTAINER="titopoquito" MAINTAINER="titopoquito"
EMAIL="titopoquito@gmail.com" EMAIL="titopoquito@gmail.com"