Wed May 18 22:46:11 UTC 2011

4 files changed, 75 insertions, 5 deletions

diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD
index a8bfa9018..28d94a296 100644
--- a/testing/acpid/PKGBUILD
+++ b/testing/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123979 2011-05-15 11:10:08Z andrea $
+# $Id: PKGBUILD 124204 2011-05-17 17:28:41Z andrea $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64')
 url="http://tedfelix.com/linux/acpid-netlink.html"
@@ -17,6 +17,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
         'anything'
         'handler.sh'
         'acpid.conf.d')
+replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 
 build() {
diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD
index d59222745..9f2ddcd51 100644
--- a/testing/archboot/PKGBUILD
+++ b/testing/archboot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124008 2011-05-15 21:19:33Z tpowa $
+# $Id: PKGBUILD 124155 2011-05-17 06:46:14Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=archboot
 pkgver=2011.05
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced, modular arch boot/install image creation utility"
 arch=(i686 x86_64)
 license=('GPL')
@@ -45,5 +45,5 @@ build()
   gcc -o vmware-detect vmware-detect.c
   install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-md5sums=('5ea2090ddc56a6b4716961f53584328a'
+md5sums=('e6d26e24c7491a3203421bd14e570c04'
          '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD
new file mode 100644
index 000000000..400bd5898
--- /dev/null
+++ b/testing/vigra/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 124225 2011-05-17 18:01:10Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+
+pkgname=vigra
+pkgver=1.7.1
+pkgrel=1
+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-libs: for python bindings')
+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'
+         '25ef8bc26bc38ee67e5b512d2acd0166')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWITH_VIGRANUMPY=1 \
+      -DDOCINSTALL=share/doc 
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # license
+  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/testing/vigra/vigra-1.7.1.gcc460.patch b/testing/vigra/vigra-1.7.1.gcc460.patch
new file mode 100644
index 000000000..46f194dbc
--- /dev/null
+++ b/testing/vigra/vigra-1.7.1.gcc460.patch
@@ -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"
+