Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd97e8b68734ec9498786328aa8e1f36fa380372
commit dd97e8b68734ec9498786328aa8e1f36fa380372 Author: Marius Cirsta <[email protected]> Date: Tue Dec 15 01:20:37 2015 +0200 hugin-2015.0.0-1-x86_64 * version bump * use wxwidgets diff --git a/source/xapps-extra/hugin/FrugalBuild b/source/xapps-extra/hugin/FrugalBuild index 094bce3..ca5f0bb 100644 --- a/source/xapps-extra/hugin/FrugalBuild +++ b/source/xapps-extra/hugin/FrugalBuild @@ -1,28 +1,22 @@ # Compiling Time: 7.23 SBU # Maintainer: Melko <[email protected]> -options+=('asneeded') pkgname=hugin -pkgver=2014.0.0 -pkgrel=4 +pkgver=2015.0.0 +pkgrel=1 pkgdesc="A frontend to the panorama-tools." depends=('libpano13>=2.9.19' 'glew>=1.13' 'openexr>=2.2.0' \ - 'exiv2>=0.25' 'wxgtk28' 'enblend-enfuse>=4.1-2' 'lensfun' \ - 'perl-image-exiftool') + 'exiv2>=0.25' 'wxwidgets' 'enblend-enfuse>=4.1-2' 'lensfun' \ + 'perl-image-exiftool' 'fftw') makedepends=('boost>=1.58.0' 'tclap' 'swig') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" _F_archive_grepv="beta\|rc" -_F_cmake_confopts=" -DwxWidgets_USE_UNICODE=ON \ - -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' \ - -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8'" +_F_cmake_confopts=" -DwxWidgets_USE_UNICODE=ON " Finclude sourceforge cmake -source=(${source[@]} boost-1.57.0.patch hugin-boost.patch) -sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9' \ - '9b6ac607b99350049c37d68c61f4a083068c0f19' \ - '6b5c54ac9acc272ef5e14ef06e7b9a98b6737293') +sha1sums=('be7153a0791f2147153e93e8711912ef23b60b61') build() { Fcd diff --git a/source/xapps-extra/hugin/boost-1.57.0.patch b/source/xapps-extra/hugin/boost-1.57.0.patch deleted file mode 100644 index 6ab3541..0000000 --- a/source/xapps-extra/hugin/boost-1.57.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- hugin-2014.0.0/src/hugin1/hugin/TextureManager.h~ 2014-10-08 20:19:19.000000000 +0200 -+++ hugin-2014.0.0/src/hugin1/hugin/TextureManager.h 2015-02-18 20:17:32.275040262 +0100 -@@ -42,6 +42,7 @@ - #include <map> - #include <boost/version.hpp> - #if BOOST_VERSION>=105400 -+#include <boost/weak_ptr.hpp> - #include <boost/signals2/trackable.hpp> - namespace boostSignal=boost::signals2; - #else diff --git a/source/xapps-extra/hugin/hugin-boost.patch b/source/xapps-extra/hugin/hugin-boost.patch deleted file mode 100644 index 5b82256..0000000 --- a/source/xapps-extra/hugin/hugin-boost.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- hugin-2013.0.0.old/src/tools/ParseExp.cpp 2013-10-27 10:19:02.000000000 +0100 -+++ hugin-2013.0.0/src/tools/ParseExp.cpp 2014-09-12 01:41:15.468973470 +0200 -@@ -50,37 +50,45 @@ - //power function - struct lazy_pow_ - { -- template <typename X, typename Y> -- struct result { typedef X type; }; -+ template<class> struct result; -+ -+ template <typename F, typename X, typename Y> -+ struct result<F(X,Y)> { typedef X& type; }; - - template <typename X, typename Y> -- X operator()(X x, Y y) const -+ X& operator()(X& x, Y y) const - { -- return std::pow(x, y); -+ x= std::pow(x, y); -+ return x; - } - }; - - // modulus for double values - struct lazy_mod_ - { -- template <typename X, typename Y> -- struct result { typedef X type; }; -+ template<class> struct result; -+ -+ template <typename F, typename X, typename Y> -+ struct result<F(X,Y)> { typedef X& type; }; - - template <typename X, typename Y> -- X operator()(X x, Y y) const -+ X& operator()(X& x, Y y) const - { -- return std::fmod(x,y); -+ x= std::fmod(x,y); -+ return x; - } - }; - - // if statement - struct lazy_if_ - { -- template <typename X, typename Y, typename Z> -- struct result { typedef Y type; }; -+ template<class> struct result; - -- template <typename X, typename Y, typename Z> -- X operator()(X x, Y y, Z z) const -+ template <typename F, typename X, typename Y> -+ struct result<F(X,Y,Y)> { typedef Y& type; }; -+ -+ template <typename X, typename Y> -+ Y& operator()(X x, Y& y, Y& z) const - { - return x ? y : z; - } -@@ -89,13 +97,16 @@ - // wrapper for unary function - struct lazy_ufunc_ - { -- template <typename F, typename A1> -- struct result { typedef A1 type; }; -+ template<class> struct result; -+ -+ template<typename F, typename F1, typename A1> -+ struct result<F(F1,A1)> { typedef A1& type; }; - - template <typename F, typename A1> -- A1 operator()(F f, A1 a1) const -+ A1& operator()(F f, A1& a1) const - { -- return f(a1); -+ a1= f(a1); -+ return a1; - } - }; - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
