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

Conflicts:
	extra/avidemux/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/swh-plugins/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD

2 files changed, 73 insertions, 17 deletions

diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD
index 7d48b47e9..b51701d23 100644
--- a/extra/swh-plugins/PKGBUILD
+++ b/extra/swh-plugins/PKGBUILD
@@ -1,29 +1,46 @@
-# $Id: PKGBUILD 77978 2010-04-19 08:02:08Z dgriffiths $
-#Maintainer: Damir Perisa <damir.perisa@bluewin.ch>
-#Contributor: Robert Emil Berge
+# $Id: PKGBUILD 126506 2011-06-05 21:13:52Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Robert Emil Berge
 
 pkgname=swh-plugins
 pkgver=0.4.15
-pkgrel=3
-pkgdesc="LADSPA Plugin-Collection from plugin.org.uk"
-arch=(i686 x86_64 'mips64el')
+pkgrel=4
+pkgdesc="Steve Harris' LADSPA plug-ins suite"
+arch=('i686' 'x86_64')
 url="http://plugin.org.uk/"
 license=('GPL')
 depends=('fftw' 'ladspa')
+makedepends=('libxml2')
 groups=('ladspa-plugins')
-source=(http://plugin.org.uk/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2fbdccef2462ea553901acd429fa3573')
+source=("http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz"
+        'mbeq_crash_fix.patch')
+md5sums=('2fbdccef2462ea553901acd429fa3573'
+         'a60422c8dea95bee6f9adcdc70dff7e0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-#Arch64 fix, -fPIC seems to be the only option
-if [ "$CARCH" = "x86_64" ]; then
-      export CFLAGS="$CFLAGS -fPIC"
-      export CXXFLAGS="$CFLAGS"
-fi
+  # Arch64 fix;
+  # -fPIC seems to be the only option
+  if [ "$CARCH" = 'x86_64' ]; then
+    export CFLAGS="$CFLAGS -fPIC"
+    export CXXFLAGS="$CFLAGS"
+  fi
 
- ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  # fix Firefox crash on x64 when
+  # plugin is in use by ALSA;
+  # see https://bugs.archlinux.org/task/24579
+  patch -Np1 -i "$srcdir/mbeq_crash_fix.patch"
+
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/swh-plugins/mbeq_crash_fix.patch b/extra/swh-plugins/mbeq_crash_fix.patch
new file mode 100644
index 000000000..37ddd33a9
--- /dev/null
+++ b/extra/swh-plugins/mbeq_crash_fix.patch
@@ -0,0 +1,39 @@
+diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.c swh-plugins-0.4.15/mbeq_1197.c
+--- swh-plugins-0.4.15.orig/mbeq_1197.c	2006-08-09 01:49:15.000000000 +1000
++++ swh-plugins-0.4.15/mbeq_1197.c	2011-06-05 10:57:17.929107102 +1000
+@@ -457,7 +457,8 @@
+ 	#endif
+ 	
+ 	                // Multiply the bins magnitudes by the coeficients
+-	                for (i = 0; i < FFT_LENGTH/2; i++) {
++	                comp[0] *= coefs[0];
++	                for (i = 1; i < FFT_LENGTH/2; i++) {
+ 	                        comp[i] *= coefs[i];
+ 	                        comp[FFT_LENGTH-i] *= coefs[i];
+ 	                }
+diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.so.c swh-plugins-0.4.15/mbeq_1197.so.c
+--- swh-plugins-0.4.15.orig/mbeq_1197.so.c	2003-10-22 02:13:40.000000000 +1000
++++ swh-plugins-0.4.15/mbeq_1197.so.c	2011-06-05 10:57:52.265774336 +1000
+@@ -446,7 +446,8 @@
+ 	#endif
+ 	
+ 	                // Multiply the bins magnitudes by the coeficients
+-	                for (i = 0; i < FFT_LENGTH/2; i++) {
++	                comp[0] *= coefs[0];
++	                for (i = 1; i < FFT_LENGTH/2; i++) {
+ 	                        comp[i] *= coefs[i];
+ 	                        comp[FFT_LENGTH-i] *= coefs[i];
+ 	                }
+diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.xml swh-plugins-0.4.15/mbeq_1197.xml
+--- swh-plugins-0.4.15.orig/mbeq_1197.xml	2005-06-01 19:51:58.000000000 +1000
++++ swh-plugins-0.4.15/mbeq_1197.xml	2011-06-05 10:57:39.335774121 +1000
+@@ -171,7 +171,8 @@
+ #endif
+ 
+ 		// Multiply the bins magnitudes by the coeficients
+-		for (i = 0; i < FFT_LENGTH/2; i++) {
++		comp[0] *= coefs[0];
++		for (i = 1; i < FFT_LENGTH/2; i++) {
+ 			comp[i] *= coefs[i];
+ 			comp[FFT_LENGTH-i] *= coefs[i];
+ 		}