| 1 |
commit: be5b1aeb444c648fadae0d11d4d7f1d232885cf0 |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 2 22:30:58 2015 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 2 22:30:58 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=be5b1aeb |
| 7 |
|
| 8 |
sync media-gfx/hugin with gentoo-x86 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
Manifest-Sign-Key: 072AD062 |
| 12 |
|
| 13 |
--- |
| 14 |
media-gfx/hugin/Manifest | 18 ++---- |
| 15 |
.../hugin/files/hugin-2011.4.0-boost148.patch | 42 ------------- |
| 16 |
media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch | 42 ------------- |
| 17 |
media-gfx/hugin/files/hugin-2012.0.0-boost.patch | 40 ------------- |
| 18 |
media-gfx/hugin/files/hugin-2012.0.0-perl.patch | 8 --- |
| 19 |
media-gfx/hugin/hugin-2012.0.0.ebuild | 68 ---------------------- |
| 20 |
media-gfx/hugin/hugin-2013.0.0-r1.ebuild | 6 +- |
| 21 |
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 4 +- |
| 22 |
media-gfx/hugin/hugin-2014.0.0.ebuild | 4 +- |
| 23 |
9 files changed, 13 insertions(+), 219 deletions(-) |
| 24 |
|
| 25 |
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest |
| 26 |
index 6be43ff..73378da 100644 |
| 27 |
--- a/media-gfx/hugin/Manifest |
| 28 |
+++ b/media-gfx/hugin/Manifest |
| 29 |
@@ -1,26 +1,20 @@ |
| 30 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 31 |
Hash: SHA256 |
| 32 |
|
| 33 |
-AUX hugin-2011.4.0-boost148.patch 1887 SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d SHA512 93106613b802d044befe705eef3bd385fd6dea5d44ccdea06952e02b740e2e5ac386b1c6a422fba5f1e4d53de274e7d3d0cac896fb65527946bb6cf4f6d8df9c WHIRLPOOL d4579a14e745b2e45e4d546f546deafd460a4265d074c452b995ccec8e56b5e3f9da41d3a603b5aecd1d8338536e6dc6230c355e682b9e855171a87ed8aa1004 |
| 34 |
-AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f SHA512 51c809d6e1d92f35ec98ba707717e09e1ea5c45e8c3efe5fb6fb35d775d1dc50ecb445171d0ca099b46e25fb891c52b2ee448f863264533e550ba5b5ab84acb6 WHIRLPOOL 0e6a7b1d2f33dace53c54fdc3aa5b743852752c4e935c2eee23603ece0a0a291a22cf68e2a7fa551b40130f4225260439ddd4968cb37ae11215fd5ee00547517 |
| 35 |
-AUX hugin-2012.0.0-boost.patch 1690 SHA256 024354bf8c6fea9cc113f8645224eb8402c4406e310db5b72b27c2d6bd188182 SHA512 78dbeb9e2e0450f354ea2920a8081f34024a512db6a2536508401db622be5cce292661b244788eebec9fb03c89c5c3b17c5c8eef7c6a9bde31cca78e68de416b WHIRLPOOL 42452ac88ad1fc0dd2d7a94c5ea0c412c9742c1a255943242614bad1f459aed46de44ef281f3d443dd4377549bef3f4dfd86561e2ebbf14f42b8d508e3c1dc82 |
| 36 |
-AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130906c791d051cb7e1a6a05a92a SHA512 0f0e6d42012ae70ccf3ede51a24763f6e9cd6e46e7cc287c2a52b5b2753928dcda630568811a23d6cc5e836e11a9b3bec5202844a878e4ac58349ea379c7d9d8 WHIRLPOOL 82256829f4083bd043aa8105088a19bb0c04e7de9deb6802f33d1055f56663630437419a6b8830ff95a2904a9bc5ed74de1969aa45774723f650074db79bfcfb |
| 37 |
AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa |
| 38 |
AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b |
| 39 |
AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f |
| 40 |
-DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43 |
| 41 |
DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a |
| 42 |
DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d |
| 43 |
-EBUILD hugin-2012.0.0.ebuild 1649 SHA256 263d0a369e9c552afdb170e11e1e2965106f3d97d5d8cbdc771c14c578ce4e43 SHA512 ce0c63b945690dcbe2d0bac11a87073127505d0bf15809ac95f99c04399e211eb132d51e7c8de82909225651e8f01f5be66fd640131360f2568187af5f476855 WHIRLPOOL df1ce0cb4f1728145a3ba69608dbc03f2373d97976052bfec37a9bc9353a4f184a8cc2476471f3153ed786dbd98267ca6eca10c1077f00997defaf284892f54d |
| 44 |
-EBUILD hugin-2013.0.0-r1.ebuild 2035 SHA256 1e6dc81a4fa7cda22bfd3181587588e22be6f8269fbe3328f0419d8718ba5c6e SHA512 a69d73c96eef15fc1ceea490c6a7014f44f08fc6845c0679e4b6656e171ac4f5d78636aaa746fd46e96abc3f0228ca6f7458115080d9c6e2dfb6a2a2845bedf8 WHIRLPOOL 79a39aca4bec1406bf066e3e70bde7c11e18384de2a13c16793b232435676773db2f6ad0b6eca73a0e213c56fb22f3e548470874ab46aef6822b74d9d07d7811 |
| 45 |
-EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 7ffd51acefe25d17e44c5df9d56bc74045b118e2c07a43a3ea48875aec6b9dfc SHA512 33048905f4db1bb0a67334b60ab50b7d8bf926ace7e67374f02f250f4a232999f09a7c0b82fda9bad5065f4bec963a37c02b863758ffc539e42b4e3059eb3c6e WHIRLPOOL bc555f22030f7377fcf85d649904a6c634b8f0d8f1c1322572c9ac3e56683d9454ed9b66da9aca189dc6789e8182c7c539551146625b964a4b76ec8b3b9a4fb1 |
| 46 |
-EBUILD hugin-2014.0.0.ebuild 2099 SHA256 8e9dd0277346f198b0cac3fc1dda21db341c662ad67c00128f270bf327cb71e7 SHA512 565610edddfd4031b964803951d5d254d82e00a9d8c8d4958bedf52889a2617a6dffebbaef2057b40ca7b70222c75ae66c510df7f0118bd06844a3532124653d WHIRLPOOL d53da4f8669b3179f65bd463babd44b7e31692d0d38a61c126c293c7f24923715616fceedaf6c7130dda141156b90e2a04ed4110759c3071b99ae4270e9137a0 |
| 47 |
+EBUILD hugin-2013.0.0-r1.ebuild 2036 SHA256 5b66671dffb017e904a6e4e08d1f1ec90c5c0f05acff95689148d1bf78787737 SHA512 90dee04d5c6adeec7f84a0961e0ba42b7a02bf3386ca4357dd04d0e3416e191607d4ba07ba7f3f98676261cb7639f090f3c854f223b2a19de6f9e7826bff9dd3 WHIRLPOOL b701a7c3206d51b342ccc896e48da4d044e39d8221674de1541e159d07b91c34e9746588af8320bb68022e265134163be75bcd115e310a4de15be7b2ec2a0adc |
| 48 |
+EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 bc39b72f20e906bb6311f2ba4806309bec6f7c983bfd1b031b8171b5338f0c48 SHA512 f4ac540e28739b8f5851c3e92a9815f4a6e8a5ef6b2bb721b3ee68e902dae91af51dba80d68de5b1d4e3b14340bd660817502b7899cb4897fba3a91d64623f31 WHIRLPOOL bf40a784c443994394c035654253e0d6de25346a393b12bd3fcdaa0cff6d3253f13ab6e4461886be133af34a0d4b9efcaaf713abf765a6833525443afc5f2b47 |
| 49 |
+EBUILD hugin-2014.0.0.ebuild 2097 SHA256 46796a312c60e413a824fff95b8624f1e33ec050b153ba13c3de6c26502697d8 SHA512 074310a4f0951790c6c8ebc43191ba3cc677937d0a7c1002693b40b7934cb599b9c3681fe5c9f4539ef8734439ebe8cc30624686263455c16dd8777756e559dd WHIRLPOOL 65da1b816638b3ec0d51b891cc3f1f195f4c3aea1e055e7185acecbc3217f426537efe37e57c87c9b7c08cbf7890174a2bf4c14a8e449fe6a521489669168a54 |
| 50 |
EBUILD hugin-9999.ebuild 2033 SHA256 4ecb687517f373ffe547edee0dba76948d19b434a08b1298c8708bb2c79ba1dc SHA512 be3f2fdb1ad69ab8197b82be34e9061431381c1581bbaecb6092ff1da8ba44d2fa5eebec08c222676e150bc10627ca440ce74bff4b1a2dbfd34c427bd4199d3e WHIRLPOOL aa82437f1b2cdcb3d50fe1c6712a51a63033da2a34343ad08dd0de957dc0b6b980622dd00e510a639cc6e892a272c0788aa02e1daed93232a71167cff2eece1f |
| 51 |
MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684 |
| 52 |
-----BEGIN PGP SIGNATURE----- |
| 53 |
Version: GnuPG v2 |
| 54 |
|
| 55 |
-iEYEAREIAAYFAlSm4/wACgkQkKaRLQcq0GIGPgCcCuWDu1KaQNrgRv7h66eieKjr |
| 56 |
-HnMAnjCynW5ixznFnCjY3z/TvMpIYqGQ |
| 57 |
-=byVF |
| 58 |
+iEYEAREIAAYFAlTP+qIACgkQkKaRLQcq0GJEowCfblpy/6r0KnJNUBvJho+4qne0 |
| 59 |
+FKIAnjXxKmaypwCZsTXNy3HdbiJL/7JJ |
| 60 |
+=9l6m |
| 61 |
-----END PGP SIGNATURE----- |
| 62 |
|
| 63 |
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch |
| 64 |
deleted file mode 100644 |
| 65 |
index 3c19cc7..0000000 |
| 66 |
--- a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,42 +0,0 @@ |
| 69 |
- |
| 70 |
-# HG changeset patch |
| 71 |
-# User tmodes |
| 72 |
-# Date 1324625694 -3600 |
| 73 |
-# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7 |
| 74 |
-# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe |
| 75 |
-Add namespace to compile with Boost 1.48 |
| 76 |
- |
| 77 |
-diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp |
| 78 |
---- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100 |
| 79 |
-+++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100 |
| 80 |
-@@ -55,7 +55,7 @@ |
| 81 |
- |
| 82 |
- CPGraphIndexMap index = get(boost::vertex_index, graph); |
| 83 |
- bool found=false; |
| 84 |
-- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph); |
| 85 |
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph); |
| 86 |
- ai != ai_end; ++ai) |
| 87 |
- { |
| 88 |
- if (index[*ai] == it->image2Nr) found = true; |
| 89 |
-@@ -83,7 +83,7 @@ |
| 90 |
- |
| 91 |
- CPGraphIndexMap index = get(boost::vertex_index, graph); |
| 92 |
- bool found=false; |
| 93 |
-- for (tie(ai, ai_end) = adjacent_vertices(i, graph); |
| 94 |
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph); |
| 95 |
- ai != ai_end; ++ai) |
| 96 |
- { |
| 97 |
- if (index[*ai] == j) found = true; |
| 98 |
-diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h |
| 99 |
---- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100 |
| 100 |
-+++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100 |
| 101 |
-@@ -233,7 +233,7 @@ |
| 102 |
- // collect all optimized neighbours |
| 103 |
- typename boost::graph_traits<CPGraph>::adjacency_iterator ai; |
| 104 |
- typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end; |
| 105 |
-- for (tie(ai, ai_end) = adjacent_vertices(v, g); |
| 106 |
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g); |
| 107 |
- ai != ai_end; ++ai) |
| 108 |
- { |
| 109 |
- if (*ai != v) { |
| 110 |
- |
| 111 |
|
| 112 |
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch |
| 113 |
deleted file mode 100644 |
| 114 |
index 9615ae4..0000000 |
| 115 |
--- a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch |
| 116 |
+++ /dev/null |
| 117 |
@@ -1,42 +0,0 @@ |
| 118 |
- |
| 119 |
-# HG changeset patch |
| 120 |
-# User Bruno Postle <bruno@××××××.net> |
| 121 |
-# Date 1328910737 0 |
| 122 |
-# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b |
| 123 |
-# Parent 658ded2153f2773a7e193f48d612d95104495080 |
| 124 |
-Fixes for gcc-4.7.0 |
| 125 |
- |
| 126 |
-diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h |
| 127 |
---- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100 |
| 128 |
-+++ b/src/celeste/Utilities.h Fri Feb 10 21:52:17 2012 +0000 |
| 129 |
-@@ -33,6 +33,8 @@ |
| 130 |
- #include <stdio.h> |
| 131 |
- #ifdef _WINDOWS |
| 132 |
- #include "direct.h" |
| 133 |
-+#else |
| 134 |
-+#include <unistd.h> |
| 135 |
- #endif |
| 136 |
- |
| 137 |
- using namespace std; |
| 138 |
-diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h |
| 139 |
---- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100 |
| 140 |
-+++ b/src/foreign/zthread/include/zthread/Guard.h Fri Feb 10 21:52:17 2012 +0000 |
| 141 |
-@@ -428,7 +428,7 @@ |
| 142 |
- template <class U, class V> |
| 143 |
- Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { |
| 144 |
- |
| 145 |
-- LockingPolicy::shareScope(*this, extract(g)); |
| 146 |
-+ LockingPolicy::shareScope(*this, this->extract(g)); |
| 147 |
- |
| 148 |
- } |
| 149 |
- |
| 150 |
-@@ -458,7 +458,7 @@ |
| 151 |
- template <class U, class V> |
| 152 |
- Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { |
| 153 |
- |
| 154 |
-- LockingPolicy::transferScope(*this, extract(g)); |
| 155 |
-+ LockingPolicy::transferScope(*this, this->extract(g)); |
| 156 |
- |
| 157 |
- } |
| 158 |
- |
| 159 |
- |
| 160 |
|
| 161 |
diff --git a/media-gfx/hugin/files/hugin-2012.0.0-boost.patch b/media-gfx/hugin/files/hugin-2012.0.0-boost.patch |
| 162 |
deleted file mode 100644 |
| 163 |
index 969b212..0000000 |
| 164 |
--- a/media-gfx/hugin/files/hugin-2012.0.0-boost.patch |
| 165 |
+++ /dev/null |
| 166 |
@@ -1,40 +0,0 @@ |
| 167 |
- CMakeLists.txt | 19 +++++++++++-------- |
| 168 |
- 1 file changed, 11 insertions(+), 8 deletions(-) |
| 169 |
- |
| 170 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 171 |
-index c2346f4..3b2a810 100644 |
| 172 |
---- a/CMakeLists.txt |
| 173 |
-+++ b/CMakeLists.txt |
| 174 |
-@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR}) |
| 175 |
- # Now it is a cache variable you can edit in cmakesetup --TKS |
| 176 |
- # |
| 177 |
- IF( NOT Boost_root_suffix ) |
| 178 |
-- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 179 |
-+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 180 |
- ENDIF( NOT Boost_root_suffix ) |
| 181 |
- |
| 182 |
- IF(WIN32) |
| 183 |
-@@ -267,13 +267,16 @@ IF(WIN32) |
| 184 |
- set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) |
| 185 |
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") |
| 186 |
- ENDIF(WIN32) |
| 187 |
--FIND_PACKAGE(Boost 1.40 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 188 |
--IF (NOT Boost_FOUND) |
| 189 |
-- IF(WIN32) |
| 190 |
-- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 191 |
-- ELSE() |
| 192 |
-- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.40") |
| 193 |
-- ENDIF() |
| 194 |
-+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system) |
| 195 |
-+IF(NOT Boost_FOUND) |
| 196 |
-+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 197 |
-+ IF (NOT Boost_FOUND) |
| 198 |
-+ IF(WIN32) |
| 199 |
-+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 200 |
-+ ELSE() |
| 201 |
-+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44") |
| 202 |
-+ ENDIF() |
| 203 |
-+ ENDIF (NOT Boost_FOUND) |
| 204 |
- ENDIF (NOT Boost_FOUND) |
| 205 |
- |
| 206 |
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) |
| 207 |
|
| 208 |
diff --git a/media-gfx/hugin/files/hugin-2012.0.0-perl.patch b/media-gfx/hugin/files/hugin-2012.0.0-perl.patch |
| 209 |
deleted file mode 100644 |
| 210 |
index 55e2173..0000000 |
| 211 |
--- a/media-gfx/hugin/files/hugin-2012.0.0-perl.patch |
| 212 |
+++ /dev/null |
| 213 |
@@ -1,8 +0,0 @@ |
| 214 |
---- hugin-2012.0.0/doc/deghosting_mask.pod~ 2013-09-08 14:09:57.614147518 +0400 |
| 215 |
-+++ hugin-2012.0.0/doc/deghosting_mask.pod 2013-09-08 14:10:11.218147883 +0400 |
| 216 |
-@@ -1,3 +1,5 @@ |
| 217 |
-+=encoding utf8 |
| 218 |
-+ |
| 219 |
- =head1 NAME |
| 220 |
- |
| 221 |
- deghosting_mask - Creates mask for removing ghosting in images |
| 222 |
|
| 223 |
diff --git a/media-gfx/hugin/hugin-2012.0.0.ebuild b/media-gfx/hugin/hugin-2012.0.0.ebuild |
| 224 |
deleted file mode 100644 |
| 225 |
index f840394..0000000 |
| 226 |
--- a/media-gfx/hugin/hugin-2012.0.0.ebuild |
| 227 |
+++ /dev/null |
| 228 |
@@ -1,68 +0,0 @@ |
| 229 |
-# Copyright 1999-2014 Gentoo Foundation |
| 230 |
-# Distributed under the terms of the GNU General Public License v2 |
| 231 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.7 2014/12/22 10:05:50 pinkbyte Exp $ |
| 232 |
- |
| 233 |
-EAPI=3 |
| 234 |
-WX_GTK_VER="2.8" |
| 235 |
-PYTHON_DEPEND="python? 2:2.6 3" |
| 236 |
- |
| 237 |
-inherit base python wxwidgets versionator cmake-utils |
| 238 |
- |
| 239 |
-DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 240 |
-HOMEPAGE="http://hugin.sf.net" |
| 241 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 242 |
-LICENSE="GPL-2 SIFT" |
| 243 |
-SLOT="0" |
| 244 |
-KEYWORDS="amd64 ppc x86" |
| 245 |
- |
| 246 |
-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" |
| 247 |
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
| 248 |
- |
| 249 |
-CDEPEND=" |
| 250 |
- !!dev-util/cocom |
| 251 |
- app-arch/zip |
| 252 |
- dev-cpp/tclap |
| 253 |
- <dev-libs/boost-1.54.0 |
| 254 |
- dev-libs/zthread |
| 255 |
- >=media-gfx/enblend-4.0 |
| 256 |
- media-gfx/exiv2 |
| 257 |
- media-libs/freeglut |
| 258 |
- media-libs/glew |
| 259 |
- media-libs/lensfun |
| 260 |
- >=media-libs/libpano13-2.9.18 |
| 261 |
- media-libs/libpng |
| 262 |
- media-libs/openexr |
| 263 |
- media-libs/tiff |
| 264 |
- sys-libs/zlib |
| 265 |
- virtual/jpeg |
| 266 |
- x11-libs/wxGTK:2.8[X,opengl,-odbc] |
| 267 |
- lapack? ( virtual/lapack ) |
| 268 |
- sift? ( media-gfx/autopano-sift-C )" |
| 269 |
-RDEPEND="${CDEPEND} |
| 270 |
- media-libs/exiftool" |
| 271 |
-DEPEND="${CDEPEND} |
| 272 |
- virtual/pkgconfig |
| 273 |
- python? ( >=dev-lang/swig-2.0.4 )" |
| 274 |
- |
| 275 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
| 276 |
- |
| 277 |
-pkg_setup() { |
| 278 |
- DOCS="authors.txt README TODO" |
| 279 |
- mycmakeargs=( |
| 280 |
- $(cmake-utils_use_enable lapack LAPACK) |
| 281 |
- $(cmake-utils_use_build python HSI) |
| 282 |
- ) |
| 283 |
-} |
| 284 |
- |
| 285 |
-src_install() { |
| 286 |
- cmake-utils_src_install |
| 287 |
- |
| 288 |
- for lang in ${LANGS} ; do |
| 289 |
- case ${lang} in |
| 290 |
- ca) dir=ca_ES;; |
| 291 |
- cs) dir=cs_CZ;; |
| 292 |
- *) dir=${lang};; |
| 293 |
- esac |
| 294 |
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
| 295 |
- done |
| 296 |
-} |
| 297 |
|
| 298 |
diff --git a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild |
| 299 |
index 8107979..6c54fb9 100644 |
| 300 |
--- a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild |
| 301 |
+++ b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild |
| 302 |
@@ -1,6 +1,6 @@ |
| 303 |
-# Copyright 1999-2014 Gentoo Foundation |
| 304 |
+# Copyright 1999-2015 Gentoo Foundation |
| 305 |
# Distributed under the terms of the GNU General Public License v2 |
| 306 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.8 2014/12/22 10:05:50 pinkbyte Exp $ |
| 307 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.9 2015/01/05 10:17:27 pinkbyte Exp $ |
| 308 |
|
| 309 |
EAPI=5 |
| 310 |
|
| 311 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 312 |
|
| 313 |
LICENSE="GPL-2 SIFT" |
| 314 |
SLOT="0" |
| 315 |
-KEYWORDS="amd64 ppc ~x86" |
| 316 |
+KEYWORDS="amd64 ~ppc ~x86" |
| 317 |
|
| 318 |
LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW" |
| 319 |
IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})" |
| 320 |
|
| 321 |
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild |
| 322 |
index 8481afe..389a999 100644 |
| 323 |
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild |
| 324 |
+++ b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild |
| 325 |
@@ -1,6 +1,6 @@ |
| 326 |
-# Copyright 1999-2014 Gentoo Foundation |
| 327 |
+# Copyright 1999-2015 Gentoo Foundation |
| 328 |
# Distributed under the terms of the GNU General Public License v2 |
| 329 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0-r1.ebuild,v 1.3 2014/12/20 16:36:16 maekke Exp $ |
| 330 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0-r1.ebuild,v 1.4 2015/01/02 18:36:29 maekke Exp $ |
| 331 |
|
| 332 |
EAPI=5 |
| 333 |
|
| 334 |
|
| 335 |
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild |
| 336 |
index 05f7dff..458cba2 100644 |
| 337 |
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild |
| 338 |
+++ b/media-gfx/hugin/hugin-2014.0.0.ebuild |
| 339 |
@@ -1,6 +1,6 @@ |
| 340 |
-# Copyright 1999-2014 Gentoo Foundation |
| 341 |
+# Copyright 1999-2015 Gentoo Foundation |
| 342 |
# Distributed under the terms of the GNU General Public License v2 |
| 343 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.5 2014/12/22 10:09:17 pinkbyte Exp $ |
| 344 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.6 2015/01/02 18:36:29 maekke Exp $ |
| 345 |
|
| 346 |
EAPI=5 |
Archives