Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ab19e4d82a31e7785fbaae87ca9dc4a6318ec43e
commit ab19e4d82a31e7785fbaae87ca9dc4a6318ec43e Author: Melko <[email protected]> Date: Fri Nov 23 22:50:56 2012 +0100 hugin-2012.0.0-1-i686 * version bump diff --git a/source/xapps-extra/hugin/FrugalBuild b/source/xapps-extra/hugin/FrugalBuild index 0812c7f..d742a1f 100644 --- a/source/xapps-extra/hugin/FrugalBuild +++ b/source/xapps-extra/hugin/FrugalBuild @@ -2,19 +2,17 @@ # Maintainer: Melko <[email protected]> pkgname=hugin -pkgver=2011.4.0 -pkgrel=2 +pkgver=2012.0.0 +pkgrel=1 pkgdesc="A frontend to the panorama-tools." -depends=('libboost>=1.49.0' 'libpano13' 'glew' 'openexr' 'exiv2' 'wxgtk-u8' 'enblend-enfuse') -makedepends=('boost' 'tclap') +depends=('libboost>=1.49.0' 'libpano13' 'glew' 'openexr' 'exiv2' 'wxgtk-u8' 'enblend-enfuse' 'lensfun') +makedepends=('boost' 'tclap' 'swig') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" _F_archive_grepv="beta" _F_cmake_confopts="-DwxWidgets_USE_UNICODE=ON" Finclude sourceforge cmake -source=(${source[@]} hugin-gcc47.patch) -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' \ - '0fb81d739163ede1bd1a4657fded0a30a4964ee4') +sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d') # optimization OK diff --git a/source/xapps-extra/hugin/hugin-gcc47.patch b/source/xapps-extra/hugin/hugin-gcc47.patch deleted file mode 100644 index 8bfb406..0000000 --- a/source/xapps-extra/hugin/hugin-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ -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
