Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

2 files changed, 43 insertions, 9 deletions

diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 436ec5ddd..43f4aa5a4 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $
+# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=vigra
-pkgver=1.7.0
-pkgrel=6
+pkgver=1.7.1
+pkgrel=2
 pkgdesc="Computer vision library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
@@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num
 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')
-sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46')
+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}-src
-  patch -p1 < ../libpng-1.4.patch
+  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 
@@ -28,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-src
+  cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   # license
   install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch
new file mode 100644
index 000000000..46f194dbc
--- /dev/null
+++ b/extra/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"
+