* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
@ 2014-10-10 20:08 Markus Meier
0 siblings, 0 replies; 3+ messages in thread
From: Markus Meier @ 2014-10-10 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 33ba470c54b6cdd1b419ae3cab8babad82373a49
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 10 20:08:21 2014 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 20:08:21 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=33ba470c
version bump, fix building with media-libs/lensfun-0.3.0 by Francesco Riosa in bug #524700
Package-Manager: portage-2.2.14_rc1
Manifest-Sign-Key: 072AD062
---
media-gfx/hugin/Manifest | 11 ++++++-----
media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 +++++++++++++++
.../{hugin-2014.0.0_rc4.ebuild => hugin-2014.0.0.ebuild} | 2 ++
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index adbc1d8..e610a9c 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -6,18 +6,19 @@ AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f
AUX hugin-2012.0.0-boost.patch 1690 SHA256 024354bf8c6fea9cc113f8645224eb8402c4406e310db5b72b27c2d6bd188182 SHA512 78dbeb9e2e0450f354ea2920a8081f34024a512db6a2536508401db622be5cce292661b244788eebec9fb03c89c5c3b17c5c8eef7c6a9bde31cca78e68de416b WHIRLPOOL 42452ac88ad1fc0dd2d7a94c5ea0c412c9742c1a255943242614bad1f459aed46de44ef281f3d443dd4377549bef3f4dfd86561e2ebbf14f42b8d508e3c1dc82
AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130906c791d051cb7e1a6a05a92a SHA512 0f0e6d42012ae70ccf3ede51a24763f6e9cd6e46e7cc287c2a52b5b2753928dcda630568811a23d6cc5e836e11a9b3bec5202844a878e4ac58349ea379c7d9d8 WHIRLPOOL 82256829f4083bd043aa8105088a19bb0c04e7de9deb6802f33d1055f56663630437419a6b8830ff95a2904a9bc5ed74de1969aa45774723f650074db79bfcfb
AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
+AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
-DIST hugin-2014.0.0_rc4.tar.bz2 10974604 SHA256 ae3c7b5d18603abd851a3bcccdb2ae46fe2ad0e09b120ffd7db9763f36cf47d2 SHA512 ce05e56b30f0440cc3167dde46ac08bbd460268b6b47293c268b9dbf5c68a6a0fab7e2625c2989864f0e10aa2eb8d625e5ddbd5f78ed5e9a16cd4d6d55be66d3 WHIRLPOOL c8396c2cbbc6471280cdf53e031933b1acba2b930f604fda2e7ff79b6333b5860a7b7346266dcf6ddaa3b4c54b831fa7ecdc8cc5eb568d3937de4bd1cf7624ba
+DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
EBUILD hugin-2012.0.0.ebuild 1648 SHA256 b49e5866a8ff84c4f5ff4781faa30d94d7fe945b29a217e663c66bc02b7cced6 SHA512 ff7bd929200b93a13dced894633370a5e1abe11d58e78d2001e71832342fe10478bd9c7d9c35da252b8520fd845d960fca1823e053e5afc72d2519ca7b1bc730 WHIRLPOOL 106f4eeed3afa6c4d4ee7c181ce8a2989e88e61511401105d36bc67544901598f31b882d0547e31db89fe5daeb249e435223ddb9985bc274b7c73864daba9421
EBUILD hugin-2013.0.0-r1.ebuild 2035 SHA256 5b5e04d44ce36f657c2b9743f93ed34a272ebb8f282c1863f68c9dcf0d18dac1 SHA512 c4b4c22b4c24678000f0659c83193e590072bf3fcb9b507a0e74e1ef7fcaf628facd12a7e74e9d1bc014bc924daa217cad001bae8f4985ff5faf163f75409139 WHIRLPOOL d5f274f9ea86ac5e0679b2dfc2ffc5ce0cd74fdd32191308aaabdeb159c9a2fc1973677c359b765c493236c0231cf1490ac173282c33b2d74e6459759da40dba
-EBUILD hugin-2014.0.0_rc4.ebuild 2013 SHA256 5b357088c0be5ee06cc40c1fa1eb7ccec5772333f9149d741ac366f7919ef9dd SHA512 e080c15eeca3b47f492e1faa6920e15518a3743a1453e3d17a88f96f4604d9ee1a7887837741d18a110d09b511049b6957e50eec8e120b683121cadbb554b529 WHIRLPOOL 62ad8523db07a0369cd686116094ebd3bf670dadcb65d022949ee36647781ffe1bd5f528a4caf39e50b9472353bf8bfeb939ac8f968a607e273acb2bc5e5885e
+EBUILD hugin-2014.0.0.ebuild 2065 SHA256 41388d15760375cb68bd3f65cbec5f8089febed509ff27ab9282f6250920ab93 SHA512 7401ca26a76b54bab0eaf0318e32253cc7dec07ea624c408e707b2fd0ed1fde1923098108d9ece1f4db603f7edd55d666591fe5f4f0a6b1f7edeb694e4580dcf WHIRLPOOL 74d7224546f2799ddf94fda5fa076b7520b86a7452acee4f29b172975b4be39be6ac1b6fbcc6c36f0fa191549a1016c03adb2662b84900a8ca56378b783f1fae
EBUILD hugin-9999.ebuild 1998 SHA256 f5ef9355806eaed940e3a820cab87c55d99016a67ee1fdfeaf8b6ce969ca5a31 SHA512 e633c703e88d6c5e96e8f602d088d906f3c7c58a13d5672853eca3382133bafc31b03204ed5f78191ee8ece6ad44bb9f8d128c874edf715e7e0b493d1ec16d6f WHIRLPOOL 6258802424c0b048428966609472085f89b94722ef5ac6d6f4622bc20b30595db5d9b780f973e36913d2c3167acd13c0ee8f3ecc4902f9509520748928179d27
MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlQmvgkACgkQkKaRLQcq0GKvlQCgqUM0Se8u0DBksfrqaBZsoEHI
-sigAn3Zx+EiImgm2cXC01g1nHRmdjFOR
-=wP5K
+iEYEAREIAAYFAlQ4PLQACgkQkKaRLQcq0GIl6wCfdyJhTYSriaPMCko1zM1pSTJe
+9T8AnRr10TUMUswNrWq4fzQCIJ6pIsuw
+=DYfc
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch b/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
new file mode 100644
index 0000000..f60e686
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=524700
+
+diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp
+--- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp 2014-04-27 08:26:57.000000000 +0200
++++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp 2014-10-08 10:44:29.445076647 +0200
+@@ -620,7 +620,9 @@
+ break;
+ case LF_DIST_MODEL_NONE:
+ case LF_DIST_MODEL_POLY5:
++#ifdef LF_DIST_MODEL_FOV1
+ case LF_DIST_MODEL_FOV1:
++#endif
+ default:
+ return false;
+ break;
diff --git a/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild
similarity index 97%
rename from media-gfx/hugin/hugin-2014.0.0_rc4.ebuild
rename to media-gfx/hugin/hugin-2014.0.0.ebuild
index 228cffd..8db3f47 100644
--- a/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0.ebuild
@@ -51,6 +51,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=( "${FILESDIR}"/${P}-lensfun-0.3.0.patch )
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
@ 2015-02-02 22:31 Markus Meier
0 siblings, 0 replies; 3+ messages in thread
From: Markus Meier @ 2015-02-02 22:31 UTC (permalink / raw
To: gentoo-commits
commit: be5b1aeb444c648fadae0d11d4d7f1d232885cf0
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 2 22:30:58 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Feb 2 22:30:58 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=be5b1aeb
sync media-gfx/hugin with gentoo-x86
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 072AD062
---
media-gfx/hugin/Manifest | 18 ++----
.../hugin/files/hugin-2011.4.0-boost148.patch | 42 -------------
media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch | 42 -------------
media-gfx/hugin/files/hugin-2012.0.0-boost.patch | 40 -------------
media-gfx/hugin/files/hugin-2012.0.0-perl.patch | 8 ---
media-gfx/hugin/hugin-2012.0.0.ebuild | 68 ----------------------
media-gfx/hugin/hugin-2013.0.0-r1.ebuild | 6 +-
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 4 +-
media-gfx/hugin/hugin-2014.0.0.ebuild | 4 +-
9 files changed, 13 insertions(+), 219 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 6be43ff..73378da 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,26 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX hugin-2011.4.0-boost148.patch 1887 SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d SHA512 93106613b802d044befe705eef3bd385fd6dea5d44ccdea06952e02b740e2e5ac386b1c6a422fba5f1e4d53de274e7d3d0cac896fb65527946bb6cf4f6d8df9c WHIRLPOOL d4579a14e745b2e45e4d546f546deafd460a4265d074c452b995ccec8e56b5e3f9da41d3a603b5aecd1d8338536e6dc6230c355e682b9e855171a87ed8aa1004
-AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f SHA512 51c809d6e1d92f35ec98ba707717e09e1ea5c45e8c3efe5fb6fb35d775d1dc50ecb445171d0ca099b46e25fb891c52b2ee448f863264533e550ba5b5ab84acb6 WHIRLPOOL 0e6a7b1d2f33dace53c54fdc3aa5b743852752c4e935c2eee23603ece0a0a291a22cf68e2a7fa551b40130f4225260439ddd4968cb37ae11215fd5ee00547517
-AUX hugin-2012.0.0-boost.patch 1690 SHA256 024354bf8c6fea9cc113f8645224eb8402c4406e310db5b72b27c2d6bd188182 SHA512 78dbeb9e2e0450f354ea2920a8081f34024a512db6a2536508401db622be5cce292661b244788eebec9fb03c89c5c3b17c5c8eef7c6a9bde31cca78e68de416b WHIRLPOOL 42452ac88ad1fc0dd2d7a94c5ea0c412c9742c1a255943242614bad1f459aed46de44ef281f3d443dd4377549bef3f4dfd86561e2ebbf14f42b8d508e3c1dc82
-AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130906c791d051cb7e1a6a05a92a SHA512 0f0e6d42012ae70ccf3ede51a24763f6e9cd6e46e7cc287c2a52b5b2753928dcda630568811a23d6cc5e836e11a9b3bec5202844a878e4ac58349ea379c7d9d8 WHIRLPOOL 82256829f4083bd043aa8105088a19bb0c04e7de9deb6802f33d1055f56663630437419a6b8830ff95a2904a9bc5ed74de1969aa45774723f650074db79bfcfb
AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b
AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
-DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
-EBUILD hugin-2012.0.0.ebuild 1649 SHA256 263d0a369e9c552afdb170e11e1e2965106f3d97d5d8cbdc771c14c578ce4e43 SHA512 ce0c63b945690dcbe2d0bac11a87073127505d0bf15809ac95f99c04399e211eb132d51e7c8de82909225651e8f01f5be66fd640131360f2568187af5f476855 WHIRLPOOL df1ce0cb4f1728145a3ba69608dbc03f2373d97976052bfec37a9bc9353a4f184a8cc2476471f3153ed786dbd98267ca6eca10c1077f00997defaf284892f54d
-EBUILD hugin-2013.0.0-r1.ebuild 2035 SHA256 1e6dc81a4fa7cda22bfd3181587588e22be6f8269fbe3328f0419d8718ba5c6e SHA512 a69d73c96eef15fc1ceea490c6a7014f44f08fc6845c0679e4b6656e171ac4f5d78636aaa746fd46e96abc3f0228ca6f7458115080d9c6e2dfb6a2a2845bedf8 WHIRLPOOL 79a39aca4bec1406bf066e3e70bde7c11e18384de2a13c16793b232435676773db2f6ad0b6eca73a0e213c56fb22f3e548470874ab46aef6822b74d9d07d7811
-EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 7ffd51acefe25d17e44c5df9d56bc74045b118e2c07a43a3ea48875aec6b9dfc SHA512 33048905f4db1bb0a67334b60ab50b7d8bf926ace7e67374f02f250f4a232999f09a7c0b82fda9bad5065f4bec963a37c02b863758ffc539e42b4e3059eb3c6e WHIRLPOOL bc555f22030f7377fcf85d649904a6c634b8f0d8f1c1322572c9ac3e56683d9454ed9b66da9aca189dc6789e8182c7c539551146625b964a4b76ec8b3b9a4fb1
-EBUILD hugin-2014.0.0.ebuild 2099 SHA256 8e9dd0277346f198b0cac3fc1dda21db341c662ad67c00128f270bf327cb71e7 SHA512 565610edddfd4031b964803951d5d254d82e00a9d8c8d4958bedf52889a2617a6dffebbaef2057b40ca7b70222c75ae66c510df7f0118bd06844a3532124653d WHIRLPOOL d53da4f8669b3179f65bd463babd44b7e31692d0d38a61c126c293c7f24923715616fceedaf6c7130dda141156b90e2a04ed4110759c3071b99ae4270e9137a0
+EBUILD hugin-2013.0.0-r1.ebuild 2036 SHA256 5b66671dffb017e904a6e4e08d1f1ec90c5c0f05acff95689148d1bf78787737 SHA512 90dee04d5c6adeec7f84a0961e0ba42b7a02bf3386ca4357dd04d0e3416e191607d4ba07ba7f3f98676261cb7639f090f3c854f223b2a19de6f9e7826bff9dd3 WHIRLPOOL b701a7c3206d51b342ccc896e48da4d044e39d8221674de1541e159d07b91c34e9746588af8320bb68022e265134163be75bcd115e310a4de15be7b2ec2a0adc
+EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 bc39b72f20e906bb6311f2ba4806309bec6f7c983bfd1b031b8171b5338f0c48 SHA512 f4ac540e28739b8f5851c3e92a9815f4a6e8a5ef6b2bb721b3ee68e902dae91af51dba80d68de5b1d4e3b14340bd660817502b7899cb4897fba3a91d64623f31 WHIRLPOOL bf40a784c443994394c035654253e0d6de25346a393b12bd3fcdaa0cff6d3253f13ab6e4461886be133af34a0d4b9efcaaf713abf765a6833525443afc5f2b47
+EBUILD hugin-2014.0.0.ebuild 2097 SHA256 46796a312c60e413a824fff95b8624f1e33ec050b153ba13c3de6c26502697d8 SHA512 074310a4f0951790c6c8ebc43191ba3cc677937d0a7c1002693b40b7934cb599b9c3681fe5c9f4539ef8734439ebe8cc30624686263455c16dd8777756e559dd WHIRLPOOL 65da1b816638b3ec0d51b891cc3f1f195f4c3aea1e055e7185acecbc3217f426537efe37e57c87c9b7c08cbf7890174a2bf4c14a8e449fe6a521489669168a54
EBUILD hugin-9999.ebuild 2033 SHA256 4ecb687517f373ffe547edee0dba76948d19b434a08b1298c8708bb2c79ba1dc SHA512 be3f2fdb1ad69ab8197b82be34e9061431381c1581bbaecb6092ff1da8ba44d2fa5eebec08c222676e150bc10627ca440ce74bff4b1a2dbfd34c427bd4199d3e WHIRLPOOL aa82437f1b2cdcb3d50fe1c6712a51a63033da2a34343ad08dd0de957dc0b6b980622dd00e510a639cc6e892a272c0788aa02e1daed93232a71167cff2eece1f
MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSm4/wACgkQkKaRLQcq0GIGPgCcCuWDu1KaQNrgRv7h66eieKjr
-HnMAnjCynW5ixznFnCjY3z/TvMpIYqGQ
-=byVF
+iEYEAREIAAYFAlTP+qIACgkQkKaRLQcq0GJEowCfblpy/6r0KnJNUBvJho+4qne0
+FKIAnjXxKmaypwCZsTXNy3HdbiJL/7JJ
+=9l6m
-----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
deleted file mode 100644
index 3c19cc7..0000000
--- a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# 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
deleted file mode 100644
index 9615ae4..0000000
--- a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# 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/files/hugin-2012.0.0-boost.patch b/media-gfx/hugin/files/hugin-2012.0.0-boost.patch
deleted file mode 100644
index 969b212..0000000
--- a/media-gfx/hugin/files/hugin-2012.0.0-boost.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- CMakeLists.txt | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2346f4..3b2a810 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
- # Now it is a cache variable you can edit in cmakesetup --TKS
- #
- IF( NOT Boost_root_suffix )
-- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE )
-+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE )
- ENDIF( NOT Boost_root_suffix )
-
- IF(WIN32)
-@@ -267,13 +267,16 @@ IF(WIN32)
- set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- ENDIF(WIN32)
--FIND_PACKAGE(Boost 1.40 COMPONENTS thread date_time regex filesystem iostreams system signals)
--IF (NOT Boost_FOUND)
-- IF(WIN32)
-- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
-- ELSE()
-- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.40")
-- ENDIF()
-+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system)
-+IF(NOT Boost_FOUND)
-+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals)
-+ IF (NOT Boost_FOUND)
-+ IF(WIN32)
-+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
-+ ELSE()
-+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44")
-+ ENDIF()
-+ ENDIF (NOT Boost_FOUND)
- ENDIF (NOT Boost_FOUND)
-
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/media-gfx/hugin/files/hugin-2012.0.0-perl.patch b/media-gfx/hugin/files/hugin-2012.0.0-perl.patch
deleted file mode 100644
index 55e2173..0000000
--- a/media-gfx/hugin/files/hugin-2012.0.0-perl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- hugin-2012.0.0/doc/deghosting_mask.pod~ 2013-09-08 14:09:57.614147518 +0400
-+++ hugin-2012.0.0/doc/deghosting_mask.pod 2013-09-08 14:10:11.218147883 +0400
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
-
- deghosting_mask - Creates mask for removing ghosting in images
diff --git a/media-gfx/hugin/hugin-2012.0.0.ebuild b/media-gfx/hugin/hugin-2012.0.0.ebuild
deleted file mode 100644
index f840394..0000000
--- a/media-gfx/hugin/hugin-2012.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.7 2014/12/22 10:05:50 pinkbyte 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}.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.54.0
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- media-libs/glew
- media-libs/lensfun
- >=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)
-
-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
-}
diff --git a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
index 8107979..6c54fb9 100644
--- a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
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"
IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
index 8481afe..389a999 100644
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild
index 05f7dff..458cba2 100644
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.5 2014/12/22 10:09:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.6 2015/01/02 18:36:29 maekke Exp $
EAPI=5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
@ 2015-07-18 10:06 Markus Meier
0 siblings, 0 replies; 3+ messages in thread
From: Markus Meier @ 2015-07-18 10:06 UTC (permalink / raw
To: gentoo-commits
commit: ad8c1a9ce24c88762c7e89a3bf363555fd9708e4
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 10:05:05 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 10:05:05 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=ad8c1a9c
sync with gentoo-x86
Package-Manager: portage-2.2.20
Manifest-Sign-Key: 072AD062
media-gfx/hugin/Manifest | 11 ++-
media-gfx/hugin/files/hugin-2013.0.0-boost.patch | 40 -----------
media-gfx/hugin/hugin-2013.0.0-r1.ebuild | 86 ------------------------
media-gfx/hugin/metadata.xml | 1 +
4 files changed, 5 insertions(+), 133 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 06994c0..7aff856 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,23 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b
AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
-DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
DIST hugin-2015.0.0_rc2.tar.bz2 10608223 SHA256 f5049021007faf9556d74e9f9de54dc34d95851982c9f0fbcc3493c7d317ccc7 SHA512 2ccd7c1f00c95d395b990f2a5f559e563773cfa3432f9951e08abd0eb91454e1baef4472a35679ca8afb06f3452e93c245b39c85255b4b7b19b29e92434b5290 WHIRLPOOL 578d5a1c6761da4b35386fc0368853b5da3b1eefa340ae9ee763230ab9b4e359eacb2593834ce4c6cc9bc46a816446bd16dae4dbb4c5bde7742a2a9d377cf270
-EBUILD hugin-2013.0.0-r1.ebuild 2032 SHA256 0ca939bbf6f39bccecc34c0e0f061c7d5be931a43945e4d808899d8634c7a9e3 SHA512 8cc153d87439d71b07481e3a5802c9aae196849f1fa2e7184a2d0e2d9c0845535630be011d30728940616b32565b0e8414205eea26c2b1f45d63c6b04cf82ac2 WHIRLPOOL 7ef6d9950d76f5f5e7ded1ba2820058cb629f754729415362a3a581084532a01265034c1bc1ca718423acb47316a2d4990e9dbd90cdf113c7446ad1b74aa90cc
EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 bc39b72f20e906bb6311f2ba4806309bec6f7c983bfd1b031b8171b5338f0c48 SHA512 f4ac540e28739b8f5851c3e92a9815f4a6e8a5ef6b2bb721b3ee68e902dae91af51dba80d68de5b1d4e3b14340bd660817502b7899cb4897fba3a91d64623f31 WHIRLPOOL bf40a784c443994394c035654253e0d6de25346a393b12bd3fcdaa0cff6d3253f13ab6e4461886be133af34a0d4b9efcaaf713abf765a6833525443afc5f2b47
EBUILD hugin-2014.0.0.ebuild 2097 SHA256 46796a312c60e413a824fff95b8624f1e33ec050b153ba13c3de6c26502697d8 SHA512 074310a4f0951790c6c8ebc43191ba3cc677937d0a7c1002693b40b7934cb599b9c3681fe5c9f4539ef8734439ebe8cc30624686263455c16dd8777756e559dd WHIRLPOOL 65da1b816638b3ec0d51b891cc3f1f195f4c3aea1e055e7185acecbc3217f426537efe37e57c87c9b7c08cbf7890174a2bf4c14a8e449fe6a521489669168a54
EBUILD hugin-2015.0.0_rc2-r1.ebuild 1965 SHA256 1825b654fd54ac52dbd907a7531085749211c6e5aaad62fbcf80032bab37133c SHA512 18370af060980ea46a0a5053047bb0a84072fa665a3a1540105aa8d4c7508f94dd84bd3fa2215469802b487c814ad74dcf70222af3b904d9892be912d01baa87 WHIRLPOOL 43d5f324892f2ef754c94ab38a0325869ef2144dee1df1e0e6008f271509dab22213fb1a2a20953d23c7eab2bcd51e5f0d032e1bf2dbfd19004c34e9d5676c11
EBUILD hugin-2015.0.0_rc2.ebuild 1971 SHA256 e32cf182495a6ff58108e820e07f8d4930d5e5f9d5597b40830428b6d0555b2f SHA512 eecfe1aa62cabf49f1cfa2b560c0396cf74d5100bc32abdb1ec36bcf011361592e5b97cde51a2e9af9093ee2baf698cc0e1bad61226bccb274c55a4d9a6468a5 WHIRLPOOL 751e3999d567370d69bdc2b9ab9fac551c78aee599552f2f40f7391b5b047667a95c385014ae5d999dbf41a082a8066542faf4ad0c960fef1155a4547e0e3dbf
EBUILD hugin-9999.ebuild 1997 SHA256 ba8e97a7965c84f140ee107213ef66ce345fb0a1e5058d959fad6a76721ff510 SHA512 b03915e3cc23df6ebb328483543f34622b2d28a7aaa784abaa54837a3dd803bcd5e527d7061d0cc018ee5f619009eec738643222ae1cbfc36c50ba37e9489433 WHIRLPOOL 49adc985ce65d265dec4b11c3297b74760c9746b24c396f1a79d2f76023546ee0daed98626dd6222464fdd724df25c415a3ecc105223b4805740159c28407600
-MISC metadata.xml 355 SHA256 4a16e5c3bc80342130bdddd83c2c3b90e5083e16b30bfb70575504da13b3935d SHA512 a975973abc1c7b5d5d31d956e67f44530306c690817db3c43913d80288205d3334cac1dff4dd7848f9a8701120133bd3795cca71a32e1f82f028ebac68979cba WHIRLPOOL 0b64ae328658806b8adfab028b16b0f3bbf8f20377c20f0ebfd396294f30ceddc3059b30b74219fc88fe5a1e0a62dcc572eaf86c4908273965ca6a8ae23789fc
+MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlWZMZAACgkQkKaRLQcq0GJFgACdHkngxZ0KI2AzDW/6krqp+/Qe
-thAAn0xBLaETQz26XGWFivC8etHg+QpI
-=XEAe
+iEYEAREIAAYFAlWqJNEACgkQkKaRLQcq0GLojwCdF9Fx1oQXHBAcY1SZ1skAj3Z5
+BM4An3xBr6jpP8xSMktdGb1x3720Ln33
+=OQ1E
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2013.0.0-boost.patch b/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
deleted file mode 100644
index fa077b0..0000000
--- a/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- CMakeLists.txt | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6d88a4..3b1ced4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
- # Now it is a cache variable you can edit in cmakesetup --TKS
- #
- IF( NOT Boost_root_suffix )
-- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE )
-+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE )
- ENDIF( NOT Boost_root_suffix )
-
- IF(WIN32)
-@@ -267,13 +267,16 @@ IF(WIN32)
- set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- ENDIF(WIN32)
--FIND_PACKAGE(Boost 1.41 COMPONENTS thread date_time regex filesystem iostreams system signals)
--IF (NOT Boost_FOUND)
-- IF(WIN32)
-- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
-- ELSE()
-- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.41")
-- ENDIF()
-+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system)
-+IF(NOT Boost_FOUND)
-+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals)
-+ IF (NOT Boost_FOUND)
-+ IF(WIN32)
-+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
-+ ELSE()
-+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44")
-+ ENDIF()
-+ ENDIF (NOT Boost_FOUND)
- ENDIF (NOT Boost_FOUND)
-
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
deleted file mode 100644
index ec59412..0000000
--- a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $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 $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-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"
-IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- <dev-libs/boost-1.54.0:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- media-libs/lensfun
- >=media-libs/libpano13-2.9.18:0=
- media-libs/libpng:0=
- 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}
- sys-devel/gettext
- virtual/pkgconfig
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}"/${P}-boost.patch )
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- cmake-utils_src_install
- python_optimize
-
- 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
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index f8ec8fb..abdaa4c 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -5,6 +5,7 @@
<longdescription>hugin is a panorama stitching program</longdescription>
<use>
<flag name="sift">automatically align images with
+ <pkg>media-gfx/autopano-sift</pkg> or
<pkg>media-gfx/autopano-sift-C</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-18 10:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-02 22:31 [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/, media-gfx/hugin/files/ Markus Meier
-- strict thread matches above, loose matches on Subject: below --
2015-07-18 10:06 Markus Meier
2014-10-10 20:08 Markus Meier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox