[arch-commits] Commit in hugin/trunk (PKGBUILD)

[Gaetan Bisson]

    Date: Tuesday, January 13, 2015 @ 00:45:16
  Author: bisson
Revision: 228950

fix FS#43424

Modified:
  hugin/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-12 20:06:03 UTC (rev 228949)
+++ PKGBUILD	2015-01-12 23:45:16 UTC (rev 228950)
@@ -6,16 +6,14 @@
 
 pkgname=hugin
 pkgver=2014.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
-optdepends=('python2: bindings and plugins')
-makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
+makedepends=('cmake' 'boost' 'tclap' 'mesa' 'swig')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'python'
          'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
-optdepends=('python2: for scripting and plugin interface support')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver/r/_r}.tar.bz2"
         "http://downloads.sourceforge.net/boost/boost_1_55_0.tar.bz2")
 sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9'
@@ -31,20 +29,18 @@
 	# latter.  This is no proper fix for the problem but it works for now.
 	mkdir -p src/boost
 	cp -r "${srcdir}/boost_1_55_0/boost/spirit" src/boost/
+
+	# Fix compiling against lensfun-0.3.0
+	sed '/LF_DIST_MODEL_FOV1/d' -i src/hugin_base/lensdb/LensDB.cpp
 }
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver/rc?}"
-
-	# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61214#c5
-	# and https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1231921.html.
-	# for why the "-fno-devirtualize" flag is needed.  I can go away with GCC 4.9.2+.
-	CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
-
 	cmake . \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_LAPACK=yes
+		-DENABLE_LAPACK=yes \
+
 	make
 }