[arch-commits] Commit in vigra/repos (6 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sat Jan 4 22:08:57 UTC 2014
Date: Saturday, January 4, 2014 @ 23:08:57
Author: andyrtr
Revision: 203176
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
vigra/repos/staging-i686/
vigra/repos/staging-i686/PKGBUILD
(from rev 203175, vigra/trunk/PKGBUILD)
vigra/repos/staging-i686/vigra-1.7.1.gcc460.patch
(from rev 203175, vigra/trunk/vigra-1.7.1.gcc460.patch)
vigra/repos/staging-x86_64/
vigra/repos/staging-x86_64/PKGBUILD
(from rev 203175, vigra/trunk/PKGBUILD)
vigra/repos/staging-x86_64/vigra-1.7.1.gcc460.patch
(from rev 203175, vigra/trunk/vigra-1.7.1.gcc460.patch)
-----------------------------------------+
staging-i686/PKGBUILD | 64 ++++++++++++++++++++++++++++++
staging-i686/vigra-1.7.1.gcc460.patch | 33 +++++++++++++++
staging-x86_64/PKGBUILD | 64 ++++++++++++++++++++++++++++++
staging-x86_64/vigra-1.7.1.gcc460.patch | 33 +++++++++++++++
4 files changed, 194 insertions(+)
Copied: vigra/repos/staging-i686/PKGBUILD (from rev 203175, vigra/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-01-04 22:08:57 UTC (rev 203176)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.10.0
+pkgrel=1
+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' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src-with-docu.tar.gz)
+md5sums=('85e2968e4ee5f9541b5dd8b3fb9cc433')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -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=('python2: 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
+
+ #fix shebang for python2
+ sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config
+}
+
+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.7.1.gcc460.patch (from rev 203175, vigra/trunk/vigra-1.7.1.gcc460.patch)
===================================================================
--- staging-i686/vigra-1.7.1.gcc460.patch (rev 0)
+++ staging-i686/vigra-1.7.1.gcc460.patch 2014-01-04 22:08:57 UTC (rev 203176)
@@ -0,0 +1,33 @@
+diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
+--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <set>
+ #include <list>
+ #include <numeric>
++#include <stddef.h>
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <fstream>
+ #include <cstring>
+ #include <vector>
++#include <stddef.h>
+ #include "vigra/multi_array.hxx"
+
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+
Copied: vigra/repos/staging-x86_64/PKGBUILD (from rev 203175, vigra/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-01-04 22:08:57 UTC (rev 203176)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.10.0
+pkgrel=1
+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' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src-with-docu.tar.gz)
+md5sums=('85e2968e4ee5f9541b5dd8b3fb9cc433')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -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=('python2: 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
+
+ #fix shebang for python2
+ sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config
+}
+
+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.7.1.gcc460.patch (from rev 203175, vigra/trunk/vigra-1.7.1.gcc460.patch)
===================================================================
--- staging-x86_64/vigra-1.7.1.gcc460.patch (rev 0)
+++ staging-x86_64/vigra-1.7.1.gcc460.patch 2014-01-04 22:08:57 UTC (rev 203176)
@@ -0,0 +1,33 @@
+diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
+--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <set>
+ #include <list>
+ #include <numeric>
++#include <stddef.h>
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <fstream>
+ #include <cstring>
+ #include <vector>
++#include <stddef.h>
+ #include "vigra/multi_array.hxx"
+
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+
More information about the arch-commits
mailing list