1 |
commit: c3397c5cceda6c6e02e92cf9b9e64ca5854ade18 |
2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 19:10:42 2015 +0000 |
4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 19:10:42 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3397c5c |
7 |
|
8 |
remove old |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
media-gfx/hugin/Manifest | 1 - |
13 |
.../hugin/files/hugin-2014.0.0-ParseExp.patch | 527 --------------------- |
14 |
.../hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 - |
15 |
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 89 ---- |
16 |
media-gfx/hugin/hugin-2014.0.0.ebuild | 89 ---- |
17 |
media-gfx/hugin/hugin-2015.0.0.ebuild | 86 ---- |
18 |
6 files changed, 807 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest |
21 |
index 84eaf33..34addc4 100644 |
22 |
--- a/media-gfx/hugin/Manifest |
23 |
+++ b/media-gfx/hugin/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d |
26 |
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e |
27 |
|
28 |
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch |
29 |
deleted file mode 100644 |
30 |
index 3ee0dee..0000000 |
31 |
--- a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch |
32 |
+++ /dev/null |
33 |
@@ -1,527 +0,0 @@ |
34 |
-Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755 6689:e237d6d1d873 of ParseExp.cpp/h |
35 |
- |
36 |
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp |
37 |
---- a/src/tools/ParseExp.cpp Sun Dec 15 18:20:14 2013 +0100 |
38 |
-+++ b/src/tools/ParseExp.cpp Sat Sep 13 11:22:39 2014 +0200 |
39 |
-@@ -1,262 +1,246 @@ |
40 |
--// -*- c-basic-offset: 4 -*- |
41 |
-- |
42 |
--/** @file ParseExp.cpp |
43 |
-- * |
44 |
-- * @brief functions to parse expressions from strings |
45 |
-- * |
46 |
-- * @author T. Modes |
47 |
-- * |
48 |
-- */ |
49 |
-- |
50 |
--/* This program is free software; you can redistribute it and/or |
51 |
-- * modify it under the terms of the GNU General Public |
52 |
-- * License as published by the Free Software Foundation; either |
53 |
-- * version 2 of the License, or (at your option) any later version. |
54 |
-- * |
55 |
-- * This software is distributed in the hope that it will be useful, |
56 |
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of |
57 |
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
58 |
-- * General Public License for more details. |
59 |
-- * |
60 |
-- * You should have received a copy of the GNU General Public |
61 |
-- * License along with this software; if not, write to the Free Software |
62 |
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
63 |
-- * |
64 |
-- */ |
65 |
-- |
66 |
--// implementation is based on blog at |
67 |
--// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html |
68 |
--// modified to Hugins need |
69 |
--// added if statement |
70 |
-- |
71 |
--#include "ParseExp.h" |
72 |
-- |
73 |
--#include <limits> |
74 |
--#include <iterator> |
75 |
-- |
76 |
--#include <boost/spirit/version.hpp> |
77 |
--#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010 |
78 |
--#error "At least Spirit version 2.1 required" |
79 |
--#endif |
80 |
--#include <boost/math/constants/constants.hpp> |
81 |
--#include <boost/spirit/include/phoenix.hpp> |
82 |
--#include <boost/spirit/include/qi.hpp> |
83 |
-- |
84 |
--namespace Parser |
85 |
--{ |
86 |
-- |
87 |
--// helper classes to implement operators |
88 |
-- |
89 |
--//power function |
90 |
--struct lazy_pow_ |
91 |
--{ |
92 |
-- template <typename X, typename Y> |
93 |
-- struct result { typedef X type; }; |
94 |
-- |
95 |
-- template <typename X, typename Y> |
96 |
-- X operator()(X x, Y y) const |
97 |
-- { |
98 |
-- return std::pow(x, y); |
99 |
-- } |
100 |
--}; |
101 |
-- |
102 |
--// modulus for double values |
103 |
--struct lazy_mod_ |
104 |
--{ |
105 |
-- template <typename X, typename Y> |
106 |
-- struct result { typedef X type; }; |
107 |
-- |
108 |
-- template <typename X, typename Y> |
109 |
-- X operator()(X x, Y y) const |
110 |
-- { |
111 |
-- return std::fmod(x,y); |
112 |
-- } |
113 |
--}; |
114 |
-- |
115 |
--// if statement |
116 |
--struct lazy_if_ |
117 |
--{ |
118 |
-- template <typename X, typename Y, typename Z> |
119 |
-- struct result { typedef Y type; }; |
120 |
-- |
121 |
-- template <typename X, typename Y, typename Z> |
122 |
-- X operator()(X x, Y y, Z z) const |
123 |
-- { |
124 |
-- return x ? y : z; |
125 |
-- } |
126 |
--}; |
127 |
-- |
128 |
--// wrapper for unary function |
129 |
--struct lazy_ufunc_ |
130 |
--{ |
131 |
-- template <typename F, typename A1> |
132 |
-- struct result { typedef A1 type; }; |
133 |
-- |
134 |
-- template <typename F, typename A1> |
135 |
-- A1 operator()(F f, A1 a1) const |
136 |
-- { |
137 |
-- return f(a1); |
138 |
-- } |
139 |
--}; |
140 |
-- |
141 |
--// convert rad into deg |
142 |
--double deg(const double d) |
143 |
--{ |
144 |
-- return d*180.0/boost::math::constants::pi<double>(); |
145 |
--}; |
146 |
-- |
147 |
--// convert deg into rad |
148 |
--double rad(const double d) |
149 |
--{ |
150 |
-- return d*boost::math::constants::pi<double>()/180; |
151 |
--}; |
152 |
-- |
153 |
--// the main grammar class |
154 |
--struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type> |
155 |
--{ |
156 |
-- |
157 |
-- // symbol table for constants like "pi", e.g. image number and value |
158 |
-- struct constant_ : boost::spirit::qi::symbols<char, double> |
159 |
-- { |
160 |
-- constant_(const ConstantMap constMap) |
161 |
-- { |
162 |
-- this->add("pi", boost::math::constants::pi<double>()); |
163 |
-- if(constMap.size()>0) |
164 |
-- { |
165 |
-- for(ConstantMap::const_iterator it=constMap.begin(); it!=constMap.end(); it++) |
166 |
-- { |
167 |
-- this->add(it->first, it->second); |
168 |
-- }; |
169 |
-- }; |
170 |
-- }; |
171 |
-- }; |
172 |
-- |
173 |
-- // symbol table for unary functions like "abs" |
174 |
-- struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) > |
175 |
-- { |
176 |
-- ufunc_() |
177 |
-- { |
178 |
-- this->add |
179 |
-- ("abs" , (double (*)(double)) std::abs ) |
180 |
-- ("acos" , (double (*)(double)) std::acos ) |
181 |
-- ("asin" , (double (*)(double)) std::asin ) |
182 |
-- ("atan" , (double (*)(double)) std::atan ) |
183 |
-- ("ceil" , (double (*)(double)) std::ceil ) |
184 |
-- ("sin" , (double (*)(double)) std::sin ) |
185 |
-- ("cos" , (double (*)(double)) std::cos ) |
186 |
-- ("tan" , (double (*)(double)) std::tan ) |
187 |
-- ("exp" , (double (*)(double)) std::exp ) |
188 |
-- ("floor" , (double (*)(double)) std::floor) |
189 |
-- ("sqrt" , (double (*)(double)) std::sqrt ) |
190 |
-- ("deg" , (double (*)(double)) deg ) |
191 |
-- ("rad" , (double (*)(double)) rad ) |
192 |
-- ; |
193 |
-- } |
194 |
-- } ufunc; |
195 |
-- |
196 |
-- boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression; |
197 |
-- |
198 |
-- grammar(const ConstantMap constMap) : grammar::base_type(expression) |
199 |
-- { |
200 |
-- using boost::spirit::qi::real_parser; |
201 |
-- using boost::spirit::qi::real_policies; |
202 |
-- real_parser<double,real_policies<double> > real; |
203 |
-- |
204 |
-- using boost::spirit::qi::_1; |
205 |
-- using boost::spirit::qi::_2; |
206 |
-- using boost::spirit::qi::_3; |
207 |
-- using boost::spirit::qi::no_case; |
208 |
-- using boost::spirit::qi::_val; |
209 |
-- struct constant_ constant(constMap); |
210 |
-- |
211 |
-- boost::phoenix::function<lazy_pow_> lazy_pow; |
212 |
-- boost::phoenix::function<lazy_mod_> lazy_mod; |
213 |
-- boost::phoenix::function<lazy_if_> lazy_if; |
214 |
-- boost::phoenix::function<lazy_ufunc_> lazy_ufunc; |
215 |
-- |
216 |
-- expression = |
217 |
-- (compExpression >> '\?' >> compExpression >> ':' >> compExpression) [_val = lazy_if(_1, _2, _3)] |
218 |
-- | compExpression [_val=_1] |
219 |
-- ; |
220 |
-- |
221 |
-- compExpression= |
222 |
-- compTerm [_val=_1] |
223 |
-- >> * ( ("&&" >> compTerm [_val = _val && _1] ) |
224 |
-- |("||" >> compTerm [_val = _val || _1] ) |
225 |
-- ) |
226 |
-- ; |
227 |
-- |
228 |
-- compTerm = |
229 |
-- numExpression [_val = _1 ] |
230 |
-- >>*( ( '<' >> numExpression [_val = _val < _1]) |
231 |
-- |( '>' >> numExpression [_val = _val > _1]) |
232 |
-- |( "<=" >> numExpression [_val = _val <= _1]) |
233 |
-- |( ">=" >> numExpression [_val = _val >= _1]) |
234 |
-- |( "==" >> numExpression [_val = _val == _1]) |
235 |
-- |( "!=" >> numExpression [_val = _val != _1]) |
236 |
-- ) |
237 |
-- ; |
238 |
-- |
239 |
-- numExpression = |
240 |
-- term [_val = _1] |
241 |
-- >> *( ('+' >> term [_val += _1]) |
242 |
-- | ('-' >> term [_val -= _1]) |
243 |
-- ) |
244 |
-- ; |
245 |
-- |
246 |
-- term = |
247 |
-- factor [_val = _1] |
248 |
-- >> *( ('*' >> factor [_val *= _1]) |
249 |
-- | ('/' >> factor [_val /= _1]) |
250 |
-- | ('%' >> factor [_val = lazy_mod(_val, _1)]) |
251 |
-- ) |
252 |
-- ; |
253 |
-- |
254 |
-- factor = |
255 |
-- primary [_val = _1] |
256 |
-- >> *( ('^' >> factor [_val = lazy_pow(_val, _1)]) ) |
257 |
-- ; |
258 |
-- |
259 |
-- primary = |
260 |
-- real [_val = _1] |
261 |
-- | '(' >> expression [_val = _1] >> ')' |
262 |
-- | ('-' >> primary [_val = -_1]) |
263 |
-- | ('+' >> primary [_val = _1]) |
264 |
-- | no_case[constant] [_val = _1] |
265 |
-- | (no_case[ufunc] >> '(' >> expression >> ')') [_val = lazy_ufunc(_1, _2) ] |
266 |
-- ; |
267 |
-- |
268 |
-- }; |
269 |
--}; |
270 |
-- |
271 |
--//template <typename ParserType, typename Iterator> |
272 |
--bool parse(std::string::const_iterator &iter, |
273 |
-- std::string::const_iterator end, |
274 |
-- const grammar &g, |
275 |
-- double& result) |
276 |
--{ |
277 |
-- if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result)) |
278 |
-- { |
279 |
-- return false; |
280 |
-- }; |
281 |
-- // we check if the full string could parsed |
282 |
-- return iter==end; |
283 |
--} |
284 |
-- |
285 |
--// the function which exposes the interface to external |
286 |
--// version without pre-defined constants |
287 |
--bool ParseExpression(const std::string& expression, double& result) |
288 |
--{ |
289 |
-- ConstantMap constants; |
290 |
-- return ParseExpression(expression, result, constants); |
291 |
--}; |
292 |
-- |
293 |
--// version with pre-defined constants |
294 |
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants) |
295 |
--{ |
296 |
-- grammar g(constants); |
297 |
-- std::string::const_iterator it=expression.begin(); |
298 |
-- return parse(it, expression.end(), g, result); |
299 |
--}; |
300 |
-- |
301 |
--} // namespace |
302 |
-+// -*- c-basic-offset: 4 -*- |
303 |
-+ |
304 |
-+/** @file ParseExp.cpp |
305 |
-+ * |
306 |
-+ * @brief functions to parse expressions from strings |
307 |
-+ * |
308 |
-+ * @author T. Modes |
309 |
-+ * |
310 |
-+ */ |
311 |
-+ |
312 |
-+/* This program is free software; you can redistribute it and/or |
313 |
-+ * modify it under the terms of the GNU General Public |
314 |
-+ * License as published by the Free Software Foundation; either |
315 |
-+ * version 2 of the License, or (at your option) any later version. |
316 |
-+ * |
317 |
-+ * This software is distributed in the hope that it will be useful, |
318 |
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
319 |
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
320 |
-+ * General Public License for more details. |
321 |
-+ * |
322 |
-+ * You should have received a copy of the GNU General Public |
323 |
-+ * License along with this software; if not, write to the Free Software |
324 |
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
325 |
-+ * |
326 |
-+ */ |
327 |
-+ |
328 |
-+// implementation is based on blog at |
329 |
-+// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html |
330 |
-+// modified to Hugins need |
331 |
-+// added if statement |
332 |
-+ |
333 |
-+#include "ParseExp.h" |
334 |
-+ |
335 |
-+#include <limits> |
336 |
-+#include <iterator> |
337 |
-+ |
338 |
-+#define BOOST_SPIRIT_USE_PHOENIX_V3 1 |
339 |
-+#include <boost/spirit/version.hpp> |
340 |
-+#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010 |
341 |
-+#error "At least Spirit version 2.1 required" |
342 |
-+#endif |
343 |
-+#include <boost/math/constants/constants.hpp> |
344 |
-+#include <boost/spirit/include/phoenix.hpp> |
345 |
-+#include <boost/spirit/include/qi.hpp> |
346 |
-+ |
347 |
-+namespace Parser |
348 |
-+{ |
349 |
-+ |
350 |
-+// helper classes to implement operators |
351 |
-+ |
352 |
-+//power function |
353 |
-+struct lazy_pow_ |
354 |
-+{ |
355 |
-+ typedef double result_type; |
356 |
-+ |
357 |
-+ double operator()(double x, double y) const |
358 |
-+ { |
359 |
-+ return std::pow(x, y); |
360 |
-+ } |
361 |
-+}; |
362 |
-+ |
363 |
-+// modulus for double values |
364 |
-+struct lazy_mod_ |
365 |
-+{ |
366 |
-+ typedef double result_type; |
367 |
-+ |
368 |
-+ double operator()(double x, double y) const |
369 |
-+ { |
370 |
-+ return std::fmod(x,y); |
371 |
-+ } |
372 |
-+}; |
373 |
-+ |
374 |
-+// if statement |
375 |
-+struct lazy_if_ |
376 |
-+{ |
377 |
-+ typedef double result_type; |
378 |
-+ |
379 |
-+ double operator()(double x, double y, double z) const |
380 |
-+ { |
381 |
-+ return (std::fabs(x)>1e-5) ? y : z; |
382 |
-+ } |
383 |
-+}; |
384 |
-+ |
385 |
-+// wrapper for unary function |
386 |
-+struct lazy_ufunc_ |
387 |
-+{ |
388 |
-+ typedef double result_type; |
389 |
-+ |
390 |
-+ double operator()(double (*f)(double), double a1) const |
391 |
-+ { |
392 |
-+ return f(a1); |
393 |
-+ } |
394 |
-+}; |
395 |
-+ |
396 |
-+// convert rad into deg |
397 |
-+const double deg(const double d) |
398 |
-+{ |
399 |
-+ return d*180.0/boost::math::constants::pi<double>(); |
400 |
-+}; |
401 |
-+ |
402 |
-+// convert deg into rad |
403 |
-+const double rad(const double d) |
404 |
-+{ |
405 |
-+ return d*boost::math::constants::pi<double>()/180; |
406 |
-+}; |
407 |
-+ |
408 |
-+// the main grammar class |
409 |
-+struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type> |
410 |
-+{ |
411 |
-+ |
412 |
-+ // symbol table for constants like "pi", e.g. image number and value |
413 |
-+ struct constant_ : boost::spirit::qi::symbols<char, double> |
414 |
-+ { |
415 |
-+ constant_(const ConstantMap constMap) |
416 |
-+ { |
417 |
-+ this->add("pi", boost::math::constants::pi<double>()); |
418 |
-+ if (constMap.size()>0) |
419 |
-+ { |
420 |
-+ for (ConstantMap::const_iterator it = constMap.begin(); it != constMap.end(); it++) |
421 |
-+ { |
422 |
-+ this->add(it->first, it->second); |
423 |
-+ }; |
424 |
-+ }; |
425 |
-+ }; |
426 |
-+ }; |
427 |
-+ |
428 |
-+ // symbol table for unary functions like "abs" |
429 |
-+ struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) > |
430 |
-+ { |
431 |
-+ ufunc_() |
432 |
-+ { |
433 |
-+ this->add |
434 |
-+ ("abs", (double(*)(double)) std::abs) |
435 |
-+ ("acos", (double(*)(double)) std::acos) |
436 |
-+ ("asin", (double(*)(double)) std::asin) |
437 |
-+ ("atan", (double(*)(double)) std::atan) |
438 |
-+ ("ceil", (double(*)(double)) std::ceil) |
439 |
-+ ("sin", (double(*)(double)) std::sin) |
440 |
-+ ("cos", (double(*)(double)) std::cos) |
441 |
-+ ("tan", (double(*)(double)) std::tan) |
442 |
-+ ("exp", (double(*)(double)) std::exp) |
443 |
-+ ("floor", (double(*)(double)) std::floor) |
444 |
-+ ("sqrt", (double(*)(double)) std::sqrt) |
445 |
-+ ("deg", (double(*)(double)) deg) |
446 |
-+ ("rad", (double(*)(double)) rad) |
447 |
-+ ; |
448 |
-+ } |
449 |
-+ } ufunc; |
450 |
-+ |
451 |
-+ boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression; |
452 |
-+ |
453 |
-+ grammar(const ConstantMap constMap) : grammar::base_type(expression) |
454 |
-+ { |
455 |
-+ using boost::spirit::qi::real_parser; |
456 |
-+ using boost::spirit::qi::real_policies; |
457 |
-+ real_parser<double, real_policies<double> > real; |
458 |
-+ |
459 |
-+ using boost::spirit::qi::_1; |
460 |
-+ using boost::spirit::qi::_2; |
461 |
-+ using boost::spirit::qi::_3; |
462 |
-+ using boost::spirit::qi::no_case; |
463 |
-+ using boost::spirit::qi::_val; |
464 |
-+ struct constant_ constant(constMap); |
465 |
-+ |
466 |
-+ boost::phoenix::function<lazy_pow_> lazy_pow; |
467 |
-+ boost::phoenix::function<lazy_mod_> lazy_mod; |
468 |
-+ boost::phoenix::function<lazy_if_> lazy_if; |
469 |
-+ boost::phoenix::function<lazy_ufunc_> lazy_ufunc; |
470 |
-+ |
471 |
-+ expression = |
472 |
-+ (compExpression >> '\?' >> compExpression >> ':' >> compExpression)[_val = lazy_if(_1, _2, _3)] |
473 |
-+ | compExpression[_val = _1] |
474 |
-+ ; |
475 |
-+ |
476 |
-+ compExpression = |
477 |
-+ compTerm[_val = _1] |
478 |
-+ >> *(("&&" >> compTerm[_val = _val && _1]) |
479 |
-+ | ("||" >> compTerm[_val = _val || _1]) |
480 |
-+ ) |
481 |
-+ ; |
482 |
-+ |
483 |
-+ compTerm = |
484 |
-+ numExpression[_val = _1] |
485 |
-+ >> *(('<' >> numExpression[_val = _val < _1]) |
486 |
-+ | ('>' >> numExpression[_val = _val > _1]) |
487 |
-+ | ("<=" >> numExpression[_val = _val <= _1]) |
488 |
-+ | (">=" >> numExpression[_val = _val >= _1]) |
489 |
-+ | ("==" >> numExpression[_val = _val == _1]) |
490 |
-+ | ("!=" >> numExpression[_val = _val != _1]) |
491 |
-+ ) |
492 |
-+ ; |
493 |
-+ |
494 |
-+ numExpression = |
495 |
-+ term[_val = _1] |
496 |
-+ >> *(('+' >> term[_val += _1]) |
497 |
-+ | ('-' >> term[_val -= _1]) |
498 |
-+ ) |
499 |
-+ ; |
500 |
-+ |
501 |
-+ term = |
502 |
-+ factor[_val = _1] |
503 |
-+ >> *(('*' >> factor[_val *= _1]) |
504 |
-+ | ('/' >> factor[_val /= _1]) |
505 |
-+ | ('%' >> factor[_val = lazy_mod(_val, _1)]) |
506 |
-+ ) |
507 |
-+ ; |
508 |
-+ |
509 |
-+ factor = |
510 |
-+ primary[_val = _1] |
511 |
-+ >> *(('^' >> factor[_val = lazy_pow(_val, _1)])) |
512 |
-+ ; |
513 |
-+ |
514 |
-+ primary = |
515 |
-+ real[_val = _1] |
516 |
-+ | '(' >> expression[_val = _1] >> ')' |
517 |
-+ | ('-' >> primary[_val = -_1]) |
518 |
-+ | ('+' >> primary[_val = _1]) |
519 |
-+ | no_case[constant][_val = _1] |
520 |
-+ | (no_case[ufunc] >> '(' >> expression >> ')')[_val = lazy_ufunc(_1, _2)] |
521 |
-+ ; |
522 |
-+ |
523 |
-+ }; |
524 |
-+}; |
525 |
-+ |
526 |
-+bool parse(std::string::const_iterator& iter, |
527 |
-+ std::string::const_iterator end, |
528 |
-+ const grammar& g, |
529 |
-+ double& result) |
530 |
-+{ |
531 |
-+ if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result)) |
532 |
-+ { |
533 |
-+ return false; |
534 |
-+ }; |
535 |
-+ // we check if the full string could parsed |
536 |
-+ return iter==end; |
537 |
-+} |
538 |
-+ |
539 |
-+// version with pre-defined constants |
540 |
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants) |
541 |
-+{ |
542 |
-+ grammar g(constants); |
543 |
-+ std::string::const_iterator it=expression.begin(); |
544 |
-+ return parse(it, expression.end(), g, result); |
545 |
-+}; |
546 |
-+ |
547 |
-+} // namespace |
548 |
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.h |
549 |
---- a/src/tools/ParseExp.h Sun Dec 15 18:20:14 2013 +0100 |
550 |
-+++ b/src/tools/ParseExp.h Sat Sep 13 11:22:39 2014 +0200 |
551 |
-@@ -33,8 +33,7 @@ |
552 |
- { |
553 |
- typedef std::map<const char*, double> ConstantMap; |
554 |
- |
555 |
--bool ParseExpression(const std::string& expression, double& result); |
556 |
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants); |
557 |
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants=ConstantMap()); |
558 |
- |
559 |
- }; |
560 |
- |
561 |
|
562 |
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 |
563 |
deleted file mode 100644 |
564 |
index f60e686..0000000 |
565 |
--- a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch |
566 |
+++ /dev/null |
567 |
@@ -1,15 +0,0 @@ |
568 |
-https://bugs.gentoo.org/show_bug.cgi?id=524700 |
569 |
- |
570 |
-diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp |
571 |
---- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp 2014-04-27 08:26:57.000000000 +0200 |
572 |
-+++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp 2014-10-08 10:44:29.445076647 +0200 |
573 |
-@@ -620,7 +620,9 @@ |
574 |
- break; |
575 |
- case LF_DIST_MODEL_NONE: |
576 |
- case LF_DIST_MODEL_POLY5: |
577 |
-+#ifdef LF_DIST_MODEL_FOV1 |
578 |
- case LF_DIST_MODEL_FOV1: |
579 |
-+#endif |
580 |
- default: |
581 |
- return false; |
582 |
- break; |
583 |
|
584 |
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild |
585 |
deleted file mode 100644 |
586 |
index 965c600..0000000 |
587 |
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild |
588 |
+++ /dev/null |
589 |
@@ -1,89 +0,0 @@ |
590 |
-# Copyright 1999-2015 Gentoo Foundation |
591 |
-# Distributed under the terms of the GNU General Public License v2 |
592 |
-# $Id$ |
593 |
- |
594 |
-EAPI=5 |
595 |
- |
596 |
-WX_GTK_VER="3.0" |
597 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
598 |
- |
599 |
-inherit base python-single-r1 wxwidgets versionator cmake-utils |
600 |
- |
601 |
-DESCRIPTION="GUI for the creation & processing of panoramic images" |
602 |
-HOMEPAGE="http://hugin.sf.net" |
603 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
604 |
- |
605 |
-LICENSE="GPL-2 SIFT" |
606 |
-SLOT="0" |
607 |
-KEYWORDS="~amd64 ~ppc ~x86" |
608 |
- |
609 |
-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" |
610 |
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
611 |
- |
612 |
-CDEPEND=" |
613 |
- !!dev-util/cocom |
614 |
- app-arch/zip |
615 |
- dev-cpp/tclap |
616 |
- >=dev-libs/boost-1.49.0-r1:= |
617 |
- dev-libs/zthread |
618 |
- >=media-gfx/enblend-4.0 |
619 |
- media-gfx/exiv2:= |
620 |
- media-libs/freeglut |
621 |
- media-libs/glew:= |
622 |
- media-libs/lensfun |
623 |
- >=media-libs/libpano13-2.9.19_beta1:0= |
624 |
- media-libs/libpng:0= |
625 |
- media-libs/openexr:= |
626 |
- media-libs/tiff |
627 |
- sys-libs/zlib |
628 |
- virtual/jpeg |
629 |
- x11-libs/wxGTK:3.0=[X,opengl] |
630 |
- lapack? ( virtual/lapack ) |
631 |
- sift? ( media-gfx/autopano-sift-C )" |
632 |
-RDEPEND="${CDEPEND} |
633 |
- media-libs/exiftool" |
634 |
-DEPEND="${CDEPEND} |
635 |
- sys-devel/gettext |
636 |
- virtual/pkgconfig |
637 |
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" |
638 |
- |
639 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
640 |
- |
641 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
642 |
- |
643 |
-PATCHES=( |
644 |
- "${FILESDIR}"/${P}-lensfun-0.3.0.patch |
645 |
- "${FILESDIR}"/${P}-ParseExp.patch |
646 |
-) |
647 |
- |
648 |
-pkg_setup() { |
649 |
- DOCS="authors.txt README TODO" |
650 |
- mycmakeargs=( |
651 |
- $(cmake-utils_use_enable lapack LAPACK) |
652 |
- $(cmake-utils_use_build python HSI) |
653 |
- ) |
654 |
- use python && python-single-r1_pkg_setup |
655 |
-} |
656 |
- |
657 |
-src_prepare() { |
658 |
- sed \ |
659 |
- -e 's:-O3::g' \ |
660 |
- -i src/celeste/CMakeLists.txt || die |
661 |
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
662 |
- |
663 |
- cmake-utils_src_prepare |
664 |
-} |
665 |
- |
666 |
-src_install() { |
667 |
- cmake-utils_src_install |
668 |
- use python && python_optimize |
669 |
- |
670 |
- for lang in ${LANGS} ; do |
671 |
- case ${lang} in |
672 |
- ca) dir=ca_ES;; |
673 |
- cs) dir=cs_CZ;; |
674 |
- *) dir=${lang};; |
675 |
- esac |
676 |
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
677 |
- done |
678 |
-} |
679 |
|
680 |
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild |
681 |
deleted file mode 100644 |
682 |
index 9a43a5b..0000000 |
683 |
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild |
684 |
+++ /dev/null |
685 |
@@ -1,89 +0,0 @@ |
686 |
-# Copyright 1999-2015 Gentoo Foundation |
687 |
-# Distributed under the terms of the GNU General Public License v2 |
688 |
-# $Id$ |
689 |
- |
690 |
-EAPI=5 |
691 |
- |
692 |
-WX_GTK_VER="2.8" |
693 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
694 |
- |
695 |
-inherit base python-single-r1 wxwidgets versionator cmake-utils |
696 |
- |
697 |
-DESCRIPTION="GUI for the creation & processing of panoramic images" |
698 |
-HOMEPAGE="http://hugin.sf.net" |
699 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
700 |
- |
701 |
-LICENSE="GPL-2 SIFT" |
702 |
-SLOT="0" |
703 |
-KEYWORDS="amd64 ~ppc x86" |
704 |
- |
705 |
-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" |
706 |
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
707 |
- |
708 |
-CDEPEND=" |
709 |
- !!dev-util/cocom |
710 |
- app-arch/zip |
711 |
- dev-cpp/tclap |
712 |
- >=dev-libs/boost-1.49.0-r1:= |
713 |
- dev-libs/zthread |
714 |
- >=media-gfx/enblend-4.0 |
715 |
- media-gfx/exiv2:= |
716 |
- media-libs/freeglut |
717 |
- media-libs/glew:= |
718 |
- media-libs/lensfun |
719 |
- >=media-libs/libpano13-2.9.19_beta1:0= |
720 |
- media-libs/libpng:0= |
721 |
- media-libs/openexr:= |
722 |
- media-libs/tiff |
723 |
- sys-libs/zlib |
724 |
- virtual/jpeg |
725 |
- x11-libs/wxGTK:2.8=[X,opengl,-odbc] |
726 |
- lapack? ( virtual/lapack ) |
727 |
- sift? ( media-gfx/autopano-sift-C )" |
728 |
-RDEPEND="${CDEPEND} |
729 |
- media-libs/exiftool" |
730 |
-DEPEND="${CDEPEND} |
731 |
- sys-devel/gettext |
732 |
- virtual/pkgconfig |
733 |
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" |
734 |
- |
735 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
736 |
- |
737 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
738 |
- |
739 |
-PATCHES=( |
740 |
- "${FILESDIR}"/${P}-lensfun-0.3.0.patch |
741 |
- "${FILESDIR}"/${P}-ParseExp.patch |
742 |
-) |
743 |
- |
744 |
-pkg_setup() { |
745 |
- DOCS="authors.txt README TODO" |
746 |
- mycmakeargs=( |
747 |
- $(cmake-utils_use_enable lapack LAPACK) |
748 |
- $(cmake-utils_use_build python HSI) |
749 |
- ) |
750 |
- use python && python-single-r1_pkg_setup |
751 |
-} |
752 |
- |
753 |
-src_prepare() { |
754 |
- sed \ |
755 |
- -e 's:-O3::g' \ |
756 |
- -i src/celeste/CMakeLists.txt || die |
757 |
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
758 |
- |
759 |
- cmake-utils_src_prepare |
760 |
-} |
761 |
- |
762 |
-src_install() { |
763 |
- cmake-utils_src_install |
764 |
- use python && python_optimize |
765 |
- |
766 |
- for lang in ${LANGS} ; do |
767 |
- case ${lang} in |
768 |
- ca) dir=ca_ES;; |
769 |
- cs) dir=cs_CZ;; |
770 |
- *) dir=${lang};; |
771 |
- esac |
772 |
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
773 |
- done |
774 |
-} |
775 |
|
776 |
diff --git a/media-gfx/hugin/hugin-2015.0.0.ebuild b/media-gfx/hugin/hugin-2015.0.0.ebuild |
777 |
deleted file mode 100644 |
778 |
index 0798df9..0000000 |
779 |
--- a/media-gfx/hugin/hugin-2015.0.0.ebuild |
780 |
+++ /dev/null |
781 |
@@ -1,86 +0,0 @@ |
782 |
-# Copyright 1999-2015 Gentoo Foundation |
783 |
-# Distributed under the terms of the GNU General Public License v2 |
784 |
-# $Id$ |
785 |
- |
786 |
-EAPI=5 |
787 |
- |
788 |
-WX_GTK_VER="2.8" |
789 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
790 |
- |
791 |
-inherit base python-single-r1 wxwidgets versionator cmake-utils |
792 |
- |
793 |
-DESCRIPTION="GUI for the creation & processing of panoramic images" |
794 |
-HOMEPAGE="http://hugin.sf.net" |
795 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
796 |
- |
797 |
-LICENSE="GPL-2 SIFT" |
798 |
-SLOT="0" |
799 |
-KEYWORDS="~amd64 ~ppc ~x86" |
800 |
- |
801 |
-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" |
802 |
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
803 |
- |
804 |
-CDEPEND=" |
805 |
- !!dev-util/cocom |
806 |
- dev-db/sqlite:3 |
807 |
- >=dev-libs/boost-1.49.0-r1:= |
808 |
- dev-libs/zthread |
809 |
- >=media-gfx/enblend-4.0 |
810 |
- media-gfx/exiv2:= |
811 |
- media-libs/freeglut |
812 |
- media-libs/glew:= |
813 |
- >=media-libs/libpano13-2.9.19_beta1:0= |
814 |
- media-libs/libpng:0= |
815 |
- media-libs/openexr:= |
816 |
- media-libs/tiff:0 |
817 |
- >=media-libs/vigra-1.9.0[openexr] |
818 |
- sci-libs/fftw:= |
819 |
- sys-libs/zlib |
820 |
- virtual/glu |
821 |
- virtual/jpeg:0 |
822 |
- virtual/opengl |
823 |
- x11-libs/wxGTK:2.8=[X,opengl,-odbc] |
824 |
- lapack? ( virtual/blas virtual/lapack ) |
825 |
- sift? ( media-gfx/autopano-sift-C )" |
826 |
-RDEPEND="${CDEPEND} |
827 |
- media-libs/exiftool" |
828 |
-DEPEND="${CDEPEND} |
829 |
- dev-cpp/tclap |
830 |
- sys-devel/gettext |
831 |
- virtual/pkgconfig |
832 |
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" |
833 |
- |
834 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
835 |
- |
836 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
837 |
- |
838 |
-pkg_setup() { |
839 |
- DOCS="authors.txt README TODO" |
840 |
- mycmakeargs=( |
841 |
- $(cmake-utils_use_enable lapack LAPACK) |
842 |
- $(cmake-utils_use_build python HSI) |
843 |
- ) |
844 |
- use python && python-single-r1_pkg_setup |
845 |
-} |
846 |
- |
847 |
-src_prepare() { |
848 |
- sed \ |
849 |
- -e 's:-O3::g' \ |
850 |
- -i src/celeste/CMakeLists.txt || die |
851 |
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
852 |
- |
853 |
- cmake-utils_src_prepare |
854 |
-} |
855 |
- |
856 |
-src_install() { |
857 |
- cmake-utils_src_install |
858 |
- use python && python_optimize |
859 |
- |
860 |
- for lang in ${LANGS} ; do |
861 |
- case ${lang} in |
862 |
- ca@valencia) dir=ca_ES@valencia;; |
863 |
- *) dir=${lang};; |
864 |
- esac |
865 |
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
866 |
- done |
867 |
-} |