| 1 |
dilfridge 12/06/30 21:36:05 |
| 2 |
|
| 3 |
Added: hugin-2011.4.0-gcc47.patch |
| 4 |
hugin-2011.4.0-boost148.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: hugin-2011.4.0-gcc47.patch |
| 17 |
=================================================================== |
| 18 |
|
| 19 |
# HG changeset patch |
| 20 |
# User Bruno Postle <bruno@××××××.net> |
| 21 |
# Date 1328910737 0 |
| 22 |
# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b |
| 23 |
# Parent 658ded2153f2773a7e193f48d612d95104495080 |
| 24 |
Fixes for gcc-4.7.0 |
| 25 |
|
| 26 |
diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h |
| 27 |
--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100 |
| 28 |
+++ b/src/celeste/Utilities.h Fri Feb 10 21:52:17 2012 +0000 |
| 29 |
@@ -33,6 +33,8 @@ |
| 30 |
#include <stdio.h> |
| 31 |
#ifdef _WINDOWS |
| 32 |
#include "direct.h" |
| 33 |
+#else |
| 34 |
+#include <unistd.h> |
| 35 |
#endif |
| 36 |
|
| 37 |
using namespace std; |
| 38 |
diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h |
| 39 |
--- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100 |
| 40 |
+++ b/src/foreign/zthread/include/zthread/Guard.h Fri Feb 10 21:52:17 2012 +0000 |
| 41 |
@@ -428,7 +428,7 @@ |
| 42 |
template <class U, class V> |
| 43 |
Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { |
| 44 |
|
| 45 |
- LockingPolicy::shareScope(*this, extract(g)); |
| 46 |
+ LockingPolicy::shareScope(*this, this->extract(g)); |
| 47 |
|
| 48 |
} |
| 49 |
|
| 50 |
@@ -458,7 +458,7 @@ |
| 51 |
template <class U, class V> |
| 52 |
Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { |
| 53 |
|
| 54 |
- LockingPolicy::transferScope(*this, extract(g)); |
| 55 |
+ LockingPolicy::transferScope(*this, this->extract(g)); |
| 56 |
|
| 57 |
} |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 media-gfx/hugin/files/hugin-2011.4.0-boost148.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: hugin-2011.4.0-boost148.patch |
| 69 |
=================================================================== |
| 70 |
|
| 71 |
# HG changeset patch |
| 72 |
# User tmodes |
| 73 |
# Date 1324625694 -3600 |
| 74 |
# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7 |
| 75 |
# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe |
| 76 |
Add namespace to compile with Boost 1.48 |
| 77 |
|
| 78 |
diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp |
| 79 |
--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100 |
| 80 |
+++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100 |
| 81 |
@@ -55,7 +55,7 @@ |
| 82 |
|
| 83 |
CPGraphIndexMap index = get(boost::vertex_index, graph); |
| 84 |
bool found=false; |
| 85 |
- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph); |
| 86 |
+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph); |
| 87 |
ai != ai_end; ++ai) |
| 88 |
{ |
| 89 |
if (index[*ai] == it->image2Nr) found = true; |
| 90 |
@@ -83,7 +83,7 @@ |
| 91 |
|
| 92 |
CPGraphIndexMap index = get(boost::vertex_index, graph); |
| 93 |
bool found=false; |
| 94 |
- for (tie(ai, ai_end) = adjacent_vertices(i, graph); |
| 95 |
+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph); |
| 96 |
ai != ai_end; ++ai) |
| 97 |
{ |
| 98 |
if (index[*ai] == j) found = true; |
| 99 |
diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h |
| 100 |
--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100 |
| 101 |
+++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100 |
| 102 |
@@ -233,7 +233,7 @@ |
| 103 |
// collect all optimized neighbours |
| 104 |
typename boost::graph_traits<CPGraph>::adjacency_iterator ai; |
| 105 |
typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end; |
| 106 |
- for (tie(ai, ai_end) = adjacent_vertices(v, g); |
| 107 |
+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g); |
| 108 |
ai != ai_end; ++ai) |
| 109 |
{ |
| 110 |
if (*ai != v) { |
Archives