3.0 version bump for bug 164677. Thanks to Ralph Holz <ralph-bugzillagentoo at ralphholz dot de>, Tim Harder <thorium90 at gmail dot com>, Hal Engel <hvengel at astound dot net> and Christian Kanzian <christian.kanzian at gmx dot at>.

(Portage version: 2.1.1-r2)

6 files changed, 110 insertions, 3 deletions

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index e556ae400979..57dd8037e683 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/enblend
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.12 2006/07/15 10:50:33 kloeri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.13 2007/02/05 03:46:34 vanquirius Exp $
+
+*enblend-3.0 (05 Feb 2007)
+
+  05 Feb 2007; Marcelo Goes <vanquirius@gentoo.org>
+  +files/enblend-3.0-amd64_compilation.patch,
+  +files/enblend-3.0-endless_loop_anneal.patch, +enblend-3.0.ebuild:
+  3.0 version bump for bug 164677. Thanks to Ralph Holz <ralph-bugzillagentoo
+  at ralphholz dot de>, Tim Harder <thorium90 at gmail dot com>, Hal Engel
+  <hvengel at astound dot net> and Christian Kanzian <christian.kanzian at gmx
+  dot at>.
 
   15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove halcy0n from metadata.xml as he's retired.
diff --git a/media-gfx/enblend/enblend-3.0.ebuild b/media-gfx/enblend/enblend-3.0.ebuild
new file mode 100644
index 000000000000..af7a0993e455
--- /dev/null
+++ b/media-gfx/enblend/enblend-3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-3.0.ebuild,v 1.1 2007/02/05 03:46:34 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sf.net"
+SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/tiff
+		media-libs/lcms
+		virtual/glut
+		media-libs/glew
+		media-libs/plotutils
+		>=dev-libs/boost-1.31.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Both of the following patches can be found in the sf.net tracker
+	# Fixes endless loop with seam optimizer and 360 deg images
+	epatch "${FILESDIR}"/${P}-endless_loop_anneal.patch
+
+	# Fixes compilation on AMD64
+	epatch "${FILESDIR}"/${P}-amd64_compilation.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-gfx/enblend/files/digest-enblend-2.5 b/media-gfx/enblend/files/digest-enblend-2.5
index eca59ec26c2b..260f8310f294 100644
--- a/media-gfx/enblend/files/digest-enblend-2.5
+++ b/media-gfx/enblend/files/digest-enblend-2.5
@@ -1 +1,3 @@
-MD5 d760e27fa1fa0395c07cc9d1bb1ea3cc enblend-2.5.tar.gz 445337
+MD5 8f019290eaa761c3bc736a69bde2ba8b enblend-2.5.tar.gz 345786
+RMD160 c768f6265924ad7ebae400cfc3eeda731c8398e3 enblend-2.5.tar.gz 345786
+SHA256 f78527d2d06347531c3871df6d313c47b0d925ecb96094181fb6d54fd2fe9a6f enblend-2.5.tar.gz 345786
diff --git a/media-gfx/enblend/files/digest-enblend-3.0 b/media-gfx/enblend/files/digest-enblend-3.0
new file mode 100644
index 000000000000..47b352300044
--- /dev/null
+++ b/media-gfx/enblend/files/digest-enblend-3.0
@@ -0,0 +1,3 @@
+MD5 f80a12ff91a6122c5ea0d102443929da enblend-3.0.tar.gz 661778
+RMD160 fceaece3b39b1b8f93f34efa5273a18fc2da356d enblend-3.0.tar.gz 661778
+SHA256 ab45109ff1cdf9318f7835a80df383c4c2a125db1af8d86a096a02d211254268 enblend-3.0.tar.gz 661778
diff --git a/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch b/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch
new file mode 100644
index 000000000000..418f2adf4cd0
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch
@@ -0,0 +1,13 @@
+--- src/anneal.h	27 Jan 2007 05:00:39 -0000	1.2
++++ src/anneal.h	3 Feb 2007 09:27:30 -0000
+@@ -678,7 +695,7 @@
+ 
+             localK = stateSpace->size();
+             if (localK < 2) convergedPoints[index] = true;
+-            kMax = std::max(kMax, stateProbabilities->size());
++            kMax = std::max((size_t)kMax, stateProbabilities->size());
+ 
+         }
+ 
+
+ 	  	 
diff --git a/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch b/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch
new file mode 100644
index 000000000000..b333b4476e13
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch
@@ -0,0 +1,42 @@
+--- src/anneal.h	27 Jan 2007 05:00:39 -0000	1.2
++++ src/anneal.h	3 Feb 2007 09:27:30 -0000
+@@ -235,13 +235,25 @@
+             Pi = new double[kMax];
+         }
+ 
++        // dangelo: HACK to work around NaN numbers
++        // force kMax to be > 2 (temporarily)
++        // I'm not sure what the real cause for this is.
++        int kMaxOrig = kMax;
++        if (kMax <= 2) kMax = 15;
+         tau = 0.75;
+         deltaEMax = 7000.0;
+         deltaEMin = 5.0;
+         double epsilon = 1.0 / (kMax * kMax);
+         tInitial = ceil(deltaEMax / log((kMax - 1 + (kMax * kMax * epsilon)) / (kMax - 1 - (kMax * kMax * epsilon))));
++
+         tFinal = deltaEMin / log((kMax - (kMax * epsilon) - 1) / (kMax * epsilon));
+ 
++        kMax = kMaxOrig;
++
++        if (Verbose > VERBOSE_GDA_MESSAGES) {
++            cout << endl << "tInitial=" << tInitial << " tFinal=" << tFinal << " epsilon=" << epsilon << " kMax=" << kMax;
++            cout.flush();
++        }
+     }
+ 
+     ~GDAConfiguration() {
+@@ -264,6 +276,11 @@
+ 
+         tCurrent = tInitial;
+ 
++        if (Verbose > VERBOSE_GDA_MESSAGES) {
++            cout << endl << "tInitial=" << tCurrent << " numIterations=" << numIterations;
++            cout.flush();
++        }
++
+         while (tCurrent > tFinal) {
+             double epsilon = 1.0 / kMax;
+             unsigned int eta = (unsigned int)ceil(log(epsilon)
+
+