old

(Portage version: 2.2_rc26/cvs/Linux i686)

6 files changed, 6 insertions, 194 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 688c592abdd0..da3ac4c3ff20 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.56 2009/03/18 07:04:00 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.57 2009/03/19 19:09:18 maekke Exp $
+
+  19 Mar 2009; Markus Meier <maekke@gentoo.org>
+  -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
+  -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
+  old
 
   18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
   Marked ppc stable for bug #246827.
diff --git a/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch b/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch
deleted file mode 100644
index cd098f07e3c1..000000000000
--- a/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- hugin-0.6.1.orig/src/hugin/AutoCtrlPointCreator.cpp
-+++ hugin-0.6.1/src/hugin/AutoCtrlPointCreator.cpp
-@@ -224,8 +224,7 @@
- 		wxSetWorkingDirectory(apDir);
- 	}
- #endif
--
--    wxString ptofile(wxT("autopano_result_tempfile.pto"));
-+    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
-     autopanoArgs.Replace(wxT("%o"), ptofile);
-     wxString tmp;
-     tmp.Printf(wxT("%d"), nFeatures);
-@@ -415,7 +414,7 @@
-         imgNr++;
-     }
- 
--    wxString ptofile(wxT("autopano_result_tempfile"));
-+    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
-     autopanoArgs.Replace(wxT("%o"), ptofile);
-     wxString tmp;
-     tmp.Printf(wxT("%d"), nFeatures);
-only in patch2:
-unchanged:
---- hugin-0.6.1.orig/src/Panorama/PTOptimise.cpp
-+++ hugin-0.6.1/src/Panorama/PTOptimise.cpp
-@@ -36,8 +36,8 @@
- #include <boost/property_map.hpp>
- #include <boost/graph/graph_utility.hpp>
- 
--#define DEBUG_WRITE_OPTIM_OUTPUT
--#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
-+//#define DEBUG_WRITE_OPTIM_OUTPUT
-+//#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
- 
- using namespace std;
- using namespace PT;
diff --git a/media-gfx/hugin/files/hugin-0.6.1-as-needed.patch b/media-gfx/hugin/files/hugin-0.6.1-as-needed.patch
deleted file mode 100644
index 361fb0822f12..000000000000
--- a/media-gfx/hugin/files/hugin-0.6.1-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hugin-0.6.1.org/src/Panorama/Makefile.am hugin-0.6.1/src/Panorama/Makefile.am
---- hugin-0.6.1.org/src/Panorama/Makefile.am	2006-02-11 22:29:51.000000000 +0100
-+++ hugin-0.6.1/src/Panorama/Makefile.am	2007-06-01 21:49:57.000000000 +0200
-@@ -7,5 +7,7 @@
- noinst_LTLIBRARIES = libpanorama.la
- libpanorama_la_SOURCES = Panorama.cpp PanoramaMemento.cpp PanoImage.cpp PanoToolsInterface.cpp SpaceTransform.cpp PTOptimise.cpp ImageGraph.cpp Stitcher.cpp Stitcher1.cpp Stitcher2.cpp Stitcher3.cpp Stitcher4.cpp
- 
-+libpanorama_la_LIBADD = $(BOOST_THREAD_LIB)
-+
- EXTRA_DIST=Panorama.vcproj OptimizeOptions.cpp
- noinst_HEADERS =
diff --git a/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch b/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch
deleted file mode 100644
index 6888f5840395..000000000000
--- a/media-gfx/hugin/files/hugin-0.6.1-gcc43.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -NrU5 hugin-0.6.1.orig/src/common/utils.cpp hugin-0.6.1/src/common/utils.cpp
---- hugin-0.6.1.orig/src/common/utils.cpp	2006-07-25 23:13:27.000000000 +0200
-+++ hugin-0.6.1/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.6.1.orig/src/foreign/vigra/imageinfo.hxx hugin-0.6.1/src/foreign/vigra/imageinfo.hxx
---- hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx	2006-08-09 22:48:44.000000000 +0200
-+++ hugin-0.6.1/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.6.1.orig/src/include/common/utils.h hugin-0.6.1/src/include/common/utils.h
---- hugin-0.6.1.orig/src/include/common/utils.h	2006-01-09 16:33:16.000000000 +0100
-+++ hugin-0.6.1/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.6.1.orig/src/tools/color_correct_tiff.cpp hugin-0.6.1/src/tools/color_correct_tiff.cpp
---- hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp	2006-01-11 14:07:37.000000000 +0100
-+++ hugin-0.6.1/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>
diff --git a/media-gfx/hugin/hugin-0.6.1-r2.ebuild b/media-gfx/hugin/hugin-0.6.1-r2.ebuild
deleted file mode 100644
index 3bf3b1f1fe43..000000000000
--- a/media-gfx/hugin/hugin-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.6.1-r2.ebuild,v 1.7 2008/10/08 18:40:16 maekke Exp $
-
-inherit wxwidgets eutils autotools libtool
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="unicode debug enblend sift"
-
-DEPEND="app-arch/zip
-		>=media-libs/libpano12-2.8.4
-		>=dev-libs/boost-1.30.0
-		x11-libs/gtk+
-		=x11-libs/wxGTK-2.6*
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff
-		enblend? ( >=media-gfx/enblend-2.4 )
-		sift? ( media-gfx/autopano-sift )"
-
-pkg_setup() {
-	if ! built_with_use --missing true dev-libs/boost threads ; then
-		local msg="Build dev-libs/boost with USE=threads"
-		eerror "$msg"
-		die "$msg"
-	fi
-	if ! use enblend; then
-		elog "It is recommended to emerge this package with the"
-		elog "enblend use flag to install media-gfx/enblend"
-		elog "that blends the seams between images in a panorama."
-	fi
-	if ! use sift; then
-		elog "It is recommended to emerge this package with the"
-		elog "sift use flag to install media-gfx/autopano-sift"
-		elog "that produces control points between images in a"
-		elog "panorama."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-1_0.6.1-1.1.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_compile() {
-	export WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
-	else
-		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
-	fi
-
-	myconf="`use_with unicode`
-			`use_enable debug`"
-
-	econf --with-wx-config="${WX_CONFIG}" ${myconf} || die "configure failed"
-	emake || die "compiling failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS BUGS README TODO
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index abb3935d8c6e..1c5a45947d14 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -4,8 +4,6 @@
 	<herd>graphics</herd>
 	<longdescription>hugin is a panorama stitching program</longdescription>
 	<use>
-		<flag name='enblend'>add support for nice image blending with
-		<pkg>media-gfx/enblend</pkg></flag>
 		<flag name='sift'>automatically align images with
 		<pkg>media-gfx/autopano-sift</pkg> or
 		<pkg>media-gfx/autopano-sift-C</pkg></flag>