[arch-commits] Commit in swh-plugins/trunk (PKGBUILD mbeq_crash_fix.patch)
Ray Rashif
schiv at archlinux.org
Sun Jun 5 21:07:34 UTC 2011
Date: Sunday, June 5, 2011 @ 17:07:33
Author: schiv
Revision: 126505
upgpkg: swh-plugins 0.4.15-4
fix a crash; FS#24579
Added:
swh-plugins/trunk/mbeq_crash_fix.patch
Modified:
swh-plugins/trunk/PKGBUILD
----------------------+
PKGBUILD | 48 ++++++++++++++++++++++++++++++++----------------
mbeq_crash_fix.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-06-05 19:50:57 UTC (rev 126504)
+++ PKGBUILD 2011-06-05 21:07:33 UTC (rev 126505)
@@ -1,29 +1,45 @@
# $Id$
-#Maintainer: Damir Perisa <damir.perisa at bluewin.ch>
-#Contributor: Robert Emil Berge
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at 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)
+pkgrel=4
+pkgdesc="Steve Harris' LADSPA plug-ins suite"
+arch=('i686' 'x86_64')
url="http://plugin.org.uk/"
license=('GPL')
depends=('fftw' 'ladspa')
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:
Added: mbeq_crash_fix.patch
===================================================================
--- mbeq_crash_fix.patch (rev 0)
+++ mbeq_crash_fix.patch 2011-06-05 21:07:33 UTC (rev 126505)
@@ -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];
+ }
More information about the arch-commits
mailing list