3.0 version bump for bug 164677. Thanks to Ralph Holz <ralph-bugzillagentoo at ralphh...

Package-Manager: portage-2.1.1-r2

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index e556ae400979fb600050e5c12538a503579678a0..57dd8037e683379313eb066687e704cbad2a3e9a 100644 (file)
--- 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/Manifest b/media-gfx/enblend/Manifest
index 33eb5d02669249c33a8b0d16dffabf41e18cb776..3496c2f9436e9d81e3a8bac3800b24623628ea2b 100644 (file)
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,5 +1,14 @@
+AUX enblend-3.0-amd64_compilation.patch 374 RMD160 767dcbbe4767610e42b4d53ee7687f8fb957c14a SHA1 9add406f5fff084cfe6aa67c3197efc41ec0a123 SHA256 4d06fa29f832bef421bf567fea3f8ed3748d9bb88d860564ce8c07ca5dbe8608
+MD5 b14bf09229298f59a9aed8e503b3e183 files/enblend-3.0-amd64_compilation.patch 374
+RMD160 767dcbbe4767610e42b4d53ee7687f8fb957c14a files/enblend-3.0-amd64_compilation.patch 374
+SHA256 4d06fa29f832bef421bf567fea3f8ed3748d9bb88d860564ce8c07ca5dbe8608 files/enblend-3.0-amd64_compilation.patch 374
+AUX enblend-3.0-endless_loop_anneal.patch 1375 RMD160 455da248993d9ee5faab3b7b6f4fcb80caec44c0 SHA1 fe23b8246875469fa5aea2c9bfe953c7aa2cfe4c SHA256 dfdf427517ae25751ccbfc2b662871c1347e8e50b3f60328de9b15bc86206490
+MD5 6783c1729343e1cb60b77a9248dafe2d files/enblend-3.0-endless_loop_anneal.patch 1375
+RMD160 455da248993d9ee5faab3b7b6f4fcb80caec44c0 files/enblend-3.0-endless_loop_anneal.patch 1375
+SHA256 dfdf427517ae25751ccbfc2b662871c1347e8e50b3f60328de9b15bc86206490 files/enblend-3.0-endless_loop_anneal.patch 1375
 DIST enblend-2.3.tar.gz 433083
-DIST enblend-2.5.tar.gz 445337
+DIST enblend-2.5.tar.gz 345786 RMD160 c768f6265924ad7ebae400cfc3eeda731c8398e3 SHA1 b3b66733042786e1d47a8efed03d126dd6ed7b84 SHA256 f78527d2d06347531c3871df6d313c47b0d925ecb96094181fb6d54fd2fe9a6f
+DIST enblend-3.0.tar.gz 661778 RMD160 fceaece3b39b1b8f93f34efa5273a18fc2da356d SHA1 98f001a4eddb3fd1f9ab7def00d8655d4fb726ea SHA256 ab45109ff1cdf9318f7835a80df383c4c2a125db1af8d86a096a02d211254268
 EBUILD enblend-2.3.ebuild 605 RMD160 2aba16f6d7cf5f3f26a588d7ee05c036c4b26ef5 SHA1 d50d0e0e9e4ae361be6d165fb577454c5c3af99a SHA256 1411022b83e4cd268a081a6288a8fd3332682550a5a4954117f09258ccfc9013
 MD5 a2ae9ecb369821cec7523f45948a3291 enblend-2.3.ebuild 605
 RMD160 2aba16f6d7cf5f3f26a588d7ee05c036c4b26ef5 enblend-2.3.ebuild 605
@@ -8,10 +17,14 @@ EBUILD enblend-2.5.ebuild 577 RMD160 0995d019a2db9f208f269d15c83912e4e7041f20 SH
 MD5 3ced1affc26caa3512b2541f08534843 enblend-2.5.ebuild 577
 RMD160 0995d019a2db9f208f269d15c83912e4e7041f20 enblend-2.5.ebuild 577
 SHA256 175c1a691570df1a6a684c0d922cc62023457280a70c9ce724735beca617ef97 enblend-2.5.ebuild 577
-MISC ChangeLog 1680 RMD160 4c13a1a45946c50264b3bac3c98d1febf8e60140 SHA1 308265627a8ea778efa1a5eec0eee5106e73bc8e SHA256 0f4cd28bb1d8938168cbfffbd110c5acd0437eeea7c865e80000a4124b490882
-MD5 a30c0e13e2d5b7b913322cbd4991ea0f ChangeLog 1680
-RMD160 4c13a1a45946c50264b3bac3c98d1febf8e60140 ChangeLog 1680
-SHA256 0f4cd28bb1d8938168cbfffbd110c5acd0437eeea7c865e80000a4124b490882 ChangeLog 1680
+EBUILD enblend-3.0.ebuild 978 RMD160 d470e22ec0ea02843a39b1e92e7b56bcde28b641 SHA1 6131944a2acc1c2eb228f2326f6b018d3327db3e SHA256 b2fef6b91a63b0d1cebda7d344c65e13671b4b9b372dc639ce437fcb11e03002
+MD5 0836cfdb88378499662a77c4560c69da enblend-3.0.ebuild 978
+RMD160 d470e22ec0ea02843a39b1e92e7b56bcde28b641 enblend-3.0.ebuild 978
+SHA256 b2fef6b91a63b0d1cebda7d344c65e13671b4b9b372dc639ce437fcb11e03002 enblend-3.0.ebuild 978
+MISC ChangeLog 2123 RMD160 1cd4208e8950adff91cfc58c58088ba713d0e677 SHA1 07ed28a3fd8d1a3a7637175df65d342e600110de SHA256 27381bf48618bc7717eb46c1dbd64ac585f21c6c002e840ab295eee192c06cd4
+MD5 66e420c4290a4b8e1d41593531df8036 ChangeLog 2123
+RMD160 1cd4208e8950adff91cfc58c58088ba713d0e677 ChangeLog 2123
+SHA256 27381bf48618bc7717eb46c1dbd64ac585f21c6c002e840ab295eee192c06cd4 ChangeLog 2123
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
 MD5 53f0fc0d071a8326b34f15c530a4de4d metadata.xml 162
 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce metadata.xml 162
@@ -19,6 +32,9 @@ SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2 metadata
 MD5 2ca5f402d09503ce5950b4868323184c files/digest-enblend-2.3 63
 RMD160 ae429d5df647b89a038727518a69afb26609f0da files/digest-enblend-2.3 63
 SHA256 6938a4b1776a4bbea0cd810ced141c75f15b691f5b632138d422e43b874e17a4 files/digest-enblend-2.3 63
-MD5 fada7980691fc284c4f9fea8c5a0b533 files/digest-enblend-2.5 63
-RMD160 f9526bc1435efd3b708e9c478d525d9aefc7b829 files/digest-enblend-2.5 63
-SHA256 323b8bc6af78853b57376ae1b6976d7be5a261c7888d6d94f659d95bb177f298 files/digest-enblend-2.5 63
+MD5 a0eea494a0076a02a9efa5340e417ca4 files/digest-enblend-2.5 235
+RMD160 41f45b74059d3477b7c436d2ec880ac798287175 files/digest-enblend-2.5 235
+SHA256 f25853725f9e9585ef65190233cdee6c806656694233976f91372ceba0f7f085 files/digest-enblend-2.5 235
+MD5 2525518288da02c17eb8c2481fc6e04c files/digest-enblend-3.0 235
+RMD160 4cbbb75a6ffe7be7e33406659a0becf754abc96c files/digest-enblend-3.0 235
+SHA256 f3b0c93f81414afb1e243d990b6939c69a2a33b9731268c0628040ce5411cafb files/digest-enblend-3.0 235

diff --git a/media-gfx/enblend/enblend-3.0.ebuild b/media-gfx/enblend/enblend-3.0.ebuild
new file mode 100644 (file)
index 0000000..af7a099
--- /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 eca59ec26c2b30d2dfccdaa6ea0ce5d6585dd34a..260f8310f294e020864182897ebfa8c2f196ec7e 100644 (file)
--- 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 (file)
index 0000000..47b3523
--- /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 (file)
index 0000000..418f2ad
--- /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 (file)
index 0000000..b333b44
--- /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)
+
+