Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=1df1b27372bf7876cac67a7eb48b51772a85f009
commit 1df1b27372bf7876cac67a7eb48b51772a85f009 Author: Elentir <[email protected]> Date: Tue May 8 12:50:52 2012 +0200 hugin-2011.4.0-2-x86_64 * rebuild with boost>=1.49.0 diff --git a/source/xapps-extra/hugin/FrugalBuild b/source/xapps-extra/hugin/FrugalBuild index 0efb8a5..0812c7f 100644 --- a/source/xapps-extra/hugin/FrugalBuild +++ b/source/xapps-extra/hugin/FrugalBuild @@ -3,9 +3,9 @@ pkgname=hugin pkgver=2011.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A frontend to the panorama-tools." -depends=('libboost' 'libpano13' 'glew' 'openexr' 'exiv2' 'wxgtk-u8' 'enblend-enfuse') +depends=('libboost>=1.49.0' 'libpano13' 'glew' 'openexr' 'exiv2' 'wxgtk-u8' 'enblend-enfuse') makedepends=('boost' 'tclap') groups=('xapps-extra') archs=('i686' 'x86_64') @@ -13,6 +13,8 @@ _F_sourceforge_ext=".tar.bz2" _F_archive_grepv="beta" _F_cmake_confopts="-DwxWidgets_USE_UNICODE=ON" Finclude sourceforge cmake -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') +source=(${source[@]} hugin-gcc47.patch) +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' \ + '0fb81d739163ede1bd1a4657fded0a30a4964ee4') # optimization OK diff --git a/source/xapps-extra/hugin/hugin-gcc47.patch b/source/xapps-extra/hugin/hugin-gcc47.patch new file mode 100644 index 0000000..8bfb406 --- /dev/null +++ b/source/xapps-extra/hugin/hugin-gcc47.patch @@ -0,0 +1,33 @@ +diff -Naur hugin-2011.4.0/src/celeste/Utilities.h hugin-2011.4.0new/src/celeste/Utilities.h +--- hugin-2011.4.0/src/celeste/Utilities.h 2011-12-02 18:02:36.861022244 +0100 ++++ hugin-2011.4.0new/src/celeste/Utilities.h 2012-05-08 12:40:17.015807604 +0200 +@@ -33,6 +33,8 @@ + #include <stdio.h> + #ifdef _WINDOWS + #include "direct.h" ++#else ++#include <unistd.h> + #endif + + using namespace std; +diff -Naur hugin-2011.4.0/src/foreign/zthread/include/zthread/Guard.h hugin-2011.4.0new/src/foreign/zthread/include/zthread/Guard.h +--- hugin-2011.4.0/src/foreign/zthread/include/zthread/Guard.h 2011-12-02 18:02:37.253022238 +0100 ++++ hugin-2011.4.0new/src/foreign/zthread/include/zthread/Guard.h 2012-05-08 12:41:48.002813284 +0200 +@@ -428,7 +428,7 @@ + template <class U, class V> + Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { + +- LockingPolicy::shareScope(*this, extract(g)); ++ LockingPolicy::shareScope(*this, this->extract(g)); + + } + +@@ -458,7 +458,7 @@ + template <class U, class V> + Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { + +- LockingPolicy::transferScope(*this, extract(g)); ++ LockingPolicy::transferScope(*this, this->extract(g)); + + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
