Add simple build fixes for gcc-4.7 and boost-1.48+ from upstream. Unfortunately boost-1.48 has an ugly bug with gcc-4.7 itself (bug 424319) which means we need boost-1.49.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 188 insertions, 2 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 53066532cce1..f55752c4a08c 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.121 2012/05/05 07:00:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.122 2012/06/30 21:36:05 dilfridge Exp $
+
+*hugin-2011.4.0-r1 (30 Jun 2012)
+
+  30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +hugin-2011.4.0-r1.ebuild, +files/hugin-2011.4.0-boost148.patch,
+  +files/hugin-2011.4.0-gcc47.patch:
+  Add simple build fixes for gcc-4.7 and boost-1.48+ from upstream.
+  Unfortunately boost-1.48 has an ugly bug with gcc-4.7 itself (bug 424319)
+  which means we need boost-1.49.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> hugin-2011.0.0.ebuild,
   hugin-2011.2.0.ebuild, hugin-2011.4.0.ebuild:
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index c59612088c59..ea6fa069a31b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,9 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
+AUX hugin-2011.4.0-boost148.patch 1887 RMD160 82ae6c91c1050999a91d81e77a283541c5b19bc4 SHA1 c45dd3cd686400341fb16072d1c60477fb7d67ec SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d
+AUX hugin-2011.4.0-gcc47.patch 1243 RMD160 b5511d5e6612c002a25659f8092e96fe3e2a5a12 SHA1 165a118045334343a5effe320a66b3a1ee63c32a SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f
 DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
 DIST hugin-2011.2.0.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be
 DIST hugin-2011.4.0.tar.bz2 11740410 RMD160 2c274a742a41a37892cd8ff897dfba3ebc68aecc SHA1 21ec7331d5e196aca2a8771d3c9101dd181ad93b SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
 EBUILD hugin-2011.0.0.ebuild 1502 RMD160 114c2045373d2308cc49bd7364e99ccdfe5c6a03 SHA1 7a27c65bfcafefb8b3c840691565018c20c7e00b SHA256 c1fd7cc171286391d5153296294a7080d8ef39d8fe811d06f7d19212179730bf
 EBUILD hugin-2011.2.0.ebuild 1612 RMD160 4863168607e3ba62bee3577215d1e3f4d6006cd2 SHA1 45a7ff5079582dc8b7f67cd2b2d5dce32c651af5 SHA256 96753f2d1bb6f7922ffe8b53375e1b45e2f77042ea2619470e566a955b308774
+EBUILD hugin-2011.4.0-r1.ebuild 1685 RMD160 f36a8531f941378dde9da379516727bf70e00cda SHA1 749e9fc954951a9827838e72ada414aee081d618 SHA256 dd0e62f72a98f51382729f574f2b82d398f8b06e784d9fc75b95820d63a52c11
 EBUILD hugin-2011.4.0.ebuild 1618 RMD160 c5371216ed22194fc064d0b9e352ad1a2501ef62 SHA1 8005387facefaddd9897d728b356a7943380ed44 SHA256 ca4b46f9a14fcbbc484930dcea4ee99e918654a206e8d395d4828b40fc7b53e8
-MISC ChangeLog 19413 RMD160 1a891529157b9a60568d09246c37908c62b9e4ce SHA1 7ec6bb42125189eef03e500f14b1247957937f34 SHA256 dce348278404850a55922f2785155b9738e39a5c63202e1bad4e2560ac85926c
+MISC ChangeLog 19790 RMD160 58f3bbb5ed5eb3cfaacf2f92bd2cce72ec8942fc SHA1 fc722b50b0284910dd9d3a08e668c1e10de12266 SHA256 e30347759975383295692d30b111d5486c69d557c0bcbaf5cfc5e6963d5f48a3
 MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJP73GdAAoJENwGBM22xffeSAUP/1YrYMhhDM+AG0q7a+OrCfDU
+Xlp3Max6Rw/oSgCJ4jlyCSt8PutFZz4nALocMeEOPLDEpjmyKlMSMHPuSqnprdPm
+DJubJe5FmZE9VQvOsLRRLAVHIbRvQhLhWK6Hf9MLYNwhQdZ+uUEYfkexuD27V/V9
+6DFV4RaLfomzICCfmMh09mt7xLypI0MeC7cbHxnxqW8WukVor2P30r6ZCVkTlX9x
+ybofqJWys2KHmHVBErRWtg6+rAs6Ke3BAWcu/8dme7S0xOgNNYkdh1Njp1BJqmro
+arEOCgKXYV51tdlRie+Pw8yNRyJi6Ycc9kLv+weimkE7CHGgYbRZYxK+NuDov4Mx
+k9uSc6JnbEKL2uHaYeOIV45TP9YisjPmbGysBYDxMguMO3xw3B6w34IavA80BBMl
++bFKcm0+o9COuIHgWn1aQdGQ/homKPtxeRQbJLKCOJ7icvkTbEhd344YSXUqxrd4
+ahapgjldS9xtmVU22oN/Mj+q+3Bt/sCzWkTsHOLzR8sKd1TIHHt3kUP2XhKJkHVK
+5huzHekfXh8NgkAU8hf2KBcWZYmTD2I+wQCME8PwWz/1GgEKe7IhyAerabjeJdnu
+dGtilQK3/CTljUd++u8PEUAjK8me8Bk0W8RhyDD5BkHwcKQF2WN27Fu1NYeg9VRc
+6NkN4TaHp6kWHxRtk0ch
+=HxSG
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
new file mode 100644
index 000000000000..3c19cc79c303
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User tmodes
+# Date 1324625694 -3600
+# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7
+# Parent  b873e1da31f0fdc4cf19f9630450d1735a040fbe
+Add namespace to compile with Boost 1.48
+
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
+--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp	Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp	Fri Dec 23 08:34:54 2011 +0100
+@@ -55,7 +55,7 @@
+ 
+         CPGraphIndexMap index = get(boost::vertex_index, graph);
+         bool found=false;
+-        for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
++        for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
+              ai != ai_end; ++ai)
+         {
+             if (index[*ai] == it->image2Nr) found = true;
+@@ -83,7 +83,7 @@
+ 
+                 CPGraphIndexMap index = get(boost::vertex_index, graph);
+                 bool found=false;
+-                for (tie(ai, ai_end) = adjacent_vertices(i, graph);
++                for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
+                      ai != ai_end; ++ai)
+                 {
+                     if (index[*ai] == j) found = true;
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
+--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h	Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h	Fri Dec 23 08:34:54 2011 +0100
+@@ -233,7 +233,7 @@
+     // collect all optimized neighbours
+     typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
+     typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
+-    for (tie(ai, ai_end) = adjacent_vertices(v, g);
++    for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
+          ai != ai_end; ++ai)
+     {
+         if (*ai != v) {
+
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
new file mode 100644
index 000000000000..9615ae4b0647
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User Bruno Postle <bruno@postle.net>
+# Date 1328910737 0
+# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b
+# Parent  658ded2153f2773a7e193f48d612d95104495080
+Fixes for gcc-4.7.0
+
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h
+--- a/src/celeste/Utilities.h	Sun Jan 01 13:23:39 2012 +0100
++++ b/src/celeste/Utilities.h	Fri Feb 10 21:52:17 2012 +0000
+@@ -33,6 +33,8 @@
+ #include <stdio.h>
+ #ifdef _WINDOWS
+ #include "direct.h"
++#else
++#include <unistd.h>
+ #endif
+ 
+ using namespace std; 
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h
+--- a/src/foreign/zthread/include/zthread/Guard.h	Sun Jan 01 13:23:39 2012 +0100
++++ b/src/foreign/zthread/include/zthread/Guard.h	Fri Feb 10 21:52:17 2012 +0000
+@@ -428,7 +428,7 @@
+   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 @@
+   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));
+ 
+   }
+ 
+
diff --git a/media-gfx/hugin/hugin-2011.4.0-r1.ebuild b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
new file mode 100644
index 000000000000..4ba8629be12d
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0-r1.ebuild,v 1.1 2012/06/30 21:36:05 dilfridge Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2:2.6 3"
+
+inherit base python wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/\.0_/}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+	!!dev-util/cocom
+	app-arch/zip
+	dev-cpp/tclap
+	>=dev-libs/boost-1.49.0-r1
+	dev-libs/zthread
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2
+	media-libs/freeglut
+	>=media-libs/libpano13-2.9.18
+	media-libs/libpng
+	media-libs/openexr
+	media-libs/tiff
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/wxGTK:2.8[X,opengl,-odbc]
+	lapack? ( virtual/lapack )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+PATCHES=(
+	"${FILESDIR}/${P}"-{boost148,gcc47}.patch
+)
+
+pkg_setup() {
+	DOCS="authors.txt README TODO"
+	mycmakeargs=(
+		$(cmake-utils_use_enable lapack LAPACK)
+		$(cmake-utils_use_build python HSI)
+	)
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang};;
+		esac
+		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+	done
+}