summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2021-12-10 20:39:17 +0100
committer Willy Sudiarto Raharjo2021-12-13 18:01:10 +0100
commite8bcc6848f3f7bce4bdd8013e2ab258643e06982 (patch)
treed61fe3dfb3df79f323f058e4cb327094c0fd18de
parent1e7521defbbda2c2691529a87fc06f8f1d328c14 (diff)
downloadslackbuilds-e8bcc6848f3f7bce4bdd8013e2ab258643e06982.tar.gz
audio/zynjacku: Fix lockups when guitarix installed.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/zynjacku/fix_scan_lockup.diff12
-rw-r--r--audio/zynjacku/zynjacku.SlackBuild12
2 files changed, 23 insertions, 1 deletions
diff --git a/audio/zynjacku/fix_scan_lockup.diff b/audio/zynjacku/fix_scan_lockup.diff
new file mode 100644
index 0000000000..4597c26c38
--- /dev/null
+++ b/audio/zynjacku/fix_scan_lockup.diff
@@ -0,0 +1,12 @@
+diff -Naur zynjacku-6/zynworld/lv2.py zynjacku-6.patched/zynworld/lv2.py
+--- zynjacku-6/zynworld/lv2.py 2011-03-17 23:32:37.000000000 -0400
++++ zynjacku-6.patched/zynworld/lv2.py 2021-12-10 14:33:43.946341107 -0500
+@@ -119,8 +119,6 @@
+ return list(result)
+ if single:
+ if len(anyprops) > 0:
+- if len(anyprops) > 1:
+- raise Exception, "More than one value of " + prop
+ return list(anyprops)[0]
+ else:
+ return None
diff --git a/audio/zynjacku/zynjacku.SlackBuild b/audio/zynjacku/zynjacku.SlackBuild
index 0a817ffd77..4c3bb5cb17 100644
--- a/audio/zynjacku/zynjacku.SlackBuild
+++ b/audio/zynjacku/zynjacku.SlackBuild
@@ -6,11 +6,14 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211210 bkw: BUILD=2
+# - Fix lockups that occur when guitarix is installed.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zynjacku
VERSION=${VERSION:-6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -66,6 +69,13 @@ if [ "$LIBDIRSUFFIX" != "" ]; then
sed -i "s,/usr/lib/lv2,/usr/lib$LIBDIRSUFFIX/lv2,g" zynworld/lv2.py
fi
+# Stops zynjacku and lv2rack from freezing when they're scanning the
+# lv2 plugin dir(s) and hit the Guitarix tuner (and maybe others).
+# The tuner plugin still won't load ("Failed to construct") if
+# you select it, but at least the application doesn't crash and is
+# otherwise useful.
+patch -p1 < $CWD/fix_scan_lockup.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \