From 12dd59e5113cf18294406d7ea1c29f8622135e42 Mon Sep 17 00:00:00 2001 From: abveritas Date: Sun, 25 Nov 2012 23:02:28 +0000 Subject: [PATCH] hugin-tools update, part of glew --- hugin-tools/PKGBUILD | 17 +++++++---------- hugin-tools/gcc47.patch | 11 ----------- 2 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 hugin-tools/gcc47.patch diff --git a/hugin-tools/PKGBUILD b/hugin-tools/PKGBUILD index bd45fea3e..0853585d3 100644 --- a/hugin-tools/PKGBUILD +++ b/hugin-tools/PKGBUILD @@ -5,25 +5,23 @@ pkgname=hugin-tools _pkgname=hugin -pkgver=2011.4.0 +pkgver=2012.0.0 pkgrel=1 pkgdesc="Hugin libs and tools to be used by Kipi-plugins" arch=('x86_64') url="http://hugin.sourceforge.net/" license=('LGPL') -depends=('boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') -makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap') +depends=('boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'libpano13>=2.9.18' + 'lapack' 'desktop-file-utils' 'icu' 'libxt' 'lensfun') +makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap' 'python2' 'swig') conflict=('hugin') provides=('hugin') -source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2" - 'gcc47.patch') -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' - 'b2d377579943fca6abd9d1f5bec621f099cb93b5') +source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2") +md5sums=('6a4fb2585eb3539ba6769cf4557f6e88') build() { cd "${srcdir}" - patch -p1 -i "${srcdir}/gcc47.patch" + mkdir build cd build @@ -32,7 +30,6 @@ build() { mkdir ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT cp ${srcdir}/${_pkgname}-${pkgver}/src/hugin1/PT/*.h ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT - export CXXFLAGS+=" -fpermissive" cmake "${srcdir}/${_pkgname}-${pkgver}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/hugin-tools/gcc47.patch b/hugin-tools/gcc47.patch deleted file mode 100644 index 8e593f459..000000000 --- a/hugin-tools/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur hugin-2011.0.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp ---- a/hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 -+++ b/hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include "Utilities.h" - - using namespace std;