From 61dd270201865a9747a5db6fb5fdf2bf77dc5ba6 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Fri, 17 Jan 2020 17:01:49 -0500
Subject: audio/horgand: Fix first-time startup.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 audio/horgand/README             |  9 +++++++++
 audio/horgand/horgand.SlackBuild | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/audio/horgand/README b/audio/horgand/README
index d50a748159..90bfef3bee 100644
--- a/audio/horgand/README
+++ b/audio/horgand/README
@@ -1,8 +1,17 @@
+horgand (organ sounds softsynth)
+
 horgand is a softsynth, really simple and easy to use, specially designed
 to produce organ sounds, and is also capable of generating other sound
 types like Electric Pianos, Jazz Guitar, Strings, Brass, Fretless Bass,
 Accordion etc. using low CPU resources.
 
+NOTE: The first time you start horgand, jack should NOT be running. To
+enable jack in horgand, use its Settings menu (Audio Output => Jack,
+then Save). Then exit horgand, start jack (with e.g. qjackctl), and run
+horgand again. It should now be able to connect to the jack server. Don't
+forget to connect its audio ouputs to something, if you want to hear it
+(and its MIDI inputs to something, to play it).
+
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
 may be considered a security/stability risk. Please read
diff --git a/audio/horgand/horgand.SlackBuild b/audio/horgand/horgand.SlackBuild
index ee550fc9d6..129af92827 100644
--- a/audio/horgand/horgand.SlackBuild
+++ b/audio/horgand/horgand.SlackBuild
@@ -6,12 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20151126 bkw:
-# - fix build on -current (preparing for 14.2)
+# 20200117 bkw: fix default audio device, add startup info to README
+# 20151126 bkw: fix build on -current (preparing for 14.2)
 
 PRGNAM=horgand
 VERSION=${VERSION:-1.14}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,15 +50,18 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Slackware's extra/fltk doesn't have /usr/include/Fl -> FL
 sed -i '/#include/s,Fl/,FL/,' src/*
 
+# 20200117 bkw: fix default alsa device. plughw:0,0 doesn't exist on
+# Slackware by default, which prevents the app from starting up for the
+# first time to allow the user to pick a device which *does* exist.
+# See README.
+sed -i 's|plughw:0,0|default|' src/organAudioOut.C
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-- 
cgit v1.2.3