[arch-commits] Commit in lensfun/repos (3 files)

[Felix Yan]

    Date: Sunday, July 8, 2018 @ 07:39:09
  Author: felixonmars
Revision: 328052

archrelease: copy trunk to staging-x86_64

Added:
  lensfun/repos/staging-x86_64/
  lensfun/repos/staging-x86_64/PKGBUILD
    (from rev 328051, lensfun/trunk/PKGBUILD)
  lensfun/repos/staging-x86_64/lensfun-fix-python-install-dir.patch
    (from rev 328051, lensfun/trunk/lensfun-fix-python-install-dir.patch)

--------------------------------------+
 PKGBUILD                             |   38 +++++++++++++++++++++++++++++++++
 lensfun-fix-python-install-dir.patch |   27 +++++++++++++++++++++++
 2 files changed, 65 insertions(+)

Copied: lensfun/repos/staging-x86_64/PKGBUILD (from rev 328051, lensfun/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-07-08 07:39:09 UTC (rev 328052)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=lensfun
+pkgver=0.3.2
+pkgrel=7
+pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
+arch=(x86_64)
+url="https://lensfun.sourceforge.net"
+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
+}
+
+build() {
+    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"
+    make all
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="$pkgdir" install
+}

Copied: lensfun/repos/staging-x86_64/lensfun-fix-python-install-dir.patch (from rev 328051, lensfun/trunk/lensfun-fix-python-install-dir.patch)
===================================================================
--- staging-x86_64/lensfun-fix-python-install-dir.patch	                        (rev 0)
+++ staging-x86_64/lensfun-fix-python-install-dir.patch	2018-07-08 07:39:09 UTC (rev 328052)
@@ -0,0 +1,27 @@
+From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+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
+
+