[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-12-12 Thread Felix Yan via arch-commits 
Date: Saturday, December 12, 2020 @ 15:25:08
  Author: felixonmars
Revision: 773302

upgpkg: vigra 1.11.1-30: boost 1.75.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 15:15:53 UTC (rev 773301)
+++ PKGBUILD2020-12-12 15:25:08 UTC (rev 773302)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=29
+pkgrel=30
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-12-06 Thread Felix Yan via arch-commits 
Date: Sunday, December 6, 2020 @ 20:55:00
  Author: felixonmars
Revision: 771161

upgpkg: vigra 1.11.1-29: boost 1.74.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 20:45:01 UTC (rev 771160)
+++ PKGBUILD2020-12-06 20:55:00 UTC (rev 771161)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=28
+pkgrel=29
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-11-12 Thread Evangelos Foutras via arch-commits 
Date: Thursday, November 12, 2020 @ 13:38:48
  Author: foutrelis
Revision: 751812

upgpkg: vigra 1.11.1-28: Python 3.9 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 13:38:15 UTC (rev 751811)
+++ PKGBUILD2020-11-12 13:38:48 UTC (rev 751812)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=27
+pkgrel=28
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-11-10 Thread Felix Yan via arch-commits 
Date: Wednesday, November 11, 2020 @ 05:58:56
  Author: felixonmars
Revision: 749954

upgpkg: vigra 1.11.1-27: Python 3.9 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 05:07:41 UTC (rev 749953)
+++ PKGBUILD2020-11-11 05:58:56 UTC (rev 749954)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=26
+pkgrel=27
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-07-12 Thread Bruno Pagani via arch-commits 
Date: Sunday, July 12, 2020 @ 18:35:03
  Author: archange
Revision: 663347

https://www.archlinux.org/todo/remove-doctrees-from-installed-files-for-reproducible-builds/

+ Linting

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-12 18:12:18 UTC (rev 663346)
+++ PKGBUILD2020-07-12 18:35:03 UTC (rev 663347)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=24
+pkgrel=25
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;
@@ -47,16 +47,16 @@
 
 package_vigra() {
   pkgdesc="Computer vision library"
-  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
+  depends=(libpng libtiff openexr gcc-libs sh hdf5 fftw)
   optdepends=('python: for python bindings'
   'boost-libs: for python bindings')
 
   make -C build DESTDIR="${pkgdir}" install
 
-  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt -t 
"${pkgdir}"/usr/share/licenses/${pkgname}/
   
   # Remove doc
-  rm -rf "${pkgdir}"/usr/share/doc
+  rm -r "${pkgdir}"/usr/share/doc
 }
 
 package_vigra-doc() {
@@ -66,7 +66,9 @@
   make -C build DESTDIR="${pkgdir}" install
 
   # Remove vigra package content
-  rm -rf "${pkgdir}"/usr/{bin,include,lib}
+  rm -r "${pkgdir}"/usr/{bin,include,lib}
+  # Remove doctrees https://github.com/ukoethe/vigra/pull/477
+  rm -r "${pkgdir}"/usr/share/doc/vigranumpy/doctrees/
 
-  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt -t 
"${pkgdir}"/usr/share/licenses/${pkgname}/
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-05-12 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 12, 2020 @ 09:54:14
  Author: arojas
Revision: 626680

openexr 2.5.1 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-12 09:52:43 UTC (rev 626679)
+++ PKGBUILD2020-05-12 09:54:14 UTC (rev 626680)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=23
+pkgrel=24
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-05-09 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 9, 2020 @ 17:11:29
  Author: arojas
Revision: 626022

openexr 2.5 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-09 17:11:22 UTC (rev 626021)
+++ PKGBUILD2020-05-09 17:11:29 UTC (rev 626022)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=22
+pkgrel=23
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-04-24 Thread Bruno Pagani via arch-commits 
Date: Friday, April 24, 2020 @ 16:15:18
  Author: archange
Revision: 619321

hdf5 1.12 rebuild

Temporarily fallback to H110 API to allow building while waiting for an
upstream fix.

Also some PKGBUILD linting.

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   39 ++-
 1 file changed, 18 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-24 15:45:28 UTC (rev 619320)
+++ PKGBUILD2020-04-24 16:15:18 UTC (rev 619321)
@@ -3,26 +3,25 @@
 # Contributor: Lukas Jirkovsky 
 
 pkgbase=vigra
-pkgname=('vigra' 'vigra-doc')
+pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=21
+pkgrel=22
 pkgdesc="Computer vision library"
-arch=('x86_64')
+arch=(x86_64)
 url="https://ukoethe.github.io/vigra/;
-license=('custom:MIT')
+license=(custom:MIT)
 makedepends=(# runtime deps
- 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+ libpng libtiff openexr gcc-libs sh hdf5 fftw
  # additional makedeps
- 'cmake' 'boost' 'python-numpy')
-checkdepends=('python-nose')
+ cmake boost python-numpy)
+checkdepends=(python-nose)
 
source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz;
-'fix-incorrect-template-parameter-type.patch' 'py3.7.diff')
+fix-incorrect-template-parameter-type.patch py3.7.diff)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf'
 'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4'
 '8fcdcce50c377be44387cbd4a001dadf5e03b32483de55c05a359c887e95a05b')
 
 prepare() {
-  mkdir -p build
   cd ${pkgbase}-${pkgver}
   # https://github.com/ukoethe/vigra/issues/414
   patch -Np1 -i ../fix-incorrect-template-parameter-type.patch
@@ -31,19 +30,19 @@
 }
 
 build() {
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake -B build -S ${pkgbase}-${pkgver} \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DPYTHON_EXECUTABLE=/usr/bin/python \
   -DWITH_OPENEXR=true \
   -DWITH_VIGRANUMPY=1 \
-  -DDOCINSTALL=share/doc
-  make
+  -DDOCINSTALL=share/doc \
+  -DCMAKE_C_FLAGS="-DH5_USE_110_API" \
+  -DCMAKE_CXX_FLAGS="-DH5_USE_110_API"
+  make -C build
 }
 
 check() {
-  cd build
-  make -j1 -k check || warning "Tests failed" # 
https://github.com/ukoethe/vigra/issues/409
+  make -C build -j1 -k check || warning "Tests failed" # 
https://github.com/ukoethe/vigra/issues/409
 }
 
 package_vigra() {
@@ -52,10 +51,9 @@
   optdepends=('python: for python bindings'
   'boost-libs: for python bindings')
 
-  cd build
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
   # Remove doc
   rm -rf "${pkgdir}"/usr/share/doc
@@ -65,11 +63,10 @@
   pkgdesc="Computer vision library - documentation and examples"
   #arch=('any') # Not supported for now, maybe later
 
-  cd build
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
   # Remove vigra package content
   rm -rf "${pkgdir}"/usr/{bin,include,lib}
 
-  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2020-01-27 Thread Felix Yan via arch-commits 
Date: Tuesday, January 28, 2020 @ 02:10:33
  Author: felixonmars
Revision: 556946

boost 1.72.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-28 02:09:50 UTC (rev 556945)
+++ PKGBUILD2020-01-28 02:10:33 UTC (rev 556946)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=20
+pkgrel=21
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-11-03 Thread Felix Yan via arch-commits 
Date: Sunday, November 3, 2019 @ 21:44:41
  Author: felixonmars
Revision: 522705

Python 3.8 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-03 21:37:19 UTC (rev 522704)
+++ PKGBUILD2019-11-03 21:44:41 UTC (rev 522705)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=19
+pkgrel=20
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-10-26 Thread Evangelos Foutras via arch-commits 
Date: Saturday, October 26, 2019 @ 06:21:17
  Author: foutrelis
Revision: 520266

Python 3.8 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-26 06:19:54 UTC (rev 520265)
+++ PKGBUILD2019-10-26 06:21:17 UTC (rev 520266)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=18
+pkgrel=19
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-10-19 Thread Antonio Rojas via arch-commits 
Date: Saturday, October 19, 2019 @ 07:28:13
  Author: arojas
Revision: 517372

openexr 2.4 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-19 07:28:12 UTC (rev 517371)
+++ PKGBUILD2019-10-19 07:28:13 UTC (rev 517372)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=17
+pkgrel=18
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-09-13 Thread Felix Yan via arch-commits 
Date: Friday, September 13, 2019 @ 06:19:33
  Author: felixonmars
Revision: 510072

boost 1.71.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 06:10:13 UTC (rev 510071)
+++ PKGBUILD2019-09-13 06:19:33 UTC (rev 510072)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=16
+pkgrel=17
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-03-17 Thread Bruno Pagani via arch-commits 
Date: Sunday, March 17, 2019 @ 13:52:13
  Author: archange
Revision: 442374

upgpkg: vigra 1.11.1-16

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-17 13:44:12 UTC (rev 442373)
+++ PKGBUILD2019-03-17 13:52:13 UTC (rev 442374)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=15
+pkgrel=16
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2019-01-14 Thread Felix Yan via arch-commits 
Date: Tuesday, January 15, 2019 @ 07:37:14
  Author: felixonmars
Revision: 423162

boost 1.69.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 07:27:54 UTC (rev 423161)
+++ PKGBUILD2019-01-15 07:37:14 UTC (rev 423162)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=14
+pkgrel=15
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-10-23 Thread Bruno Pagani via arch-commits 
Date: Tuesday, October 23, 2018 @ 16:32:22
  Author: archange
Revision: 398680

hdf5 1.10.4 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-23 16:24:54 UTC (rev 398679)
+++ PKGBUILD2018-10-23 16:32:22 UTC (rev 398680)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=13
+pkgrel=14
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-09-17 Thread Evangelos Foutras via arch-commits 
Date: Monday, September 17, 2018 @ 23:57:10
  Author: foutrelis
Revision: 382814

boost 1.68.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-17 23:45:38 UTC (rev 382813)
+++ PKGBUILD2018-09-17 23:57:10 UTC (rev 382814)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=12
+pkgrel=13
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-08-24 Thread Bruno Pagani via arch-commits 
Date: Friday, August 24, 2018 @ 14:38:14
  Author: archange
Revision: 373722

hdf5 1.10.3 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-24 13:57:21 UTC (rev 373721)
+++ PKGBUILD2018-08-24 14:38:14 UTC (rev 373722)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-08-19 Thread Bruno Pagani via arch-commits 
Date: Sunday, August 19, 2018 @ 09:57:18
  Author: archange
Revision: 372767

ilmbase/openexr 2.3 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-19 09:53:15 UTC (rev 372766)
+++ PKGBUILD2018-08-19 09:57:18 UTC (rev 372767)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-08-01 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, August 1, 2018 @ 06:52:11
  Author: foutrelis
Revision: 366185

libboost_python37 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-01 06:52:09 UTC (rev 366184)
+++ PKGBUILD2018-08-01 06:52:11 UTC (rev 366185)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD py3.7.diff)

2018-07-29 Thread Jan Steffens via arch-commits 
Date: Sunday, July 29, 2018 @ 16:47:04
  Author: heftig
Revision: 364861

1.11.1-9

Added:
  vigra/trunk/py3.7.diff
Modified:
  vigra/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 py3.7.diff |   19 +++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-29 16:44:59 UTC (rev 364860)
+++ PKGBUILD2018-07-29 16:47:04 UTC (rev 364861)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;
@@ -17,9 +17,10 @@
  'cmake' 'boost' 'python-numpy')
 checkdepends=('python-nose')
 
source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz;
-'fix-incorrect-template-parameter-type.patch')
+'fix-incorrect-template-parameter-type.patch' 'py3.7.diff')
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf'
-'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4')
+'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4'
+'8fcdcce50c377be44387cbd4a001dadf5e03b32483de55c05a359c887e95a05b')
 
 prepare() {
   mkdir -p build
@@ -26,6 +27,8 @@
   cd ${pkgbase}-${pkgver}
   # https://github.com/ukoethe/vigra/issues/414
   patch -Np1 -i ../fix-incorrect-template-parameter-type.patch
+  # python 3.7 compat
+  patch -Np1 -i ../py3.7.diff
 }
 
 build() {

Added: py3.7.diff
===
--- py3.7.diff  (rev 0)
+++ py3.7.diff  2018-07-29 16:47:04 UTC (rev 364861)
@@ -0,0 +1,19 @@
+diff -u -r vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx 
vigra-1.11.1-py3.7/vigranumpy/src/core/vigranumpycore.cxx
+--- vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx2017-05-19 
17:01:08.0 +0200
 vigra-1.11.1-py3.7/vigranumpy/src/core/vigranumpycore.cxx  2018-07-29 
18:29:46.514547076 +0200
+@@ -59,10 +59,14 @@
+   Py_ssize_t size = PyUnicode_GET_DATA_SIZE(s.ptr());
+   const char * data = PyUnicode_AS_DATA(s.ptr());
+   return checksum(data, size);
+-#else
++#elif (PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 7)
+   Py_ssize_t size = 0;
+   char * data = PyUnicode_AsUTF8AndSize(s.ptr(), );
+   return checksum(data, size);
++#else
++  Py_ssize_t size = 0;
++  const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), );
++  return checksum(data, size);
+ #endif
+ }
+

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-06-03 Thread Evangelos Foutras via arch-commits 
Date: Sunday, June 3, 2018 @ 07:18:08
  Author: foutrelis
Revision: 338744

boost 1.67.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-03 07:14:47 UTC (rev 338743)
+++ PKGBUILD2018-06-03 07:18:08 UTC (rev 338744)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-05-30 Thread Felix Yan via arch-commits 
Date: Thursday, May 31, 2018 @ 02:51:39
  Author: felixonmars
Revision: 333940

boost 1.67.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-31 02:51:24 UTC (rev 333939)
+++ PKGBUILD2018-05-31 02:51:39 UTC (rev 333940)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-03-12 Thread Bruno Pagani via arch-commits 
Date: Monday, March 12, 2018 @ 20:41:56
  Author: archange
Revision: 306553

Fix doc installation

Building was not happening, and thus neither installation.
Building is actually failing if you try, so just use upstream build.

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-12 19:29:43 UTC (rev 306552)
+++ PKGBUILD2018-03-12 20:41:56 UTC (rev 306553)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;
@@ -14,7 +14,8 @@
 makedepends=(# runtime deps
  'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
 # additional makedeps
- 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
+ 'cmake' 'boost' 'python-numpy')
+checkdepends=('python-nose')
 
source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz;)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf')
 
@@ -29,7 +30,6 @@
   -DPYTHON_EXECUTABLE=/usr/bin/python \
   -DWITH_OPENEXR=true \
   -DWITH_VIGRANUMPY=1 \
-  -DDOCDIR=../build/doc \
   -DDOCINSTALL=share/doc
   make
 }
@@ -48,7 +48,7 @@
   cd build
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
   # Remove doc
   rm -rf "${pkgdir}"/usr/share/doc
@@ -64,5 +64,5 @@
   # Remove vigra package content
   rm -rf "${pkgdir}"/usr/{bin,include,lib}
 
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2018-02-27 Thread Bruno Pagani via arch-commits 
Date: Tuesday, February 27, 2018 @ 10:09:59
  Author: archange
Revision: 299161

https://www.archlinux.org/todo/ilmbaseopenexr-221-rebuild/

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-27 10:09:57 UTC (rev 299160)
+++ PKGBUILD2018-02-27 10:09:59 UTC (rev 299161)
@@ -6,7 +6,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2017-12-27 Thread Bruno Pagani via arch-commits 
Date: Wednesday, December 27, 2017 @ 15:06:54
  Author: archange
Revision: 276247

Boost 1.66.0 rebuild

Also some PKGBUILD sanitizing

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   45 ++---
 1 file changed, 26 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-27 14:41:50 UTC (rev 276246)
+++ PKGBUILD2017-12-27 15:06:54 UTC (rev 276247)
@@ -1,11 +1,13 @@
 # $Id$
-# Maintainer: AndyRTR 
+# Maintainer: Bruno Pagani 
+# Contributor: AndyRTR 
 # Contributor: Lukas Jirkovsky 
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=3
+pkgrel=4
+pkgdesc="Computer vision library"
 arch=('x86_64')
 url="https://ukoethe.github.io/vigra/;
 license=('custom:MIT')
@@ -13,23 +15,29 @@
  '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)
+source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz;)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf')
 
+prepare() {
+  mkdir -p build
+}
+
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+  -DCMAKE_INSTALL_PREFIX=/usr \
   -DPYTHON_EXECUTABLE=/usr/bin/python \
   -DWITH_OPENEXR=true \
   -DWITH_VIGRANUMPY=1 \
+  -DDOCDIR=../build/doc \
   -DDOCINSTALL=share/doc
   make
 }
 
-#check() {
-#  cd "${srcdir}"/${pkgname}-${pkgver}
-#  make -j1 -k check #|| /bin/true # i686 fails
-#}
+check() {
+  cd build
+  make -j1 -k check || warning "Tests failed" # 
https://github.com/ukoethe/vigra/issues/409
+}
 
 package_vigra() {
   pkgdesc="Computer vision library"
@@ -37,25 +45,24 @@
   optdepends=('python: for python bindings'
   'boost-libs: for python bindings')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd build
   make DESTDIR="${pkgdir}" install
-  # license
-  install -D -m644 LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
-  # remove doc
+  # Remove doc
   rm -rf "${pkgdir}"/usr/share/doc
 }
 
 package_vigra-doc() {
   pkgdesc="Computer vision library - documentation and examples"
-  #depends=('vigra')
-  #arch=('any')
+  #arch=('any') # Not supported for now, maybe later
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd build
   make DESTDIR="${pkgdir}" install
-  # cleanup
+
+  # Remove vigra package content
   rm -rf "${pkgdir}"/usr/{bin,include,lib}
 
-  # license
-  install -D -m644 LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2017-09-11 Thread Bartłomiej Piotrowski 
Date: Monday, September 11, 2017 @ 20:34:40
  Author: bpiotrowski
Revision: 257030

1.11.1-3: rebuild against boost 1.65.1

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-11 20:34:18 UTC (rev 257029)
+++ PKGBUILD2017-09-11 20:34:40 UTC (rev 257030)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://ukoethe.github.io/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2017-06-25 Thread Antonio Rojas 
Date: Sunday, June 25, 2017 @ 10:22:50
  Author: arojas
Revision: 240916

hdf5 1.10.1 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-25 10:03:31 UTC (rev 240915)
+++ PKGBUILD2017-06-25 10:22:50 UTC (rev 240916)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://ukoethe.github.io/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD vigra-1.11.0-const-swap.patch)

2017-05-30 Thread Andreas Radke 
Date: Tuesday, May 30, 2017 @ 18:13:18
  Author: andyrtr
Revision: 296857

upgpkg: vigra 1.11.1-1

upstream update 1.11.1

Modified:
  vigra/trunk/PKGBUILD
Deleted:
  vigra/trunk/vigra-1.11.0-const-swap.patch

---+
 PKGBUILD  |   17 +
 vigra-1.11.0-const-swap.patch |   25 -
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-30 18:04:02 UTC (rev 296856)
+++ PKGBUILD2017-05-30 18:13:18 UTC (rev 296857)
@@ -4,25 +4,18 @@
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.11.0
-pkgrel=7
+pkgver=1.11.1
+pkgrel=1
 arch=('i686' 'x86_64')
-url="http://hci.iwr.uni-heidelberg.de/vigra/;
+url="https://ukoethe.github.io/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')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz)
+sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf')
 
-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 \

Deleted: vigra-1.11.0-const-swap.patch
===
--- vigra-1.11.0-const-swap.patch   2017-05-30 18:04:02 UTC (rev 296856)
+++ vigra-1.11.0-const-swap.patch   2017-05-30 18:13:18 UTC (rev 296857)
@@ -1,25 +0,0 @@
-From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely 
-Date: Fri, 17 Feb 2017 00:55:25 +
-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 )
-+void swap(ImagePyramid )
- {
- images_.swap(other.images_);
- std::swap(lowestLevel_, other.lowestLevel_);

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2017-01-01 Thread Bartłomiej Piotrowski 
Date: Sunday, January 1, 2017 @ 22:40:39
  Author: bpiotrowski
Revision: 285179

upgpkg: vigra 1.11.0-6

rebuild against boost 1.63.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-01 22:34:22 UTC (rev 285178)
+++ PKGBUILD2017-01-01 22:40:39 UTC (rev 285179)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2016-12-25 Thread Bartłomiej Piotrowski 
Date: Sunday, December 25, 2016 @ 18:24:27
  Author: bpiotrowski
Revision: 284763

Python 3.6 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-25 18:11:16 UTC (rev 284762)
+++ PKGBUILD2016-12-25 18:24:27 UTC (rev 284763)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2016-10-07 Thread Bartłomiej Piotrowski 
Date: Friday, October 7, 2016 @ 19:47:41
  Author: bpiotrowski
Revision: 277908

upgpkg: vigra 1.11.0-4

rebuild against boost 1.62.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-07 19:41:56 UTC (rev 277907)
+++ PKGBUILD2016-10-07 19:47:41 UTC (rev 277908)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2016-08-21 Thread Andreas Radke 
Date: Sunday, August 21, 2016 @ 10:45:48
  Author: andyrtr
Revision: 274546

upgpkg: vigra 1.11.0-3

boost 1.61 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-21 09:35:06 UTC (rev 274545)
+++ PKGBUILD2016-08-21 10:45:48 UTC (rev 274546)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2016-04-13 Thread Ronald van Haren 
Date: Wednesday, April 13, 2016 @ 09:58:40
  Author: ronald
Revision: 264813

upgpkg: vigra 1.11.0-2

rebuild against hdf5-1.10.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-13 04:44:53 UTC (rev 264812)
+++ PKGBUILD2016-04-13 07:58:40 UTC (rev 264813)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2016-03-25 Thread Andreas Radke 
Date: Friday, March 25, 2016 @ 14:06:58
  Author: andyrtr
Revision: 262534

upgpkg: vigra 1.11.0-1

upstream update 1.11.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-25 13:04:13 UTC (rev 262533)
+++ PKGBUILD2016-03-25 13:06:58 UTC (rev 262534)
@@ -4,8 +4,8 @@
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.10.0
-pkgrel=11
+pkgver=1.11.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
@@ -12,14 +12,14 @@
 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')
+ 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz)
+md5sums=('7f80d289e03a2f2e8c8e85f3ff29d988')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-  -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+  -DPYTHON_EXECUTABLE=/usr/bin/python \
   -DWITH_OPENEXR=true \
   -DWITH_VIGRANUMPY=1 \
   -DDOCINSTALL=share/doc
@@ -34,7 +34,7 @@
 package_vigra() {
   pkgdesc="Computer vision library"
   depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
-  optdepends=('python2: for python bindings'
+  optdepends=('python: for python bindings'
   'boost-libs: for python bindings')
 
   cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -44,9 +44,6 @@
   
   # 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() {

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-12-21 Thread Evangelos Foutras 
Date: Monday, December 21, 2015 @ 18:09:42
  Author: foutrelis
Revision: 257065

boost 1.60.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-21 13:52:50 UTC (rev 257064)
+++ PKGBUILD2015-12-21 17:09:42 UTC (rev 257065)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=10
+pkgrel=11
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-12-06 Thread Felix Yan 
Date: Monday, December 7, 2015 @ 08:08:33
  Author: fyan
Revision: 253252

C++11 ABI rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 07:06:18 UTC (rev 253251)
+++ PKGBUILD2015-12-07 07:08:33 UTC (rev 253252)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=9
+pkgrel=10
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-10-27 Thread Evangelos Foutras 
Date: Wednesday, October 28, 2015 @ 02:53:14
  Author: foutrelis
Revision: 249823

hdf5 1.8.15 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-28 01:48:34 UTC (rev 249822)
+++ PKGBUILD2015-10-28 01:53:14 UTC (rev 249823)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-10-15 Thread Evangelos Foutras 
Date: Thursday, October 15, 2015 @ 13:24:54
  Author: foutrelis
Revision: 249358

boost 1.59.0 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 11:24:12 UTC (rev 249357)
+++ PKGBUILD2015-10-15 11:24:54 UTC (rev 249358)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-05-08 Thread Tobias Powalowski 
Date: Friday, May 8, 2015 @ 19:02:52
  Author: tpowa
Revision: 238702

upgpkg: vigra 1.10.0-7

rebuild against openxer/ilmbase 2.2.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 16:56:18 UTC (rev 238701)
+++ PKGBUILD2015-05-08 17:02:52 UTC (rev 238702)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2015-04-22 Thread Andreas Radke 
Date: Wednesday, April 22, 2015 @ 20:04:36
  Author: andyrtr
Revision: 237919

upgpkg: vigra 1.10.0-6

boost rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-22 18:02:32 UTC (rev 237918)
+++ PKGBUILD2015-04-22 18:04:36 UTC (rev 237919)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2014-11-24 Thread Felix Yan 
Date: Tuesday, November 25, 2014 @ 05:46:01
  Author: fyan
Revision: 227079

upgpkg: vigra 1.10.0-5

hdf5 1.8.14 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 04:41:45 UTC (rev 227078)
+++ PKGBUILD2014-11-25 04:46:01 UTC (rev 227079)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2014-11-05 Thread Evangelos Foutras 
Date: Thursday, November 6, 2014 @ 05:21:33
  Author: foutrelis
Revision: 225655

upgpkg: vigra 1.10.0-4

boost 1.57.0 rebuild.

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-06 04:13:10 UTC (rev 225654)
+++ PKGBUILD2014-11-06 04:21:33 UTC (rev 225655)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2014-08-11 Thread Bartłomiej Piotrowski 
Date: Monday, August 11, 2014 @ 15:29:01
  Author: bpiotrowski
Revision: 219565

upgpkg: vigra 1.10.0-3

rebuild against boost 1.56.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-11 13:09:24 UTC (rev 219564)
+++ PKGBUILD2014-08-11 13:29:01 UTC (rev 219565)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2014-05-15 Thread Tobias Powalowski 
Date: Thursday, May 15, 2014 @ 14:42:25
  Author: tpowa
Revision: 212805

upgpkg: vigra 1.10.0-2

rebuild against latest openexr

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 12:37:15 UTC (rev 212804)
+++ PKGBUILD2014-05-15 12:42:25 UTC (rev 212805)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2014-01-04 Thread Andreas Radke 
Date: Saturday, January 4, 2014 @ 23:08:41
  Author: andyrtr
Revision: 203175

upgpkg: vigra 1.10.0-1

upstream update 1.10.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-04 21:17:32 UTC (rev 203174)
+++ PKGBUILD2014-01-04 22:08:41 UTC (rev 203175)
@@ -4,8 +4,8 @@
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.9.0
-pkgrel=8
+pkgver=1.10.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
@@ -13,8 +13,8 @@
  'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
 # additional makedeps
  'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 
'python2-numpy')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('b6155afe1ea967917d2be16d98a85404')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src-with-docu.tar.gz)
+md5sums=('85e2968e4ee5f9541b5dd8b3fb9cc433')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -26,10 +26,10 @@
   make
 }
 
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check || /bin/true # i686 fails
-}
+#check() {
+#  cd ${srcdir}/${pkgname}-${pkgver}
+#  make -j1 -k check #|| /bin/true # i686 fails
+#}
 
 package_vigra() {
   pkgdesc=Computer vision library

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-11-24 Thread Andreas Radke 
Date: Sunday, November 24, 2013 @ 11:06:23
  Author: andyrtr
Revision: 200265

upgpkg: vigra 1.9.0-8

boost update rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-24 06:25:00 UTC (rev 200264)
+++ PKGBUILD2013-11-24 10:06:23 UTC (rev 200265)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-10-26 Thread Andreas Radke 
Date: Saturday, October 26, 2013 @ 14:19:02
  Author: andyrtr
Revision: 197515

upgpkg: vigra 1.9.0-7

drop versioned dep; FS#35146

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 10:45:41 UTC (rev 197514)
+++ PKGBUILD2013-10-26 12:19:02 UTC (rev 197515)
@@ -5,15 +5,14 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=6
+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=1.8.11' 'fftw'
-# additional makedeps
+ 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+# additional makedeps
  'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 
'python2-numpy')
-options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
 md5sums=('b6155afe1ea967917d2be16d98a85404')
 
@@ -34,7 +33,7 @@
 
 package_vigra() {
   pkgdesc=Computer vision library
-  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5=1.8.11' 'fftw')
+  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
   optdepends=('python2: for python bindings'
   'boost-libs: for python bindings')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-09-13 Thread Andreas Radke 
Date: Friday, September 13, 2013 @ 08:55:02
  Author: andyrtr
Revision: 194283

upgpkg: vigra 1.9.0-6

hdf5 - 1.8.11 .so bump rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-13 04:26:54 UTC (rev 194282)
+++ PKGBUILD2013-09-13 06:55:02 UTC (rev 194283)
@@ -5,14 +5,14 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=5
+pkgrel=6
 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' 'openexr' 'gcc-libs' 'sh' 
'hdf5=1.8.7' 'fftw'
+ 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5=1.8.11' 'fftw'
 # additional makedeps
- 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost=1.54.0' 
'python2-numpy')
+ 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 
'python2-numpy')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
 md5sums=('b6155afe1ea967917d2be16d98a85404')
@@ -34,7 +34,7 @@
 
 package_vigra() {
   pkgdesc=Computer vision library
-  depends=('libpng=1.5.7' 'libtiff=4.0.0' 'openexr' 'gcc-libs' 'sh' 
'hdf5=1.8.7' 'fftw')
+  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5=1.8.11' 'fftw')
   optdepends=('python2: for python bindings'
   'boost-libs: for python bindings')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-07-27 Thread Andreas Radke 
Date: Saturday, July 27, 2013 @ 10:12:00
  Author: andyrtr
Revision: 191604

upgpkg: vigra 1.9.0-5

add exr support; FS#36166

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-27 06:22:56 UTC (rev 191603)
+++ PKGBUILD2013-07-27 08:12:00 UTC (rev 191604)
@@ -5,12 +5,12 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=4
+pkgrel=5
 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'
+ 'libpng=1.5.7' 'libtiff=4.0.0' 'openexr' 'gcc-libs' 'sh' 
'hdf5=1.8.7' 'fftw'
 # additional makedeps
  'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost=1.54.0' 
'python2-numpy')
 options=('!libtool')
@@ -21,6 +21,7 @@
   cd ${srcdir}/${pkgbase}-${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
   -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+  -DWITH_OPENEXR=true \
   -DWITH_VIGRANUMPY=1 \
   -DDOCINSTALL=share/doc
   make
@@ -33,7 +34,7 @@
 
 package_vigra() {
   pkgdesc=Computer vision library
-  depends=('libpng=1.5.7' 'libtiff=4.0.0' 'gcc-libs' 'sh' 'hdf5=1.8.7' 
'fftw')
+  depends=('libpng=1.5.7' 'libtiff=4.0.0' 'openexr' 'gcc-libs' 'sh' 
'hdf5=1.8.7' 'fftw')
   optdepends=('python2: for python bindings'
   'boost-libs: for python bindings')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-07-19 Thread Andreas Radke 
Date: Friday, July 19, 2013 @ 17:01:13
  Author: andyrtr
Revision: 191193

upgpkg: vigra 1.9.0-4

boost rebuild; FS#36196

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-19 14:13:15 UTC (rev 191192)
+++ PKGBUILD2013-07-19 15:01:13 UTC (rev 191193)
@@ -5,14 +5,14 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=3
+pkgrel=4
 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' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 
'python2-numpy')
+ 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost=1.54.0' 
'python2-numpy')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
 md5sums=('b6155afe1ea967917d2be16d98a85404')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-04-29 Thread Evangelos Foutras 
Date: Monday, April 29, 2013 @ 13:09:34
  Author: foutrelis
Revision: 183886

upgpkg: vigra 1.9.0-3

libpng 1.6 rebuild.

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 10:55:36 UTC (rev 183885)
+++ PKGBUILD2013-04-29 11:09:34 UTC (rev 183886)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
@@ -22,7 +22,7 @@
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
   -DPYTHON_EXECUTABLE=/usr/bin/python2 \
   -DWITH_VIGRANUMPY=1 \
-  -DDOCINSTALL=share/doc 
+  -DDOCINSTALL=share/doc
   make
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-03-25 Thread Andreas Radke 
Date: Monday, March 25, 2013 @ 16:43:06
  Author: andyrtr
Revision: 180670

upgpkg: vigra 1.9.0-2

boost rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-25 15:37:25 UTC (rev 180669)
+++ PKGBUILD2013-03-25 15:43:06 UTC (rev 180670)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2013-03-23 Thread Andreas Radke 
Date: Saturday, March 23, 2013 @ 10:36:44
  Author: andyrtr
Revision: 180556

upgpkg: vigra 1.9.0-1

upstream update 1.9.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-23 07:24:01 UTC (rev 180555)
+++ PKGBUILD2013-03-23 09:36:44 UTC (rev 180556)
@@ -4,26 +4,21 @@
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.8.0
-pkgrel=3
+pkgver=1.9.0
+pkgrel=1
 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')
+ 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 
'python2-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=('15c558e529ee60020758ab6be264'
- '25ef8bc26bc38ee67e5b512d2acd0166')
-sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
-  '1de6381a74dd136ea25df5a27f249187b0dbd17e')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('b6155afe1ea967917d2be16d98a85404')
 
 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 \

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2012-01-20 Thread andyrtr 
Date: Friday, January 20, 2012 @ 08:57:07
  Author: andyrtr
Revision: 147001

upgpkg: vigra 1.8.0-3

libtiff/libpng rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 13:40:09 UTC (rev 147000)
+++ PKGBUILD2012-01-20 13:57:07 UTC (rev 147001)
@@ -5,12 +5,12 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 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'
+ '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')
@@ -38,7 +38,7 @@
 
 package_vigra() {
   pkgdesc=Computer vision library
-  depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5=1.8.7' 'fftw')
+  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')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-12-08 Thread andyrtr 
Date: Thursday, December 8, 2011 @ 15:53:45
  Author: andyrtr
Revision: 144875

upgpkg: vigra 1.8.0-2

fix build, FS#27399; fix python shebang FS#26766

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-08 20:46:41 UTC (rev 144874)
+++ PKGBUILD2011-12-08 20:53:45 UTC (rev 144875)
@@ -5,7 +5,7 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
@@ -25,6 +25,7 @@
   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
@@ -48,6 +49,9 @@
   
   # 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() {

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-09-25 Thread andyrtr 
Date: Sunday, September 25, 2011 @ 05:56:52
  Author: andyrtr
Revision: 138492

upgpkg: vigra 1.8.0-1

upstream update 1.8.0; split doc out, add check function

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   50 +++---
 1 file changed, 39 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-25 07:50:18 UTC (rev 138491)
+++ PKGBUILD2011-09-25 09:56:52 UTC (rev 138492)
@@ -2,25 +2,27 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 # Contributor: Lukas Jirkovsky l.jirkov...@gmail.com
 
-pkgname=vigra
-pkgver=1.7.1
-pkgrel=3
-pkgdesc=Computer vision library
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
-depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5=1.8.7' 'fftw')
-makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
-optdepends=('python2: for python bindings'
-'boost-libs: for python bindings')
+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=('2bde208e0fd7626770169dd4fa097282'
+md5sums=('15c558e529ee60020758ab6be264'
  '25ef8bc26bc38ee67e5b512d2acd0166')
+sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
+  '1de6381a74dd136ea25df5a27f249187b0dbd17e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
   patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
   -DWITH_VIGRANUMPY=1 \
@@ -28,9 +30,35 @@
   make
 }
 
-package() {
+check() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+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
 }
+
+package_vigra-doc() {
+  pkgdesc=Computer vision library - documentation and examples
+  #depends=('vigra')
+
+  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
+}

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-09-25 Thread andyrtr 
Date: Sunday, September 25, 2011 @ 06:06:21
  Author: andyrtr
Revision: 138493

upgpkg: vigra 1.8.0-1

upstream update 1.8.0; split doc out, add check function

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-25 09:56:52 UTC (rev 138492)
+++ PKGBUILD2011-09-25 10:06:21 UTC (rev 138493)
@@ -32,7 +32,7 @@
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  make -k check || /bin/true # i686 fails
 }
 
 package_vigra() {
@@ -53,6 +53,7 @@
 package_vigra-doc() {
   pkgdesc=Computer vision library - documentation and examples
   #depends=('vigra')
+  #arch=('any')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-07-09 Thread andyrtr 
Date: Saturday, July 9, 2011 @ 16:09:27
  Author: andyrtr
Revision: 131034

upgpkg: vigra 1.7.1-3
safety rebuild for hdf5 .so bump

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-09 18:43:43 UTC (rev 131033)
+++ PKGBUILD2011-07-09 20:09:27 UTC (rev 131034)
@@ -4,12 +4,12 @@
 
 pkgname=vigra
 pkgver=1.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
-depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
+depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5=1.8.7' 'fftw')
 makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
 optdepends=('python2: for python bindings'
 'boost-libs: for python bindings')

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-05-25 Thread Ionut Biru 
Date: Wednesday, May 25, 2011 @ 12:14:08
  Author: ibiru
Revision: 124991

upgpkg: vigra 1.7.1-2
boost 1.46.1 rebuild

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-25 16:08:19 UTC (rev 124990)
+++ PKGBUILD2011-05-25 16:14:08 UTC (rev 124991)
@@ -4,7 +4,7 @@
 
 pkgname=vigra
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2011-03-03 Thread Eric Bélanger 
Date: Thursday, March 3, 2011 @ 22:09:16
  Author: eric
Revision: 112123

upgpkg: vigra 1.7.0-6
Rebuild against boost 1.46, Corrected optdepends

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-04 01:23:04 UTC (rev 112122)
+++ PKGBUILD2011-03-04 03:09:16 UTC (rev 112123)
@@ -4,19 +4,19 @@
 
 pkgname=vigra
 pkgver=1.7.0
-pkgrel=5
+pkgrel=6
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
 makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
-optdepends=('python2:  for python bindings'
-'boost:for python bindings')
+optdepends=('python2: for python bindings'
+'boost-libs: for python bindings')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
-md5sums=('a40b3b013653f75dc84ba55b2df1fae2'
- 'db610e48558eb323490ad21d636bac76')
+md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76')
+sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' 
'5f668c861f5fe927a4f51014afab94805db60c46')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
@@ -29,7 +29,7 @@
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
-  make DESTDIR=$pkgdir install
+  make DESTDIR=${pkgdir} install
   # license
   install -D -m644 LICENSE.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2010-11-23 Thread Ionut Biru 
Date: Tuesday, November 23, 2010 @ 13:05:50
  Author: ibiru
Revision: 100489

upgpkg: vigra 1.7.0-5
boost 1.45

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-23 18:02:51 UTC (rev 100488)
+++ PKGBUILD2010-11-23 18:05:50 UTC (rev 100489)
@@ -4,15 +4,15 @@
 
 pkgname=vigra
 pkgver=1.7.0
-pkgrel=4
+pkgrel=5
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
 makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
-optdepends=('python2:  for python bindings'
-   'boost: for python bindings')
+optdepends=('python2:  for python bindings'
+'boost:for python bindings')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
 md5sums=('a40b3b013653f75dc84ba55b2df1fae2'
@@ -22,8 +22,8 @@
   cd ${srcdir}/${pkgname}-${pkgver}-src
   patch -p1  ../libpng-1.4.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-   -DWITH_VIGRANUMPY=1 \
-   -DDOCINSTALL=share/doc 
+  -DWITH_VIGRANUMPY=1 \
+  -DDOCINSTALL=share/doc 
   make
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2010-09-23 Thread Rémy Oudompheng 
Date: Thursday, September 23, 2010 @ 07:53:41
  Author: remy
Revision: 91147

upgpkg: vigra 1.7.0-4
Add missing makedepend python-numpy. Rebuild for python2.7

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-23 11:48:30 UTC (rev 91146)
+++ PKGBUILD2010-09-23 11:53:41 UTC (rev 91147)
@@ -4,32 +4,32 @@
 
 pkgname=vigra
 pkgver=1.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
-makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost')
-optdepends=('python:   for python bindings'
+makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 
'python-numpy')
+optdepends=('python2:  for python bindings'
'boost: for python bindings')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
-md5sums=('a8e5326433ee7bf77f6daa3dd00d6c61'
+md5sums=('a40b3b013653f75dc84ba55b2df1fae2'
  'db610e48558eb323490ad21d636bac76')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
-  patch -p1  ../libpng-1.4.patch || return 1
+  patch -p1  ../libpng-1.4.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_VIGRANUMPY=1 \
-DDOCINSTALL=share/doc 
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR=$pkgdir install
   # license
   install -D -m644 LICENSE.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2010-06-20 Thread andyrtr 
Date: Sunday, June 20, 2010 @ 07:34:23
  Author: andyrtr
Revision: 82987

upgpkg: vigra 1.7.0-3
namcap failure. main boost pkg has the python bindings

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-20 08:21:23 UTC (rev 82986)
+++ PKGBUILD2010-06-20 11:34:23 UTC (rev 82987)
@@ -4,7 +4,7 @@
 
 pkgname=vigra
 pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
@@ -12,7 +12,7 @@
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
 makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost')
 optdepends=('python:   for python bindings'
-   'boost-libs:for python bindings')
+   'boost: for python bindings')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
 md5sums=('a8e5326433ee7bf77f6daa3dd00d6c61'

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2010-06-19 Thread andyrtr 
Date: Saturday, June 19, 2010 @ 14:52:45
  Author: andyrtr
Revision: 82942

upgpkg: vigra 1.7.0-2
rebuild for boost/-libs split'n update

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-19 16:48:29 UTC (rev 82941)
+++ PKGBUILD2010-06-19 18:52:45 UTC (rev 82942)
@@ -4,7 +4,7 @@
 
 pkgname=vigra
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://hci.iwr.uni-heidelberg.de/vigra/;
@@ -12,7 +12,7 @@
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
 makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost')
 optdepends=('python:   for python bindings'
-   'boost: for python bindings')
+   'boost-libs:for python bindings')
 options=('!libtool')
 
source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
 md5sums=('a8e5326433ee7bf77f6daa3dd00d6c61'

[arch-commits] Commit in vigra/trunk (PKGBUILD)

2010-04-17 Thread andyrtr 
Date: Saturday, April 17, 2010 @ 16:20:36
  Author: andyrtr
Revision: 77782

upgpkg: vigra 1.7.0-1
new version 1.7.0

Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   33 -
 1 file changed, 20 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-17 19:03:17 UTC (rev 77781)
+++ PKGBUILD2010-04-17 20:20:36 UTC (rev 77782)
@@ -3,26 +3,33 @@
 # Contributor: Lukas Jirkovsky l.jirkov...@gmail.com
 
 pkgname=vigra
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
-url=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/;
+url=http://hci.iwr.uni-heidelberg.de/vigra/;
 license=('custom:MIT')
-depends=('libpng' 'libtiff' 'gcc-libs' 'sh')
+depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw')
+makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost')
+optdepends=('python:   for python bindings'
+   'boost: for python bindings')
 options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}${pkgver}.tar.gz
 libpng-1.4.patch)
-md5sums=('d62650a6f908e85643e557a236ea989c' 'db610e48558eb323490ad21d636bac76')
-sha1sums=('9714a0c4efb77726a1140329e98e5db057f9a69f' 
'5f668c861f5fe927a4f51014afab94805db60c46') # - offline?
-#  
http://ftp.de.debian.org/debian/pool/main/libv/libvigraimpex/libvigraimpex_1.6.0+dfsg.orig.tar.gz)
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 libpng-1.4.patch)
+md5sums=('a8e5326433ee7bf77f6daa3dd00d6c61'
+ 'db610e48558eb323490ad21d636bac76')
 
 build() {
-  cd ${srcdir}/${pkgname}${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}-src
   patch -p1  ../libpng-1.4.patch || return 1
-  ./configure --prefix=/usr --disable-static
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+   -DWITH_VIGRANUMPY=1 \
+   -DDOCINSTALL=share/doc 
   make || return 1
-  make prefix=$pkgdir/usr install-exec || return 1
-  make prefix=$pkgdir/usr install-includes || return 1
-  make prefix=$pkgdir/usr/share install-docs || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}-src
+  make DESTDIR=$pkgdir install || return 1
+  # license
   install -D -m644 LICENSE.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in vigra/trunk (PKGBUILD libpng-1.4.patch)

2010-01-20 Thread Eric Bélanger 
Date: Wednesday, January 20, 2010 @ 20:09:11
  Author: eric
Revision: 64521

upgpkg: vigra 1.6.0-2
Rebuilt for libpng 1.4 and libjpeg 8

Added:
  vigra/trunk/libpng-1.4.patch
Modified:
  vigra/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 libpng-1.4.patch |   14 ++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-21 00:54:57 UTC (rev 64520)
+++ PKGBUILD2010-01-21 01:09:11 UTC (rev 64521)
@@ -4,19 +4,21 @@
 
 pkgname=vigra
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Computer vision library
 arch=('i686' 'x86_64')
 url=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/;
 license=('custom:MIT')
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh')
 options=('!libtool')
-source=(#http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}${pkgver}.tar.gz
 - offline?
-   
http://ftp.de.debian.org/debian/pool/main/libv/libvigraimpex/libvigraimpex_1.6.0.orig.tar.gz)
-md5sums=('d62650a6f908e85643e557a236ea989c')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}${pkgver}.tar.gz
 libpng-1.4.patch)
+md5sums=('d62650a6f908e85643e557a236ea989c' 'db610e48558eb323490ad21d636bac76')
+sha1sums=('9714a0c4efb77726a1140329e98e5db057f9a69f' 
'5f668c861f5fe927a4f51014afab94805db60c46') # - offline?
+#  
http://ftp.de.debian.org/debian/pool/main/libv/libvigraimpex/libvigraimpex_1.6.0+dfsg.orig.tar.gz)
 
 build() {
   cd ${srcdir}/${pkgname}${pkgver}
+  patch -p1  ../libpng-1.4.patch || return 1
   ./configure --prefix=/usr --disable-static
   make || return 1
   make prefix=$pkgdir/usr install-exec || return 1

Added: libpng-1.4.patch
===
--- libpng-1.4.patch(rev 0)
+++ libpng-1.4.patch2010-01-21 01:09:11 UTC (rev 64521)
@@ -0,0 +1,14 @@
+diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
+--- vigra1.6.0-orig/src/impex/png.cxx  2010-01-20 19:46:57.0 -0500
 vigra1.6.0/src/impex/png.cxx   2010-01-20 19:47:55.0 -0500
+@@ -270,8 +270,8 @@
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY  bit_depth  8 ) {
+ if (setjmp(png-jmpbuf))
+-vigra_postcondition( false,png_error_message.insert(0, error 
in png_set_gray_1_2_4_to_8(): ).c_str());
+-png_set_gray_1_2_4_to_8(png);
++vigra_postcondition( false,png_error_message.insert(0, error 
in png_set_expand_gray_1_2_4_to_8(): ).c_str());
++png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+