graphics/hugin: version 2011.4.0

5 files changed, 76 insertions, 2 deletions

diff --git a/graphics/hugin/0001-add-missing-header.patch b/graphics/hugin/0001-add-missing-header.patch
new file mode 100644
index 0000000000..c03d0d609f
--- /dev/null
+++ b/graphics/hugin/0001-add-missing-header.patch
@@ -0,0 +1,31 @@
+From 1a05cd9d1d5dd743416aa3554408a118a832aa51 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:22:51 +0200
+Subject: [PATCH 1/2] add missing header
+
+---
+ src/celeste/Utilities.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/celeste/Utilities.cpp b/src/celeste/Utilities.cpp
+index 56bb2f7..6e6c2e6 100755
+--- a/src/celeste/Utilities.cpp
++++ b/src/celeste/Utilities.cpp
+@@ -27,6 +27,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling
+ 
+ #include <math.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "Utilities.h"
+ 
+ using namespace std; 
+@@ -285,4 +286,4 @@ int SafeAbs( int val )
+ 	else return val;
+ }
+ 
+-}; // namespace
+\ No newline at end of file
++}; // namespace
+-- 
+1.8.0
+
diff --git a/graphics/hugin/0002-access-extract-through-this-pointer.patch b/graphics/hugin/0002-access-extract-through-this-pointer.patch
new file mode 100644
index 0000000000..c29b5bef06
--- /dev/null
+++ b/graphics/hugin/0002-access-extract-through-this-pointer.patch
@@ -0,0 +1,34 @@
+From 345bb4349b2c37e3193378347db557abf6d200aa Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:24:43 +0200
+Subject: [PATCH 2/2] access extract through this pointer
+
+---
+ src/foreign/zthread/include/zthread/Guard.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/foreign/zthread/include/zthread/Guard.h b/src/foreign/zthread/include/zthread/Guard.h
+index abcd92c..e690a5b 100755
+--- a/src/foreign/zthread/include/zthread/Guard.h
++++ b/src/foreign/zthread/include/zthread/Guard.h
+@@ -428,7 +428,7 @@ public:
+   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 @@ public:
+   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));
+ 
+   }
+ 
+-- 
+1.8.0
+
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index cf2f44274d..94e9a67267 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,8 +1,8 @@
            SPELL=hugin
-         VERSION=2011.2.0
+         VERSION=2011.4.0
           SOURCE="$SPELL-$VERSION.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
-     SOURCE_HASH=sha512:00352855f5bf9d96580d100a83322f4bb374e89da418ae2a9e97653a0e3c1598c28cbaa99f310bdbdb955e637ffbd5f7d47810052e455a6ecbc752c4e8b1eac5
+     SOURCE_HASH=sha512:13f2e1d72e1bc7e3c3871dd845ec3cd7aefe9dc1bf108808996b9dccdfff6a10a8dba2935f1a20c898385e97bdf8f08e9f77bb315e73ae5240eb594bfbc55803
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://hugin.sourceforge.net/"
       LICENSE[0]=GPL
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index e9e6bc616e..8c074062a7 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2011.4.0
+	* 0001-add-missing-header.patch, 0002-access-extract-through-this-pointer.patch,
+	  PRE_BUILD: added patches to prevent compile errors
+
 2010-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 2011.2.0
 	* DEPENDS: added dependency on tclap
diff --git a/graphics/hugin/PRE_BUILD b/graphics/hugin/PRE_BUILD
new file mode 100755
index 0000000000..c3b88b62eb
--- /dev/null
+++ b/graphics/hugin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-header.patch &&
+patch -p1 < $SPELL_DIRECTORY/0002-access-extract-through-this-pointer.patch