hugin: Updated to version 0.7.0_rc6. Now used cmake.

Works with gcc 4.3.x

6 files changed, 15 insertions, 75 deletions

diff --git a/graphics/hugin/BUILD b/graphics/hugin/BUILD
index 925c73c909..a2ef2bbd46 100755
--- a/graphics/hugin/BUILD
+++ b/graphics/hugin/BUILD
@@ -1,2 +1,2 @@
-OPTS="--enable-shared --enable-static=no $OPTS" &&
-default_build
\ No newline at end of file
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr -DHUGIN_SHARED=1
+make
diff --git a/graphics/hugin/DEPENDS b/graphics/hugin/DEPENDS
index a9e1128ecc..41e0872f74 100755
--- a/graphics/hugin/DEPENDS
+++ b/graphics/hugin/DEPENDS
@@ -7,6 +7,7 @@ depends -sub THREAD boost &&
 depends tiff &&
 depends jpeg &&
 depends libpng &&
+depends cmake &&
 runtime_depends image-exiftool &&
 suggest_depends autopano-sift-c "" "" "for control point generation"
 
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index 94669a9ac2..824d553781 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,9 +1,9 @@
            SPELL=hugin
-         VERSION=0.7_beta4
-          SOURCE="$SPELL-$VERSION.tar.bz2"
+         VERSION=0.7.0_rc6
+          SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
-     SOURCE_HASH=sha512:8c1036263c5c53e397d962108a6eba8c85d6eacc95e7e4795c0ac16fdc92bb0e7299c1c8edd1cf2f0d62ecdd9fe6151d233e9d286e16fe18d04d37c9c372b3de
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+     SOURCE_HASH=sha512:b86a82fc94df5adfbd6079069dd5f03786c46c27e2cfa91f4c7984f5877f967f38c0742e19e7bea49d8cad82898d5066346975b1f6690362c980bd89d1840ffc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-0.7.0"
         WEB_SITE="http://hugin.sourceforge.net/"
       LICENSE[0]=GPL
          ENTERED=20080711
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index b9f25e6c2a..d46fb19f25 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,11 @@
+2008-09-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 0.7.0_rc6. Fixed SOURCE_DIRECTORY
+	  Updated SOURCE
+	* PRE_BUILD: Removed. Not needed.
+	* BUILD: uses cmake now
+	* DEPENDS: depends cmake
+	* hugin-0.7_beta4-gcc43.patch: Removed incorporated upstream
+
 2008-07-22 Jaeic Lee <zeraxeal@gmail.com>
 	* PRE_BUILD, gcc43.patch: added to enable building in gcc4.3
 	* BUILD: added to build hugin with shared library
diff --git a/graphics/hugin/PRE_BUILD b/graphics/hugin/PRE_BUILD
deleted file mode 100755
index 3fdc956359..0000000000
--- a/graphics/hugin/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p0 < ${SCRIPT_DIRECTORY}/hugin-0.7_beta4-gcc43.patch
diff --git a/graphics/hugin/hugin-0.7_beta4-gcc43.patch b/graphics/hugin/hugin-0.7_beta4-gcc43.patch
deleted file mode 100644
index a1a06d19df..0000000000
--- a/graphics/hugin/hugin-0.7_beta4-gcc43.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -NrU5 hugin-0.7_beta4/src/common/utils.cpp hugin-0.7_beta4/src/common/utils.cpp
---- hugin-0.7_beta4/src/common/utils.cpp	2006-07-25 23:13:27.000000000 +0200
-+++ hugin-0.7_beta4/src/common/utils.cpp	2008-04-30 00:40:03.000000000 +0200
-@@ -27,10 +27,11 @@
- #else
-     #include <sys/time.h>
- #endif
- #include <time.h>
- #include <stdio.h>
-+#include <cstring>
- #include "common/utils.h"
- 
- #ifdef unix
- std::string utils::CurrentTime()
- {
-diff -NrU5 hugin-0.7_beta4/src/foreign/vigra/imageinfo.hxx hugin-0.7_beta4/src/foreign/vigra/imageinfo.hxx
---- hugin-0.7_beta4/src/foreign/vigra/imageinfo.hxx	2006-08-09 22:48:44.000000000 +0200
-+++ hugin-0.7_beta4/src/foreign/vigra/imageinfo.hxx	2008-04-30 00:43:14.000000000 +0200
-@@ -50,10 +50,11 @@
- #ifndef VIGRA_IMAGEINFO_HXX
- #define VIGRA_IMAGEINFO_HXX
- 
- #include <memory>
- #include <string>
-+#include <cstring>
- #include "vigra/utilities.hxx"
- #include "vigra/codec.hxx"
- 
- namespace vigra
- {
-diff -NrU5 hugin-0.7_beta4/src/include/common/utils.h hugin-0.7_beta4/src/include/common/utils.h
---- hugin-0.7_beta4/src/include/common/utils.h	2006-01-09 16:33:16.000000000 +0100
-+++ hugin-0.7_beta4/src/include/common/utils.h	2008-04-30 00:48:33.000000000 +0200
-@@ -22,11 +22,13 @@
-  */
- 
- #ifndef _UTILS_H
- #define _UTILS_H
- 
-+#include <cstdlib>
- #include <string>
-+#include <cstring>
- #include <vector>
- #include <iostream>
- #include <sstream>
- #include <cassert>
- 
-diff -NrU5 hugin-0.7_beta4/src/tools/color_correct_tiff.cpp hugin-0.7_beta4/src/tools/color_correct_tiff.cpp
---- hugin-0.7_beta4/src/tools/color_correct_tiff.cpp	2006-01-11 14:07:37.000000000 +0100
-+++ hugin-0.7_beta4/src/tools/color_correct_tiff.cpp	2008-04-30 00:58:54.000000000 +0200
-@@ -11,14 +11,15 @@
-  * -c do per-channel correction (different correction on each RGB channel)
-  * Images must be tiff, have the same size, have been aligned prior to correction
-  * and have some opaque overlapping parts (ie use nona with multiple tiff output).
-  */
- 
-+#include <cstdlib>
- #include <iostream>
- #include <sstream>
- #include <exception>
--#include <string>
-+#include <cstring>
- #include <vector>
- #include <map>
- #include <utility>
- #include <cctype>
- #include <cmath>