From 7347613261f80bc55835c827fbf2e4dd2fc54ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 27 Apr 2016 02:13:10 -0300 Subject: kipi-plugins-4.14.0-6.parabola1{,.nonprism1}: opencv 3.1 rebuild --- libre/kipi-plugins/PKGBUILD | 2 +- nonprism/kipi-plugins/PKGBUILD | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index 97a24cfde..4575ac639 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 258885 2016-02-04 22:15:38Z arojas $ +# $Id: PKGBUILD 261242 2016-03-09 09:12:23Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 419432d32..5ce3b08be 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 258885 2016-02-04 22:15:38Z arojas $ +# $Id: PKGBUILD 261242 2016-03-09 09:12:23Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -8,9 +8,9 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.14.0 -pkgrel=5.parabola1.nonprism1 +pkgrel=6.parabola1.nonprism1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv7h') license=('GPL') url="http://www.digikam.org/" replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") @@ -18,7 +18,7 @@ conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") makedepends=('kdepimlibs4' 'libkexiv2_4' 'libkdcraw4' 'libkipi4' 'libksane4' 'liblqr' 'opencv' 'boost' 'libgpod' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'imagemagick' 'eigen' - 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface4' 'libkgeomap4' 'libmediawiki' 'clang') + 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface4' 'libkgeomap4' 'libmediawiki') depends=('kdebase-runtime' 'kdepimlibs4' 'libkdcraw4' 'libkipi4' 'libksane4' 'libkexiv2_4') optdepends=('libkgeomap4: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' @@ -36,10 +36,6 @@ sha1sums=('08bbded5433e442dce8ac00eb301606ef0924e8c' prepare() { cd ${srcdir}/${pkgbase}-${pkgver} -# Fix compilation with clang - sed -i '\|fno-tree-pre|d - ' core/CMakeLists.txt - sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d @@ -80,7 +76,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ - -DCMAKE_C_COMPILER=clang # Fix build with flex 2.6 + -DENABLE_OPENCV3=ON make } -- cgit v1.1-4-g5e80