Date: Sunday, January 11, 2015 @ 02:33:38 Author: bisson Revision: 228914
upstream update Modified: lensfun/trunk/PKGBUILD Deleted: lensfun/trunk/lensfun-0.2.8-make-4.0.patch ------------------------------+ PKGBUILD | 23 ++++++----------------- lensfun-0.2.8-make-4.0.patch | 11 ----------- 2 files changed, 6 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-11 00:41:23 UTC (rev 228913) +++ PKGBUILD 2015-01-11 01:33:38 UTC (rev 228914) @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tp...@archlinux.org> pkgname=lensfun -pkgver=0.2.8 +pkgver=0.3.0 pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64) @@ -9,28 +9,17 @@ url="http://lensfun.sourceforge.net" license=('LGPL3') depends=('glibc' 'glib2') -makedepends=('python2' 'libpng' 'doxygen') -source=("http://sourceforge.net/projects/lensfun/files/0.2.8/${pkgname}-${pkgver}.tar.bz2" - lensfun-0.2.8-make-4.0.patch) +makedepends=('libpng' 'doxygen' 'cmake') +source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('60e2bf3a6a2f495076db1d88778a00d358cf0b69') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure - # fix configure script for make 4.0 - patch -Np0 -i "${srcdir}/lensfun-0.2.8-make-4.0.patch" -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib + cmake -DLENSFUN_INSTALL_PREFIX=/usr . make all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_PREFIX="$pkgdir" install + make DESTDIR="$pkgdir" install } -md5sums=('db2988505e7432c6b331aa597789c639' - '9464d933a5e4ccefed7fc38656a9ec18') Deleted: lensfun-0.2.8-make-4.0.patch =================================================================== --- lensfun-0.2.8-make-4.0.patch 2015-01-11 00:41:23 UTC (rev 228913) +++ lensfun-0.2.8-make-4.0.patch 2015-01-11 01:33:38 UTC (rev 228914) @@ -1,11 +0,0 @@ ---- configure.old 2013-12-06 16:55:09.098654166 +0100 -+++ configure 2013-12-06 16:55:20.298676545 +0100 -@@ -45,7 +45,7 @@ - } - - # Check for tools --tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True) -+tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "4.0", True) - if tibs.check_program ("makedep", "makedep -V", ".*Version.*?([0-9\.]+).*", "0.1.0"): - tibs.add_config_mak ("MAKEDEP", "makedep") - makedep = "yes"