Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2014-12-08 16:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2014-10-14 13:25:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2014-12-08 16:56:13.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 5 10:36:30 UTC 2014 - [email protected] + +- Add hugin-boost-1.56.0.patch: Fix build with Boost 1.56.0. Patch + taken from upstream. + +------------------------------------------------------------------- New: ---- hugin-boost-1.56.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.23JC7V/_old 2014-12-08 16:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.23JC7V/_new 2014-12-08 16:56:14.000000000 +0100 @@ -59,6 +59,8 @@ # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #Source: %%{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy +# PATCH-FIX-UPSTREAM hugin-boost-1.56.0.patch [email protected] -- Fix build with Boost 1.56.0, taken from http://sourceforge.net/p/hugin/hugin/ci/e237d6d1d87354f974d37a95ba52dbd9666dd310/tree/src/tools/ParseExp.cpp?diff=dde84e96b755646f3390bd9114a76f7c392fd0bf +Patch0: hugin-boost-1.56.0.patch Requires: enblend-enfuse >= 3.2 # needed for photo stiching (bnc#822775) Requires: make @@ -79,6 +81,7 @@ %prep %setup -q +%patch0 -p1 # For SVN snapshot: #setup -q -n %%{name} ++++++ hugin-boost-1.56.0.patch ++++++ Index: hugin-2014.0.0/src/tools/ParseExp.cpp =================================================================== --- hugin-2014.0.0.orig/src/tools/ParseExp.cpp +++ hugin-2014.0.0/src/tools/ParseExp.cpp @@ -34,6 +34,7 @@ #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" @@ -50,11 +51,9 @@ namespace Parser //power function struct lazy_pow_ { - template <typename X, typename Y> - struct result { typedef X type; }; + typedef double result_type; - template <typename X, typename Y> - X operator()(X x, Y y) const + double operator()(double x, double y) const { return std::pow(x, y); } @@ -63,11 +62,9 @@ struct lazy_pow_ // modulus for double values struct lazy_mod_ { - template <typename X, typename Y> - struct result { typedef X type; }; + typedef double result_type; - template <typename X, typename Y> - X operator()(X x, Y y) const + double operator()(double x, double y) const { return std::fmod(x,y); } @@ -76,37 +73,33 @@ struct lazy_mod_ // if statement struct lazy_if_ { - template <typename X, typename Y, typename Z> - struct result { typedef Y type; }; + typedef double result_type; - template <typename X, typename Y, typename Z> - X operator()(X x, Y y, Z z) const + double operator()(double x, double y, double z) const { - return x ? y : z; + return (std::fabs(x)>1e-5) ? y : z; } }; // wrapper for unary function struct lazy_ufunc_ { - template <typename F, typename A1> - struct result { typedef A1 type; }; + typedef double result_type; - template <typename F, typename A1> - A1 operator()(F f, A1 a1) const + double operator()(double (*f)(double), double a1) const { return f(a1); } }; // convert rad into deg -double deg(const double d) +const double deg(const double d) { return d*180.0/boost::math::constants::pi<double>(); }; // convert deg into rad -double rad(const double d) +const double rad(const double d) { return d*boost::math::constants::pi<double>()/180; }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
