commit: 8772d8c01ab595f3924c07d621c4db611180b7db Author: Markus Meier <maekke <AT> gentoo <DOT> org> AuthorDate: Sat Nov 7 06:33:12 2015 +0000 Commit: Markus Meier <maekke <AT> gentoo <DOT> org> CommitDate: Sat Nov 7 06:33:12 2015 +0000 URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=8772d8c0
media-gfx/hugin: sync with main tree Package-Manager: portage-2.2.23 Manifest-Sign-Key: 0x363AF1F7765A9D02 media-gfx/hugin/Manifest | 38 +- .../hugin/files/hugin-2014.0.0-ParseExp.patch | 527 --------------------- .../hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 - media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 89 ---- media-gfx/hugin/hugin-2014.0.0.ebuild | 89 ---- media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 2 +- media-gfx/hugin/hugin-2015.0.0.ebuild | 86 ---- media-gfx/hugin/metadata.xml | 5 +- 8 files changed, 21 insertions(+), 830 deletions(-) diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 5cab9fc..c416fc2 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,32 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -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-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e -EBUILD hugin-2014.0.0-r1.ebuild 1988 SHA256 1ce01deee7b7a6070f8afcf53373ff75f5f9d4ffa19ef0e063682cd4965872b7 SHA512 70677bade49a243b3c97a640f33bf2d968ac45208f66ad3933afd55a1dd64add1ba525a831aafb1312b290a748c032b4587494edb38e3e6194c8e0188f5594f1 WHIRLPOOL a813733f5ed996a1d38f8b5eed99043c295548e1f2a30c1f08c0f73afa8c37ef2015b5fc7dc40b9d74db4a36ce91627468be8fb218cf65af771f3a6cad681253 -EBUILD hugin-2014.0.0.ebuild 1992 SHA256 39460dc169bd6c9f082980b61addf316afe21426727dd47c2df53cd65abfe032 SHA512 75e7184035b36efad83280727f8a7cb8d5df8ee50cc3ac1d143a1081129b7d0cd55545c1a51031f418845f94701c633fdb7166efccb3a7f307bab16f2bcf4a79 WHIRLPOOL e9e45ca88b6e4e59138dfc9168b156983e70de7d486693af8ed9789ddaf55a3ffabf259b41a5d1d7ed3de1d1bfeb18dc88520a8401ff92cbde46a08308b518d2 -EBUILD hugin-2015.0.0-r1.ebuild 2001 SHA256 c156f33f520b72698c94c906d8f84ba4c60e49b07ed3470cf9e2aba6ea1d0e5a SHA512 af1046bb7da20bc540ee8964057660cbb7b4e0f723fd2e6c838ea59c5269b33d97596cf9dbc726053ac5368d01bd9a8c8b00310619287a6ba6a5fb314e55d41d WHIRLPOOL 8e02035eb65879a196119e13c69aea015663b6a0eae4b682724cb88982d7a59adc9fdd18778ac58c62c40d6501e6dd5e9bf56d1a2c875a5b498eb404aaf5068f -EBUILD hugin-2015.0.0.ebuild 2007 SHA256 d40ae026901ee8d29fae61206cf74d317b576e842fe42a27864c1f239498d74b SHA512 42904eccfd824b07a449f2a07b7de9129b0d86f01dcbd0f7381485fb8cd6e7c746eed48556252e28d9e90f2324b1d15eb30e7167a174fc69b727945c2e587659 WHIRLPOOL 4beb1050616ffaf51e8a0dca2f8a1eb81f4524cf58d1c3941438c3b553367323eec5fa8ba7a8d85d30f3e1fb2178ec3864e2118d52b9ec1f3122f564f75411d6 +EBUILD hugin-2015.0.0-r1.ebuild 1999 SHA256 e3bd4434df3b96042e3ac0af877aa362087fafa2ca0628b1542dbccef2c8c78c SHA512 f69c38d3dfa3773d87a6dc32222af20fd46f2ddfa1e051db8198d62c28effff607fa1c859724ec184bb6606c59c166da7ba8abd1997dfe2f47e36dc639dddf34 WHIRLPOOL 247aa89a0da99b6d6e204e16cfc2b827b64ba96734514fa70ca8a669ad20dcf124854c8d853272e6910c0d164d9abb7dbba9df436fe246dcbf838e816bc4d6a7 EBUILD hugin-9999.ebuild 2036 SHA256 aea1e37f5e73978955aa67b2a735e5a3fd9c0db266b98279aa97de09f1b93b92 SHA512 4dac84a8836db26444e2bbe13303ea0725d25c842d534a32f8ad0795aa00d55104e3243c6641fef6273b5f0cebcb9999d65146083413c3de1d18823ada8ac829 WHIRLPOOL 3f070b1d1968da3595095cd2e5ede2a311ea53527dd71da41a421a35b366725f9326c5bd1bafd06914dcb8c5ce4e0756f5668f3ff321103a768225a26e5d4823 -MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684 +MISC metadata.xml 474 SHA256 a3329c0e475d6a761222daa9e01fcf54ee378b001ec6255495b5ffb8d760ba49 SHA512 2390f3d4cdd5f30c16773e59715aa4c1f1dc6b41ddbfacb510efd9feef4d9062730740280f1e5a8166ddc7d3ae492417dec02a2d24a351f40201c7cfbcaac12f WHIRLPOOL d5984757160eefa4a359855481b90c38d28dfdc367cd60f6e2972a84b046b1510df97dc9000e09568e31bf93e7536c2d591c3042a9dcf5867ec8e966639b26e7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQJ8BAEBCABmBQJV04xfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJWPZsoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3 -QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8erwQAJJeY85RX5VMUl2bxpmQHy+0 -i6X3779c9BLwxqggx8KlVbA3zq47Dg4uvEqRxhwMtb4oEPOlNVhOteejbKykU1ne -EthtOyrdMtHxqnULTbta6nGDyLNPLuQNpBnmUTRk4SKjqeVypkFa7uopk/xQB0b3 -vn1FzRo+x2433qq6+VJDLfjqUYjVNc92K5kaa8NMG5//2NA46HOfW/oWYPoCB1xQ -zU2t6CVtc6qZq+vOes3fzmT8w5RpLb7DvkV/jZ/ANMPUSGFxGnI08k1ATHPYjpO9 -gWD8Y5tAJ1TKyihwUQzACVm2JBC2OgW4Exa2eDJEpbW5wN0tOqpvsv7BMTQ5tHS8 -3lLL9fb7PfTxZkP0HxHUcYfzTyAz3RodJRenF+kX5d1CYs3A5/Jn6+Eh7PRrd4bh -FbNkSHmOL8JuL0Zpz80a8qoxN+0aOUSqcxQEj6MPZmtbSA+uUWX1OlqB+AVzcjeT -5ttz7cjZBCxCTrbqUtR9+4C/jC7YZVcnMWcmaMrdpLrtpvmiIu50jlJ5yYQsPf88 -5UbHEUgh5ulSwyjoSwVK89NIX+vqMgmkSh+yvuSrmGnzQzyG2uBXztzKwHMLpiWx -FJ45eo88j48KWQiA+oUkgQGTEaEE4ZMcoWbYA3N3TEacdje4FU9cmFDdPSVesdL8 -b6N64rZAGUbJ3RcooIyX -=w6av +QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8G4gQAJSqBgPDG2ohVcw+fFyVgPDa +2Wc4LnLxdXbFiawGj73OKEZCAvKOSLS/fVRgOeaMGUKUyLwAXuwjXggSfqzB7rNl +MsUG+9/ZRog49XgXnMOyzU/j2Xy2+wI2FK+dChD4tGn20xSAltlD3+NRAoRjFfDO +O7nt86URuBF98qsT+1npY0BS6PLZA+LmNbBJytbgWMlzdRwFT3DnPRFD1erFQhVG +f6NYW4/lrPhMVygWRXEaOwYM+ipaXrMh3NjANL3+B01XXkRp3DlxP1eKEyS0z700 +Hmf4up6jOyVbUCkU8/tmZFJoedf3Bn7C7PRzXtWpSP8EgGye7wVxOoF7DKuoJmtD +q3BDYdlT71yGkHSnUaCD4Tog5MN8TOHtmrgl4WxWd1e4huA86ioDOm/hhSPeleEs +Mx9Xp+M3UUo74gwbGB9vc4ELTRAtaXgi7JB3JLxH65DZUa6JFut24QYxL0/X9tzn +TGyo7wKTuTfuPFShxc5xfElFiEymEPTz6/7SyLpewsfAzQJMjCfmVg+TX2wNgTnV +ZYvInhbD3BopYVxL37J2coWFVbZZuUdKLApgDWY9a5vTee0jSSt3W5GWVT2/uucp +dQJSZOgUOLIoDwpPpQO2s1Qi9rIcE6RkjoyPpgG/i1LrVXGbYjpVtrJ/PKzzFDvP +AQzFFeG5qYwkJKqANt84 +=W6kA -----END PGP SIGNATURE----- diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch deleted file mode 100644 index 3ee0dee..0000000 --- a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch +++ /dev/null @@ -1,527 +0,0 @@ -Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755 6689:e237d6d1d873 of ParseExp.cpp/h - -diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp ---- a/src/tools/ParseExp.cpp Sun Dec 15 18:20:14 2013 +0100 -+++ b/src/tools/ParseExp.cpp Sat Sep 13 11:22:39 2014 +0200 -@@ -1,262 +1,246 @@ --// -*- c-basic-offset: 4 -*- -- --/** @file ParseExp.cpp -- * -- * @brief functions to parse expressions from strings -- * -- * @author T. Modes -- * -- */ -- --/* This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This software is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -- * -- * You should have received a copy of the GNU General Public -- * License along with this software; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- * -- */ -- --// implementation is based on blog at --// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html --// modified to Hugins need --// added if statement -- --#include "ParseExp.h" -- --#include <limits> --#include <iterator> -- --#include <boost/spirit/version.hpp> --#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010 --#error "At least Spirit version 2.1 required" --#endif --#include <boost/math/constants/constants.hpp> --#include <boost/spirit/include/phoenix.hpp> --#include <boost/spirit/include/qi.hpp> -- --namespace Parser --{ -- --// helper classes to implement operators -- --//power function --struct lazy_pow_ --{ -- template <typename X, typename Y> -- struct result { typedef X type; }; -- -- template <typename X, typename Y> -- X operator()(X x, Y y) const -- { -- return std::pow(x, y); -- } --}; -- --// modulus for double values --struct lazy_mod_ --{ -- template <typename X, typename Y> -- struct result { typedef X type; }; -- -- template <typename X, typename Y> -- X operator()(X x, Y y) const -- { -- return std::fmod(x,y); -- } --}; -- --// if statement --struct lazy_if_ --{ -- template <typename X, typename Y, typename Z> -- struct result { typedef Y type; }; -- -- template <typename X, typename Y, typename Z> -- X operator()(X x, Y y, Z z) const -- { -- return x ? y : z; -- } --}; -- --// wrapper for unary function --struct lazy_ufunc_ --{ -- template <typename F, typename A1> -- struct result { typedef A1 type; }; -- -- template <typename F, typename A1> -- A1 operator()(F f, A1 a1) const -- { -- return f(a1); -- } --}; -- --// convert rad into deg --double deg(const double d) --{ -- return d*180.0/boost::math::constants::pi<double>(); --}; -- --// convert deg into rad --double rad(const double d) --{ -- return d*boost::math::constants::pi<double>()/180; --}; -- --// the main grammar class --struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type> --{ -- -- // symbol table for constants like "pi", e.g. image number and value -- struct constant_ : boost::spirit::qi::symbols<char, double> -- { -- constant_(const ConstantMap constMap) -- { -- this->add("pi", boost::math::constants::pi<double>()); -- if(constMap.size()>0) -- { -- for(ConstantMap::const_iterator it=constMap.begin(); it!=constMap.end(); it++) -- { -- this->add(it->first, it->second); -- }; -- }; -- }; -- }; -- -- // symbol table for unary functions like "abs" -- struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) > -- { -- ufunc_() -- { -- this->add -- ("abs" , (double (*)(double)) std::abs ) -- ("acos" , (double (*)(double)) std::acos ) -- ("asin" , (double (*)(double)) std::asin ) -- ("atan" , (double (*)(double)) std::atan ) -- ("ceil" , (double (*)(double)) std::ceil ) -- ("sin" , (double (*)(double)) std::sin ) -- ("cos" , (double (*)(double)) std::cos ) -- ("tan" , (double (*)(double)) std::tan ) -- ("exp" , (double (*)(double)) std::exp ) -- ("floor" , (double (*)(double)) std::floor) -- ("sqrt" , (double (*)(double)) std::sqrt ) -- ("deg" , (double (*)(double)) deg ) -- ("rad" , (double (*)(double)) rad ) -- ; -- } -- } ufunc; -- -- boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression; -- -- grammar(const ConstantMap constMap) : grammar::base_type(expression) -- { -- using boost::spirit::qi::real_parser; -- using boost::spirit::qi::real_policies; -- real_parser<double,real_policies<double> > real; -- -- using boost::spirit::qi::_1; -- using boost::spirit::qi::_2; -- using boost::spirit::qi::_3; -- using boost::spirit::qi::no_case; -- using boost::spirit::qi::_val; -- struct constant_ constant(constMap); -- -- boost::phoenix::function<lazy_pow_> lazy_pow; -- boost::phoenix::function<lazy_mod_> lazy_mod; -- boost::phoenix::function<lazy_if_> lazy_if; -- boost::phoenix::function<lazy_ufunc_> lazy_ufunc; -- -- expression = -- (compExpression >> '\?' >> compExpression >> ':' >> compExpression) [_val = lazy_if(_1, _2, _3)] -- | compExpression [_val=_1] -- ; -- -- compExpression= -- compTerm [_val=_1] -- >> * ( ("&&" >> compTerm [_val = _val && _1] ) -- |("||" >> compTerm [_val = _val || _1] ) -- ) -- ; -- -- compTerm = -- numExpression [_val = _1 ] -- >>*( ( '<' >> numExpression [_val = _val < _1]) -- |( '>' >> numExpression [_val = _val > _1]) -- |( "<=" >> numExpression [_val = _val <= _1]) -- |( ">=" >> numExpression [_val = _val >= _1]) -- |( "==" >> numExpression [_val = _val == _1]) -- |( "!=" >> numExpression [_val = _val != _1]) -- ) -- ; -- -- numExpression = -- term [_val = _1] -- >> *( ('+' >> term [_val += _1]) -- | ('-' >> term [_val -= _1]) -- ) -- ; -- -- term = -- factor [_val = _1] -- >> *( ('*' >> factor [_val *= _1]) -- | ('/' >> factor [_val /= _1]) -- | ('%' >> factor [_val = lazy_mod(_val, _1)]) -- ) -- ; -- -- factor = -- primary [_val = _1] -- >> *( ('^' >> factor [_val = lazy_pow(_val, _1)]) ) -- ; -- -- primary = -- real [_val = _1] -- | '(' >> expression [_val = _1] >> ')' -- | ('-' >> primary [_val = -_1]) -- | ('+' >> primary [_val = _1]) -- | no_case[constant] [_val = _1] -- | (no_case[ufunc] >> '(' >> expression >> ')') [_val = lazy_ufunc(_1, _2) ] -- ; -- -- }; --}; -- --//template <typename ParserType, typename Iterator> --bool parse(std::string::const_iterator &iter, -- std::string::const_iterator end, -- const grammar &g, -- double& result) --{ -- if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result)) -- { -- return false; -- }; -- // we check if the full string could parsed -- return iter==end; --} -- --// the function which exposes the interface to external --// version without pre-defined constants --bool ParseExpression(const std::string& expression, double& result) --{ -- ConstantMap constants; -- return ParseExpression(expression, result, constants); --}; -- --// version with pre-defined constants --bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants) --{ -- grammar g(constants); -- std::string::const_iterator it=expression.begin(); -- return parse(it, expression.end(), g, result); --}; -- --} // namespace -+// -*- c-basic-offset: 4 -*- -+ -+/** @file ParseExp.cpp -+ * -+ * @brief functions to parse expressions from strings -+ * -+ * @author T. Modes -+ * -+ */ -+ -+/* This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This software is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public -+ * License along with this software; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+// implementation is based on blog at -+// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html -+// modified to Hugins need -+// added if statement -+ -+#include "ParseExp.h" -+ -+#include <limits> -+#include <iterator> -+ -+#define BOOST_SPIRIT_USE_PHOENIX_V3 1 -+#include <boost/spirit/version.hpp> -+#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010 -+#error "At least Spirit version 2.1 required" -+#endif -+#include <boost/math/constants/constants.hpp> -+#include <boost/spirit/include/phoenix.hpp> -+#include <boost/spirit/include/qi.hpp> -+ -+namespace Parser -+{ -+ -+// helper classes to implement operators -+ -+//power function -+struct lazy_pow_ -+{ -+ typedef double result_type; -+ -+ double operator()(double x, double y) const -+ { -+ return std::pow(x, y); -+ } -+}; -+ -+// modulus for double values -+struct lazy_mod_ -+{ -+ typedef double result_type; -+ -+ double operator()(double x, double y) const -+ { -+ return std::fmod(x,y); -+ } -+}; -+ -+// if statement -+struct lazy_if_ -+{ -+ typedef double result_type; -+ -+ double operator()(double x, double y, double z) const -+ { -+ return (std::fabs(x)>1e-5) ? y : z; -+ } -+}; -+ -+// wrapper for unary function -+struct lazy_ufunc_ -+{ -+ typedef double result_type; -+ -+ double operator()(double (*f)(double), double a1) const -+ { -+ return f(a1); -+ } -+}; -+ -+// convert rad into deg -+const double deg(const double d) -+{ -+ return d*180.0/boost::math::constants::pi<double>(); -+}; -+ -+// convert deg into rad -+const double rad(const double d) -+{ -+ return d*boost::math::constants::pi<double>()/180; -+}; -+ -+// the main grammar class -+struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type> -+{ -+ -+ // symbol table for constants like "pi", e.g. image number and value -+ struct constant_ : boost::spirit::qi::symbols<char, double> -+ { -+ constant_(const ConstantMap constMap) -+ { -+ this->add("pi", boost::math::constants::pi<double>()); -+ if (constMap.size()>0) -+ { -+ for (ConstantMap::const_iterator it = constMap.begin(); it != constMap.end(); it++) -+ { -+ this->add(it->first, it->second); -+ }; -+ }; -+ }; -+ }; -+ -+ // symbol table for unary functions like "abs" -+ struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) > -+ { -+ ufunc_() -+ { -+ this->add -+ ("abs", (double(*)(double)) std::abs) -+ ("acos", (double(*)(double)) std::acos) -+ ("asin", (double(*)(double)) std::asin) -+ ("atan", (double(*)(double)) std::atan) -+ ("ceil", (double(*)(double)) std::ceil) -+ ("sin", (double(*)(double)) std::sin) -+ ("cos", (double(*)(double)) std::cos) -+ ("tan", (double(*)(double)) std::tan) -+ ("exp", (double(*)(double)) std::exp) -+ ("floor", (double(*)(double)) std::floor) -+ ("sqrt", (double(*)(double)) std::sqrt) -+ ("deg", (double(*)(double)) deg) -+ ("rad", (double(*)(double)) rad) -+ ; -+ } -+ } ufunc; -+ -+ boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression; -+ -+ grammar(const ConstantMap constMap) : grammar::base_type(expression) -+ { -+ using boost::spirit::qi::real_parser; -+ using boost::spirit::qi::real_policies; -+ real_parser<double, real_policies<double> > real; -+ -+ using boost::spirit::qi::_1; -+ using boost::spirit::qi::_2; -+ using boost::spirit::qi::_3; -+ using boost::spirit::qi::no_case; -+ using boost::spirit::qi::_val; -+ struct constant_ constant(constMap); -+ -+ boost::phoenix::function<lazy_pow_> lazy_pow; -+ boost::phoenix::function<lazy_mod_> lazy_mod; -+ boost::phoenix::function<lazy_if_> lazy_if; -+ boost::phoenix::function<lazy_ufunc_> lazy_ufunc; -+ -+ expression = -+ (compExpression >> '\?' >> compExpression >> ':' >> compExpression)[_val = lazy_if(_1, _2, _3)] -+ | compExpression[_val = _1] -+ ; -+ -+ compExpression = -+ compTerm[_val = _1] -+ >> *(("&&" >> compTerm[_val = _val && _1]) -+ | ("||" >> compTerm[_val = _val || _1]) -+ ) -+ ; -+ -+ compTerm = -+ numExpression[_val = _1] -+ >> *(('<' >> numExpression[_val = _val < _1]) -+ | ('>' >> numExpression[_val = _val > _1]) -+ | ("<=" >> numExpression[_val = _val <= _1]) -+ | (">=" >> numExpression[_val = _val >= _1]) -+ | ("==" >> numExpression[_val = _val == _1]) -+ | ("!=" >> numExpression[_val = _val != _1]) -+ ) -+ ; -+ -+ numExpression = -+ term[_val = _1] -+ >> *(('+' >> term[_val += _1]) -+ | ('-' >> term[_val -= _1]) -+ ) -+ ; -+ -+ term = -+ factor[_val = _1] -+ >> *(('*' >> factor[_val *= _1]) -+ | ('/' >> factor[_val /= _1]) -+ | ('%' >> factor[_val = lazy_mod(_val, _1)]) -+ ) -+ ; -+ -+ factor = -+ primary[_val = _1] -+ >> *(('^' >> factor[_val = lazy_pow(_val, _1)])) -+ ; -+ -+ primary = -+ real[_val = _1] -+ | '(' >> expression[_val = _1] >> ')' -+ | ('-' >> primary[_val = -_1]) -+ | ('+' >> primary[_val = _1]) -+ | no_case[constant][_val = _1] -+ | (no_case[ufunc] >> '(' >> expression >> ')')[_val = lazy_ufunc(_1, _2)] -+ ; -+ -+ }; -+}; -+ -+bool parse(std::string::const_iterator& iter, -+ std::string::const_iterator end, -+ const grammar& g, -+ double& result) -+{ -+ if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result)) -+ { -+ return false; -+ }; -+ // we check if the full string could parsed -+ return iter==end; -+} -+ -+// version with pre-defined constants -+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants) -+{ -+ grammar g(constants); -+ std::string::const_iterator it=expression.begin(); -+ return parse(it, expression.end(), g, result); -+}; -+ -+} // namespace -diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.h ---- a/src/tools/ParseExp.h Sun Dec 15 18:20:14 2013 +0100 -+++ b/src/tools/ParseExp.h Sat Sep 13 11:22:39 2014 +0200 -@@ -33,8 +33,7 @@ - { - typedef std::map<const char*, double> ConstantMap; - --bool ParseExpression(const std::string& expression, double& result); --bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants); -+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants=ConstantMap()); - - }; - 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 deleted file mode 100644 index f60e686..0000000 --- a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild deleted file mode 100644 index 965c600..0000000 --- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WX_GTK_VER="3.0" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW" -IUSE="debug 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/glew:= - media-libs/lensfun - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= - media-libs/openexr:= - media-libs/tiff - sys-libs/zlib - virtual/jpeg - x11-libs/wxGTK:3.0=[X,opengl] - 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}-lensfun-0.3.0.patch - "${FILESDIR}"/${P}-ParseExp.patch -) - -pkg_setup() { - DOCS="authors.txt README TODO" - mycmakeargs=( - $(cmake-utils_use_enable lapack LAPACK) - $(cmake-utils_use_build python HSI) - ) - use python && 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 - use python && 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/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild deleted file mode 100644 index 9a43a5b..0000000 --- a/media-gfx/hugin/hugin-2014.0.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WX_GTK_VER="2.8" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW" -IUSE="debug 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/glew:= - media-libs/lensfun - >=media-libs/libpano13-2.9.19_beta1: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}-lensfun-0.3.0.patch - "${FILESDIR}"/${P}-ParseExp.patch -) - -pkg_setup() { - DOCS="authors.txt README TODO" - mycmakeargs=( - $(cmake-utils_use_enable lapack LAPACK) - $(cmake-utils_use_build python HSI) - ) - use python && 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 - use python && 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/hugin-2015.0.0-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild index b42262b..3306723 100644 --- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild @@ -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=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW" IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" diff --git a/media-gfx/hugin/hugin-2015.0.0.ebuild b/media-gfx/hugin/hugin-2015.0.0.ebuild deleted file mode 100644 index 0798df9..0000000 --- a/media-gfx/hugin/hugin-2015.0.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WX_GTK_VER="2.8" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW" -IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" - -CDEPEND=" - !!dev-util/cocom - dev-db/sqlite:3 - >=dev-libs/boost-1.49.0-r1:= - dev-libs/zthread - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= - media-libs/openexr:= - media-libs/tiff:0 - >=media-libs/vigra-1.9.0[openexr] - sci-libs/fftw:= - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/wxGTK:2.8=[X,opengl,-odbc] - lapack? ( virtual/blas virtual/lapack ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool" -DEPEND="${CDEPEND} - dev-cpp/tclap - 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) - -pkg_setup() { - DOCS="authors.txt README TODO" - mycmakeargs=( - $(cmake-utils_use_enable lapack LAPACK) - $(cmake-utils_use_build python HSI) - ) - use python && 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 - use python && python_optimize - - for lang in ${LANGS} ; do - case ${lang} in - ca@valencia) dir=ca_ES@valencia;; - *) 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 abdaa4c..e87859e 100644 --- a/media-gfx/hugin/metadata.xml +++ b/media-gfx/hugin/metadata.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>graphics</herd> @@ -8,4 +8,7 @@ <pkg>media-gfx/autopano-sift</pkg> or <pkg>media-gfx/autopano-sift-C</pkg></flag> </use> + <upstream> + <remote-id type="sourceforge">hugin</remote-id> + </upstream> </pkgmetadata>
