[arch-commits] Commit in vigra/repos (5 files)

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:57:33 EST 2012


    Date: Sunday, February 5, 2012 @ 06:57:32
  Author: ibiru
Revision: 148953

db-move: moved vigra from [testing] to [extra] (i686)

Added:
  vigra/repos/extra-i686/PKGBUILD
    (from rev 148654, vigra/repos/testing-i686/PKGBUILD)
  vigra/repos/extra-i686/vigra-1.7.1.gcc460.patch
    (from rev 148654, vigra/repos/testing-i686/vigra-1.7.1.gcc460.patch)
Deleted:
  vigra/repos/extra-i686/PKGBUILD
  vigra/repos/extra-i686/vigra-1.7.1.gcc460.patch
  vigra/repos/testing-i686/

--------------------------+
 PKGBUILD                 |  138 ++++++++++++++++++++++-----------------------
 vigra-1.7.1.gcc460.patch |   66 ++++++++++-----------
 2 files changed, 102 insertions(+), 102 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-05 11:57:30 UTC (rev 148952)
+++ extra-i686/PKGBUILD	2012-02-05 11:57:32 UTC (rev 148953)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-
-pkgbase=vigra
-pkgname=('vigra' 'vigra-doc')
-pkgver=1.8.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://hci.iwr.uni-heidelberg.de/vigra/"
-license=('custom:MIT')
-makedepends=(# runtime deps
-             'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
-	     # additional makedeps
-             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
-options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
-	vigra-1.7.1.gcc460.patch)
-md5sums=('15c5544448e529ee60020758ab6be264'
-         '25ef8bc26bc38ee67e5b512d2acd0166')
-sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
-          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-      -DWITH_VIGRANUMPY=1 \
-      -DDOCINSTALL=share/doc 
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make -k check || /bin/true # i686 fails
-}
-
-package_vigra() {
-  pkgdesc="Computer vision library"
-  depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' '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 148654, vigra/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-05 11:57:32 UTC (rev 148953)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.8.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://hci.iwr.uni-heidelberg.de/vigra/"
+license=('custom:MIT')
+makedepends=(# runtime deps
+             'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
+	     # additional makedeps
+             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
+options=('!libtool')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
+	vigra-1.7.1.gcc460.patch)
+md5sums=('15c5544448e529ee60020758ab6be264'
+         '25ef8bc26bc38ee67e5b512d2acd0166')
+sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
+          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+      -DWITH_VIGRANUMPY=1 \
+      -DDOCINSTALL=share/doc 
+  make
+}
+
+check() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make -k check || /bin/true # i686 fails
+}
+
+package_vigra() {
+  pkgdesc="Computer vision library"
+  depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' '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	2012-02-05 11:57:30 UTC (rev 148952)
+++ extra-i686/vigra-1.7.1.gcc460.patch	2012-02-05 11:57:32 UTC (rev 148953)
@@ -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 148654, vigra/repos/testing-i686/vigra-1.7.1.gcc460.patch)
===================================================================
--- extra-i686/vigra-1.7.1.gcc460.patch	                        (rev 0)
+++ extra-i686/vigra-1.7.1.gcc460.patch	2012-02-05 11:57:32 UTC (rev 148953)
@@ -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