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=(
