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

[Andrea Scarpino]

    Date: Friday, February 8, 2013 @ 19:55:13
  Author: andrea
Revision: 177787

Use our lensfun (FS#33767)

Modified:
  digikam/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-08 18:18:03 UTC (rev 177786)
+++ PKGBUILD	2013-02-08 18:55:13 UTC (rev 177787)
@@ -6,34 +6,32 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'mesa')
+             'cmake' 'automoc4' 'doxygen' 'mesa' 'lensfun')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718')
 
 build() {
   mkdir build
   cd build
-  # Use internal lensfun (FS#21816)
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DLENSFUN_LIBRARY="" \
-    -DLENSFUN_INCLUDE_DIR=""
+    -DBUILD_tests=OFF
   make
 }
 
 package_digikam() {
   pkgdesc="Digital photo management application for KDE"
   depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
-           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
+           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun')
   optdepends=('kipi-plugins: for more extras and plugins')
   install=digikam.install
 
@@ -58,7 +56,7 @@
 
 package_libkgeomap() {
   pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
+  depends=('kdelibs' 'kdeedu-marble')
 
   cd build/extra/libkgeomap
   make DESTDIR="${pkgdir}" install
@@ -83,7 +81,7 @@
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
   depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
+           'opencv' 'libkvkontakte' 'libkexiv2')
   optdepends=('libkgeomap'
               'libmediawiki'
               'libgpod'