diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index b57b692e3..e9a861680 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -4,8 +4,8 @@ # - disable sse, sse2 pkgname=lensfun -pkgver=0.3.2 -pkgrel=9 +pkgver=0.3.95 +pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(x86_64) url="https://lensfun.sourceforge.net" @@ -13,23 +13,13 @@ license=('LGPL3') depends=('glib2') makedepends=('python' 'libpng' 'doxygen' 'cmake') optdepends=('python: for lensfun-update-data and lensfun-add-adapter') -source=("https://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz" - lensfun-fix-python-install-dir.patch) -sha256sums=('ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331' - '11e0f9ce2d5c5fef4373ce6adbb19dbcbcd8a10efa02447db9c92b03798d5654') - -prepare() { - cd $pkgname-$pkgver - # Fix python module install path - patch -p1 -i ../lensfun-fix-python-install-dir.patch -} +source=("https://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('82c29c833c1604c48ca3ab8a35e86b7189b8effac1b1476095c0529afb702808') build() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks" \ -DBUILD_FOR_SSE=off \ -DBUILD_FOR_SSE2=off @@ -37,6 +27,6 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/lensfun/lensfun-fix-python-install-dir.patch b/extra/lensfun/lensfun-fix-python-install-dir.patch deleted file mode 100644 index e6713f9bb..000000000 --- a/extra/lensfun/lensfun-fix-python-install-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Sat, 9 Jan 2016 11:47:37 +0100 -Subject: [PATCH] cmake: fix DESTDIR installation for python - -When running `setup.py install`, respect the value of the DESTDIR -environment variable so staged installs (used by distros, for example) -work. ---- - apps/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index 70c77fd..2f6f8f1 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -42,5 +42,5 @@ IF(PYTHON) - IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX) - SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - ENDIF() -- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})") -+ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})") - ENDIF(PYTHON) --- -2.6.4 - -