Date: Friday, May 8, 2015 @ 19:03:01 Author: tpowa Revision: 238703 archrelease: copy trunk to extra-i686, extra-x86_64
Added: vigra/repos/extra-i686/PKGBUILD (from rev 238702, vigra/trunk/PKGBUILD) vigra/repos/extra-i686/vigra-1.7.1.gcc460.patch (from rev 238702, vigra/trunk/vigra-1.7.1.gcc460.patch) vigra/repos/extra-x86_64/PKGBUILD (from rev 238702, vigra/trunk/PKGBUILD) vigra/repos/extra-x86_64/vigra-1.7.1.gcc460.patch (from rev 238702, vigra/trunk/vigra-1.7.1.gcc460.patch) Deleted: vigra/repos/extra-i686/PKGBUILD vigra/repos/extra-i686/vigra-1.7.1.gcc460.patch vigra/repos/extra-x86_64/PKGBUILD vigra/repos/extra-x86_64/vigra-1.7.1.gcc460.patch ---------------------------------------+ /PKGBUILD | 128 ++++++++++++++++++++++++++++++++ /vigra-1.7.1.gcc460.patch | 66 ++++++++++++++++ extra-i686/PKGBUILD | 64 ---------------- extra-i686/vigra-1.7.1.gcc460.patch | 33 -------- extra-x86_64/PKGBUILD | 64 ---------------- extra-x86_64/vigra-1.7.1.gcc460.patch | 33 -------- 6 files changed, 194 insertions(+), 194 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-05-08 17:02:52 UTC (rev 238702) +++ extra-i686/PKGBUILD 2015-05-08 17:03:01 UTC (rev 238703) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> - -pkgbase=vigra -pkgname=('vigra' 'vigra-doc') -pkgver=1.10.0 -pkgrel=6 -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/extra-i686/PKGBUILD (from rev 238702, vigra/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-05-08 17:03:01 UTC (rev 238703) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgbase=vigra +pkgname=('vigra' 'vigra-doc') +pkgver=1.10.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' '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 +} Deleted: extra-i686/vigra-1.7.1.gcc460.patch =================================================================== --- extra-i686/vigra-1.7.1.gcc460.patch 2015-05-08 17:02:52 UTC (rev 238702) +++ extra-i686/vigra-1.7.1.gcc460.patch 2015-05-08 17:03:01 UTC (rev 238703) @@ -1,33 +0,0 @@ -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/extra-i686/vigra-1.7.1.gcc460.patch (from rev 238702, vigra/trunk/vigra-1.7.1.gcc460.patch) =================================================================== --- extra-i686/vigra-1.7.1.gcc460.patch (rev 0) +++ extra-i686/vigra-1.7.1.gcc460.patch 2015-05-08 17:03:01 UTC (rev 238703) @@ -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" + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-05-08 17:02:52 UTC (rev 238702) +++ extra-x86_64/PKGBUILD 2015-05-08 17:03:01 UTC (rev 238703) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> - -pkgbase=vigra -pkgname=('vigra' 'vigra-doc') -pkgver=1.10.0 -pkgrel=6 -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/extra-x86_64/PKGBUILD (from rev 238702, vigra/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-05-08 17:03:01 UTC (rev 238703) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgbase=vigra +pkgname=('vigra' 'vigra-doc') +pkgver=1.10.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' '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 +} Deleted: extra-x86_64/vigra-1.7.1.gcc460.patch =================================================================== --- extra-x86_64/vigra-1.7.1.gcc460.patch 2015-05-08 17:02:52 UTC (rev 238702) +++ extra-x86_64/vigra-1.7.1.gcc460.patch 2015-05-08 17:03:01 UTC (rev 238703) @@ -1,33 +0,0 @@ -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/extra-x86_64/vigra-1.7.1.gcc460.patch (from rev 238702, vigra/trunk/vigra-1.7.1.gcc460.patch) =================================================================== --- extra-x86_64/vigra-1.7.1.gcc460.patch (rev 0) +++ extra-x86_64/vigra-1.7.1.gcc460.patch 2015-05-08 17:03:01 UTC (rev 238703) @@ -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" +