[arch-commits] Commit in lensfun/repos (6 files)
Date: Sunday, January 11, 2015 @ 02:34:08
Author: bisson
Revision: 228915
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lensfun/repos/extra-i686/PKGBUILD
(from rev 228914, lensfun/trunk/PKGBUILD)
lensfun/repos/extra-x86_64/PKGBUILD
(from rev 228914, lensfun/trunk/PKGBUILD)
Deleted:
lensfun/repos/extra-i686/PKGBUILD
lensfun/repos/extra-i686/lensfun-0.2.8-make-4.0.patch
lensfun/repos/extra-x86_64/PKGBUILD
lensfun/repos/extra-x86_64/lensfun-0.2.8-make-4.0.patch
---+
/PKGBUILD | 50
extra-i686/PKGBUILD | 36
extra-i686/lensfun-0.2.8-make-4.0.patch | 11 --
extra-x86_64/PKGBUILD | 36
extra-x86_64/lensfun-0.2.8-make-4.0.patch | 11 --
5 files changed, 50 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-01-11 01:33:38 UTC (rev 228914)
+++ extra-i686/PKGBUILD 2015-01-11 01:34:08 UTC (rev 228915)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski
-
-pkgname=lensfun
-pkgver=0.2.8
-pkgrel=1
-pkgdesc="Database of photographic lenses and a library that allows advanced
access to the database"
-arch=(i686 x86_64)
-url="http://lensfun.berlios.de/";
-license=('LGPL3')
-depends=('glibc' 'glib2')
-makedepends=('python2' 'libpng' 'doxygen')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
- lensfun-0.2.8-make-4.0.patch)
-
-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
-make all
-}
-
-package() {
-cd "${srcdir}/${pkgname}-${pkgver}"
-make INSTALL_PREFIX="$pkgdir" install
-}
-md5sums=('db2988505e7432c6b331aa597789c639'
- '9464d933a5e4ccefed7fc38656a9ec18')
Copied: lensfun/repos/extra-i686/PKGBUILD (from rev 228914,
lensfun/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-01-11 01:34:08 UTC (rev 228915)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+
+pkgname=lensfun
+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)
+url="http://lensfun.sourceforge.net";
+license=('LGPL3')
+depends=('glibc' 'glib2')
+makedepends=('libpng' 'doxygen' 'cmake')
+source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.bz2";)
+sha1sums=('60e2bf3a6a2f495076db1d88778a00d358cf0b69')
+
+build() {
+cd "${srcdir}/${pkgname}-${pkgver}"
+cmake -DLENSFUN_INSTALL_PREFIX=/usr .
+make all
+}
+
+package() {
+cd "${srcdir}/${pkgname}-${pkgver}"
+make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/lensfun-0.2.8-make-4.0.patch
===
--- extra-i686/lensfun-0.2.8-make-4.0.patch 2015-01-11 01:33:38 UTC (rev
228914)
+++ extra-i686/lensfun-0.2.8-make-4.0.patch 2015-01-11 01:34:08 UTC (rev
228915)
@@ -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"
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2015-01-11 01:33:38 UTC (rev 228914)
+++ extra-x86_64/PKGBUILD 2015-01-11 01:34:08 UTC (rev 228915)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski
-
-pkgname=lensfun
-pkgver=0.2.8
-pkgrel=1
-pkgdesc="Database of photographic lenses and a library that allows advanced
access to the database"
-arch=(i686 x86_64)
-url="http://lensfun.berlios.de/";
-license=('LGPL3')
-depends=('glibc' 'glib2')
-makedepends=('python2' 'libpng' 'doxygen')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
- lensfun-0.2.8-make-4.0.patch)
-
-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 \
-
[arch-commits] Commit in lensfun/repos (6 files)
Date: Tuesday, January 3, 2017 @ 21:03:48
Author: arojas
Revision: 285262
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
lensfun/repos/testing-i686/
lensfun/repos/testing-i686/PKGBUILD
(from rev 285261, lensfun/trunk/PKGBUILD)
lensfun/repos/testing-i686/lensfun-fix-python-install-dir.patch
(from rev 285261, lensfun/trunk/lensfun-fix-python-install-dir.patch)
lensfun/repos/testing-x86_64/
lensfun/repos/testing-x86_64/PKGBUILD
(from rev 285261, lensfun/trunk/PKGBUILD)
lensfun/repos/testing-x86_64/lensfun-fix-python-install-dir.patch
(from rev 285261, lensfun/trunk/lensfun-fix-python-install-dir.patch)
-+
testing-i686/PKGBUILD | 36 ++
testing-i686/lensfun-fix-python-install-dir.patch | 27 +
testing-x86_64/PKGBUILD | 36 ++
testing-x86_64/lensfun-fix-python-install-dir.patch | 27 +
4 files changed, 126 insertions(+)
Copied: lensfun/repos/testing-i686/PKGBUILD (from rev 285261,
lensfun/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-01-03 21:03:48 UTC (rev 285262)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+
+pkgname=lensfun
+pkgver=0.3.2
+pkgrel=3
+pkgdesc="Database of photographic lenses and a library that allows advanced
access to the database"
+arch=(i686 x86_64)
+url="http://lensfun.sourceforge.net";
+license=('LGPL3')
+depends=('glibc' 'glib2')
+makedepends=('python' 'libpng' 'doxygen' 'cmake')
+source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+lensfun-fix-python-install-dir.patch)
+sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16'
+ '7bf2b17d0fb85800857eaf990541ea9eccca2f77')
+
+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
+make all
+}
+
+package() {
+cd ${pkgname}-${pkgver}
+make DESTDIR="$pkgdir" install
+}
Copied: lensfun/repos/testing-i686/lensfun-fix-python-install-dir.patch (from
rev 285261, lensfun/trunk/lensfun-fix-python-install-dir.patch)
===
--- testing-i686/lensfun-fix-python-install-dir.patch
(rev 0)
+++ testing-i686/lensfun-fix-python-install-dir.patch 2017-01-03 21:03:48 UTC
(rev 285262)
@@ -0,0 +1,27 @@
+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
+
+
Copied: lensfun/repos/testing-x86_64/PKGBUILD (from rev 285261,
lensfun/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-01-03 21:03:48 UTC (rev 285262)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+
+pkgname=lensfun
+pkgver=0.3.2
+pkgrel=3
+pkgdesc="Database of photographic lenses and a library that allows advanced
access to the database"
+arch=(i686 x86_64)
+url="http://lensfun.sourceforge.net";
+license=('LGPL3')
+depends=('glibc' 'glib2')
+makedepends=('python' 'libpng' 'doxygen' 'cmake')
+source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+lensfun-fix-python-install-dir.patch)
+sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16'
+ '7bf2b17d0fb85800857eaf990541ea9eccca2f77')
+
+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
+make all
+}
+
+package() {
