[arch-commits] Commit in vigra/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Fri May 19 06:10:21 UTC 2017
Date: Friday, May 19, 2017 @ 06:10:21
Author: bpiotrowski
Revision: 296264
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
vigra/repos/staging-i686/
vigra/repos/staging-i686/PKGBUILD
(from rev 296263, vigra/trunk/PKGBUILD)
vigra/repos/staging-i686/vigra-1.11.0-const-swap.patch
(from rev 296263, vigra/trunk/vigra-1.11.0-const-swap.patch)
vigra/repos/staging-x86_64/
vigra/repos/staging-x86_64/PKGBUILD
(from rev 296263, vigra/trunk/PKGBUILD)
vigra/repos/staging-x86_64/vigra-1.11.0-const-swap.patch
(from rev 296263, vigra/trunk/vigra-1.11.0-const-swap.patch)
----------------------------------------------+
staging-i686/PKGBUILD | 68 +++++++++++++++++++++++++
staging-i686/vigra-1.11.0-const-swap.patch | 25 +++++++++
staging-x86_64/PKGBUILD | 68 +++++++++++++++++++++++++
staging-x86_64/vigra-1.11.0-const-swap.patch | 25 +++++++++
4 files changed, 186 insertions(+)
Copied: vigra/repos/staging-i686/PKGBUILD (from rev 296263, vigra/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-05-19 06:10:21 UTC (rev 296264)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.11.0
+pkgrel=7
+arch=('i686' 'x86_64')
+url="http://hci.iwr.uni-heidelberg.de/vigra/"
+license=('custom:MIT')
+makedepends=(# runtime deps
+ 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+ # additional makedeps
+ 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz
+ vigra-1.11.0-const-swap.patch)
+md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988'
+ 'a571f3a8d4cd66c8a8071ca958091f7b')
+
+prepare() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/vigra-1.11.0-const-swap.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
+ -DWITH_OPENEXR=true \
+ -DWITH_VIGRANUMPY=1 \
+ -DDOCINSTALL=share/doc
+ make
+}
+
+#check() {
+# cd "${srcdir}"/${pkgname}-${pkgver}
+# make -j1 -k check #|| /bin/true # i686 fails
+#}
+
+package_vigra() {
+ pkgdesc="Computer vision library"
+ depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
+ optdepends=('python: for python bindings'
+ 'boost-libs: for python bindings')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # license
+ install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove doc
+ rm -rf "${pkgdir}"/usr/share/doc
+}
+
+package_vigra-doc() {
+ pkgdesc="Computer vision library - documentation and examples"
+ #depends=('vigra')
+ #arch=('any')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # cleanup
+ rm -rf "${pkgdir}"/usr/{bin,include,lib}
+
+ # license
+ install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: vigra/repos/staging-i686/vigra-1.11.0-const-swap.patch (from rev 296263, vigra/trunk/vigra-1.11.0-const-swap.patch)
===================================================================
--- staging-i686/vigra-1.11.0-const-swap.patch (rev 0)
+++ staging-i686/vigra-1.11.0-const-swap.patch 2017-05-19 06:10:21 UTC (rev 296264)
@@ -0,0 +1,25 @@
+From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely at redhat.com>
+Date: Fri, 17 Feb 2017 00:55:25 +0000
+Subject: [PATCH] Fix parameter of ImagePyramid::swap
+
+You can't swap with a const object. This fixes a compilation failure
+with GCC 7 which rejects the incorrect function even if it isn't
+instantiated.
+---
+ include/vigra/imagecontainer.hxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx
+index a6f0f80..636cc64 100644
+--- a/include/vigra/imagecontainer.hxx
++++ b/include/vigra/imagecontainer.hxx
+@@ -763,7 +763,7 @@ public:
+ /** swap contents of this array with the contents of other
+ (STL-Container interface)
+ */
+- void swap(const ImagePyramid<ImageType, Alloc> &other)
++ void swap(ImagePyramid<ImageType, Alloc> &other)
+ {
+ images_.swap(other.images_);
+ std::swap(lowestLevel_, other.lowestLevel_);
Copied: vigra/repos/staging-x86_64/PKGBUILD (from rev 296263, vigra/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-05-19 06:10:21 UTC (rev 296264)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.11.0
+pkgrel=7
+arch=('i686' 'x86_64')
+url="http://hci.iwr.uni-heidelberg.de/vigra/"
+license=('custom:MIT')
+makedepends=(# runtime deps
+ 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+ # additional makedeps
+ 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz
+ vigra-1.11.0-const-swap.patch)
+md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988'
+ 'a571f3a8d4cd66c8a8071ca958091f7b')
+
+prepare() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/vigra-1.11.0-const-swap.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
+ -DWITH_OPENEXR=true \
+ -DWITH_VIGRANUMPY=1 \
+ -DDOCINSTALL=share/doc
+ make
+}
+
+#check() {
+# cd "${srcdir}"/${pkgname}-${pkgver}
+# make -j1 -k check #|| /bin/true # i686 fails
+#}
+
+package_vigra() {
+ pkgdesc="Computer vision library"
+ depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
+ optdepends=('python: for python bindings'
+ 'boost-libs: for python bindings')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # license
+ install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove doc
+ rm -rf "${pkgdir}"/usr/share/doc
+}
+
+package_vigra-doc() {
+ pkgdesc="Computer vision library - documentation and examples"
+ #depends=('vigra')
+ #arch=('any')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # cleanup
+ rm -rf "${pkgdir}"/usr/{bin,include,lib}
+
+ # license
+ install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: vigra/repos/staging-x86_64/vigra-1.11.0-const-swap.patch (from rev 296263, vigra/trunk/vigra-1.11.0-const-swap.patch)
===================================================================
--- staging-x86_64/vigra-1.11.0-const-swap.patch (rev 0)
+++ staging-x86_64/vigra-1.11.0-const-swap.patch 2017-05-19 06:10:21 UTC (rev 296264)
@@ -0,0 +1,25 @@
+From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely at redhat.com>
+Date: Fri, 17 Feb 2017 00:55:25 +0000
+Subject: [PATCH] Fix parameter of ImagePyramid::swap
+
+You can't swap with a const object. This fixes a compilation failure
+with GCC 7 which rejects the incorrect function even if it isn't
+instantiated.
+---
+ include/vigra/imagecontainer.hxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx
+index a6f0f80..636cc64 100644
+--- a/include/vigra/imagecontainer.hxx
++++ b/include/vigra/imagecontainer.hxx
+@@ -763,7 +763,7 @@ public:
+ /** swap contents of this array with the contents of other
+ (STL-Container interface)
+ */
+- void swap(const ImagePyramid<ImageType, Alloc> &other)
++ void swap(ImagePyramid<ImageType, Alloc> &other)
+ {
+ images_.swap(other.images_);
+ std::swap(lowestLevel_, other.lowestLevel_);
More information about the arch-commits
mailing list