audio/guitarix: Updated for version 0.32.3.

5 files changed, 323 insertions, 78 deletions

diff --git a/audio/guitarix/README b/audio/guitarix/README
index b8032456d7..569e7627a4 100644
--- a/audio/guitarix/README
+++ b/audio/guitarix/README
@@ -5,9 +5,9 @@ fat distortion and a diversity of crazy sounds never heard before.
 meterbridge is an optional runtime dependency.
 
 Guitarix can be used as a standalone application, as LADSPA plugins,
-or as LV2 plugins. By default, standalone and LADSPA are built. To also
-build LV2 plugins, set LV2=yes in the script's environment (you will
-need lilv installed). The script author hasn't tested LV2 support.
+or as LV2 plugins. By default, all three are built. To disable LV2, set
+LV2=no in the script's environment (you will still need lilv installed,
+however). The script author hasn't tested LV2 support.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/guitarix/guitarix.1 b/audio/guitarix/guitarix.1
index b6bff28280..09b48a509c 100644
--- a/audio/guitarix/guitarix.1
+++ b/audio/guitarix/guitarix.1
@@ -1,22 +1,64 @@
-.TH GUITARIX "1" "October 2012" "SlackBuilds.org" "User Commands"
+.\" Man page generated from reStructuredText.
+.
+.TH GUITARIX 1 "2015-05-14" "0.32.3" "SlackBuilds.org"
 .SH NAME
 guitarix \- guitar amp simulator and effects processor
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for guitarix(1) man page. Convert with:
+.
+.\" rst2man.py guitarix.rst > guitarix.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
 .SH SYNOPSIS
-.B guitarix
-.RI [ options ]
+.sp
+guitarix [\fI\-options\fP]
 .SH DESCRIPTION
-.B Guitarix
-is a rock guitar amplifier for Jack (Jack Audio Connection Kit) with one input
-and two outputs. It is designed to get nice trash/metal/rock guitar sounds.
-Guitarix comes with a GTK+ graphical user interface and a set of LADSPA
-plugins. This manual page describes the GTK+ interface.
-.PP
+.sp
+Guitarix is a rock guitar amplifier for Jack (Jack Audio Connection
+Kit) with one input and two outputs. It is designed to get nice
+trash/metal/rock guitar sounds.  Guitarix comes with a GTK+ graphical
+user interface and a set of LADSPA plugins. This manual page describes
+the GTK+ interface.
+.sp
 Guitarix provides one JACK input port and two JACK output ports.
 Controls for bass, treble, gain, compressor, preamp, balance, distortion,
 freeverb, crybaby (wah) and echo are available. A fixed resonator is
-used when distortion is disabled. To modify the sound 'pressure', you
+used when distortion is disabled. To modify the sound \(aqpressure\(aq, you
 can use the feedback and feedforward sliders.
-.PP
+.sp
 Guitarix includes an experimental tuner and a JACK MIDI output port
 with 3 channels. They are fed by a mix from a pitch tracker and a
 beat detector. You can pitch the octave (2 octaves up or down), choose the
@@ -25,119 +67,185 @@ translates into how fast the note will read after the beat detector
 emits a signal. Values for the beat detector can be set for all
 channels.
 .SH OPTIONS
+.sp
 All parameters are optional. Examples:
-.IP
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
 guitarix
-.br
-guitarix \fB\-r\fR gx4\-black \fB\-i\fR system:capture_3
-.br
-guitarix \fB\-c\fR \fB\-o\fR system:playback_1 \fB\-o\fR system:playback_2
-.SS "Help Options"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+guitarix \-r gx4\-black \-i system:capture_3
+guitarix \-c \-o system:playback_1 \-o system:playback_2
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
+.B Help Options:
+.INDENT 7.0
+.TP
+.B \-h\fP,\fB  \-\-help
 Show help options
 .TP
-\fB\-\-help\-all\fR
+.B \-\-help\-all
 Show all help options
 .TP
-\fB\-\-help\-style\fR
+.B \-\-help\-style
 GTK style configuration options
 .TP
-\fB\-\-help\-jack\fR
+.B \-\-help\-jack
 JACK configuration options
 .TP
-\fB\-\-help\-file\fR
+.B \-\-help\-overload
+Switch to bypass mode on overload condition
+.TP
+.B \-\-help\-file
 File options
 .TP
-\fB\-\-help\-debug\fR
+.B \-\-help\-debug
 Debug options
 .TP
-\fB\-\-help\-gtk\fR
+.B \-\-help\-gtk
 Show GTK+ Options
-.SS
-GTK style configuration options
+.UNINDENT
 .TP
-\fB\-c\fR, \fB\-\-clear\fR
-Use 'default' GTK style
+.B GTK style configuration options
+.INDENT 7.0
 .TP
-\fB\-r\fR, \fB\-\-rcset\fR=\fISTYLE\fR
-Style to use, 'gx1\-alloy', 'gx2\-emerald', 'gx3\-dezert', 'gx4\-black', 'gx5\-gree'
-.SS "JACK Configuration Options"
+.B \-c\fP,\fB  \-\-clear
+Use \(aqdefault\(aq GTK style
 .TP
-\fB\-i\fR, \fB\-\-jack\-input\fR=\fIPORT\fR
+.BI \-r\fP,\fB  \-\-rcset\fB= STYLE
+Style to use, \(aqgx1\-alloy\(aq, \(aqgx2\-emerald\(aq, \(aqgx3\-dezert\(aq, \(aqgx4\-black\(aq, \(aqgx5\-gree\(aq, \(aqgx6\-blue\(aq, \(aqgx7\-blues\(aq, \(aqgx8\-dark\(aq, \(aqgx9\-flat\(aq, \(aqgx9\-grass\(aq
+.UNINDENT
+.TP
+.B JACK configuration options
+.INDENT 7.0
+.TP
+.BI \-i\fP,\fB  \-\-jack\-input\fB= PORT
 Guitarix JACK input
 .TP
-\fB\-o\fR, \fB\-\-jack\-output\fR=\fIPORT\fR
+.BI \-o\fP,\fB  \-\-jack\-output\fB= PORT
 Guitarix JACK outputs
 .TP
-\fB\-m\fR, \fB\-\-jack\-midi\fR=\fIPORT\fR
-Guitarix JACK MIDI control
+.BI \-m\fP,\fB  \-\-jack\-midi\fB= PORT
+Guitarix JACK midi control
 .TP
-\fB\-J\fR, \fB\-\-jack\-no\-conect\fR
+.B \-J\fP,\fB  \-\-jack\-no\-conect
 dissable self\-connect JACK ports
 .TP
-\fB\-n\fR, \fB\-\-name\fR=\fINAME\fR
+.BI \-n\fP,\fB  \-\-name\fB= NAME
 instance name (default gx_head)
 .TP
-\fB\-U\fR, \fB\-\-jack\-uuid\fR
+.BI \-U\fP,\fB  \-\-jack\-uuid\fB= UUID
 JackSession ID
 .TP
-\fB\-A\fR, \fB\-\-jack\-uuid2\fR
+.BI \-A\fP,\fB  \-\-jack\-uuid2\fB= UUID2
 JackSession ID
 .TP
-\fB\-s\fR, \fB\-\-server\-name\fR=\fINAME\fR
+.BI \-s\fP,\fB  \-\-server\-name\fB= NAME
 JACK server name to connect to
-.SS "File Options"
+.UNINDENT
+.TP
+.B Switch to bypass mode on overload condition
+.INDENT 7.0
+.TP
+.BI \-I\fP,\fB  \-\-idle\-timeout\fB= SECONDS
+starved idle thread probe (default: disabled)
+.TP
+.B \-C\fP,\fB  \-\-no\-convolver\-overload
+disable overload on convolver missed deadline
+.TP
+.B \-X\fP,\fB  \-\-xrun\-overload
+JACK xrun (default: false)
+.TP
+.BI \-S\fP,\fB  \-\-sporadic\fB= SECONDS
+allow single overload events per interval (default: disabled)
+.UNINDENT
+.TP
+.B File options
+.INDENT 7.0
 .TP
-\fB\-f\fR, \fB\-\-load\-file\fR=\fIFILE\fR
+.BI \-f\fP,\fB  \-\-load\-file\fB= FILE
 load state file on startup
 .TP
-\fB\-P\fR, \fB\-\-plugin\-dir\fR=\fIDIR\fR
+.BI \-P\fP,\fB  \-\-plugin\-dir\fB= DIR
 directory with guitarix plugins (.so files)
 .TP
-\fB\-K\fR, \fB\-\-dissable\-auto\-save\fR
-dissable auto save to state file when quit
-.SS "Debug Options"
+.B \-K\fP,\fB  \-\-disable\-save\-on\-exit
+disable auto save to state file when quit
 .TP
-\fB\-B\fR, \fB\-\-builder\-dir\fR=\fIDIR\fR
+.B \-a\fP,\fB  \-\-auto\-save
+enable auto save (only in server mode)
+.UNINDENT
+.TP
+.B Debug options
+.INDENT 7.0
+.TP
+.BI \-B\fP,\fB  \-\-builder\-dir\fB= DIR
 directory from which .glade files are loaded
 .TP
-\fB\-S\fR, \fB\-\-style\-dir\fR=\fIDIR\fR
+.BI \-\-style\-dir\fB= DIR
 directory with skin style definitions (.rc files)
 .TP
-\fB\-t\fR, \fB\-\-log\-terminal\fR
+.B \-t\fP,\fB  \-\-log\-terminal
 print log on terminal
 .TP
-\fB\-d\fR, \fB\-\-dump\-parameter\fR
-dump parameter table in JSON format
-.SS "GTK+ Options"
+.B \-d\fP,\fB  \-\-dump\-parameter
+dump parameter table in json format
+.UNINDENT
+.TP
+.B GTK+ Options
+.INDENT 7.0
 .TP
-\fB\-\-class\fR=\fICLASS\fR
+.BI \-\-class\fB= CLASS
 Program class as used by the window manager
 .TP
-\fB\-\-gtk\-name\fR=\fINAME\fR
+.BI \-\-gtk\-name\fB= NAME
 Program name as used by the window manager
 .TP
-\fB\-\-screen\fR=\fISCREEN\fR
+.BI \-\-screen\fB= SCREEN
 X screen to use
 .TP
-\fB\-\-sync\fR
+.B \-\-sync
 Make X calls synchronous
 .TP
-\fB\-\-gtk\-module\fR=\fIMODULES\fR
+.BI \-\-gtk\-module\fB= MODULES
 Load additional GTK+ modules
 .TP
-\fB\-\-g\-fatal\-warnings\fR
+.B \-\-g\-fatal\-warnings
 Make all warnings fatal
-.SS "Application Options"
+.UNINDENT
 .TP
-\fB\-v\fR, \fB\-\-version\fR
+.B Application Options:
+.INDENT 7.0
+.TP
+.B \-v\fP,\fB  \-\-version
 Print version string and exit
 .TP
-\fB\-\-display\fR=\fIDISPLAY\fR
+.B \-N\fP,\fB  \-\-nogui
+start without GUI
+.TP
+.BI \-p\fP,\fB  \-\-rpcport\fB= PORT
+start a JSON\-RPC server listening on port PORT
+.TP
+.BI \-H\fP,\fB  \-\-rpchost\fB= HOSTNAME
+set hostname to connect to
+.TP
+.B \-G\fP,\fB  \-\-onlygui
+start only GUI
+.TP
+.B \-L\fP,\fB  \-\-liveplaygui
+start with Live Play GUI
+.TP
+.B \-M\fP,\fB  \-\-mute
+start with engine muted
+.TP
+.BI \-\-display\fB= DISPLAY
 X display to use
-.SH AUTHORS
-Guitarix is Copyright (c) 2010 Hermman Meyer \- James Warden \- Andreas Degert
-.PP
-This man page was created for the SlackBuilds.org project by B. Watson, but it can
-be used by anyone.
+.UNINDENT
+.UNINDENT
+.\" Generated by docutils manpage writer.
+.
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index 1db1caa2a4..465fba0238 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -15,11 +15,20 @@
 # - Replaced slack-desc with updated text from guitarix site
 # - Added LV2 option
 
+# 20150514 bkw:
+# - Updated for 0.32.3
+# - Fix some issues with the shared libs: they were being installed
+#   to /usr/lib/ on 64-bit, and they were missing the +x bits.
+# - Made LV2 option default to yes, since upstream is requiring lilv
+#   even if --no-lv2 is used. Also, the lv2 plugins were being
+#   installed to /usr/lib/ on 64-bit. Grr.
+# - Upstream wants avahi by default. For now, hardcoded --no-avahi.
+
 # Modified version released under the WTFPL, for details see
 # http://www.wtfpl.net/txt/copying/
 
 PRGNAM=guitarix
-VERSION=${VERSION:-0.27.1}
+VERSION=${VERSION:-0.32.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,14 +84,18 @@ find -L . \
 # be present among', implying we should only need Audio *or* AudioVideo.
 sed -i '/^Categories/s,$,Audio;,;' $PRGNAM.desktop.in
 
-if [ "${LV2:-no}" = "yes" ]; then
-  LV2OPT=--build-lv2
+if [ "${LV2:-yes}" = "no" ]; then
+  LV2OPT=--no-lv2
 fi
 
+LIBDIR="/usr/lib${LIBDIRSUFFIX}"
 ./waf configure \
   --prefix=/usr \
   --cxxflags-release="$SLKCFLAGS" \
-  --ladspadir="/usr/lib${LIBDIRSUFFIX}/ladspa/" \
+  --ladspadir="$LIBDIR/ladspa/" \
+  --lv2dir="$LIBDIR/lv2/" \
+  --libdir="$LIBDIR" \
+  --no-avahi \
   $LV2OPT
 ./waf build
 ./waf install --destdir=$PKG
@@ -90,6 +103,9 @@ fi
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Shared libraries are supposed to be +x.
+chmod 755 $PKG/$LIBDIR/libgx*.so.?.?
+
 # Man page written for this SlackBuild
 mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info
index 085519bf21..3132c40be3 100644
--- a/audio/guitarix/guitarix.info
+++ b/audio/guitarix/guitarix.info
@@ -1,10 +1,10 @@
 PRGNAM="guitarix"
-VERSION="0.27.1"
+VERSION="0.32.3"
 HOMEPAGE="http://guitarix.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.27.1.tar.bz2"
-MD5SUM="65e0917f9529460931be522e2879e514"
+DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.32.3.tar.bz2"
+MD5SUM="fb0a853acf40aa8a26f0abe5f224989a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtkmm jack-audio-connection-kit liblrdf"
+REQUIRES="gtkmm jack-audio-connection-kit liblrdf eigen3 lilv"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/guitarix/guitarix.rst b/audio/guitarix/guitarix.rst
new file mode 100644
index 0000000000..87e500f4f3
--- /dev/null
+++ b/audio/guitarix/guitarix.rst
@@ -0,0 +1,121 @@
+.. RST source for guitarix(1) man page. Convert with:
+..   rst2man.py guitarix.rst > guitarix.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.32.3
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+========
+guitarix
+========
+
+------------------------------------------
+guitar amp simulator and effects processor
+------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+guitarix [*-options*]
+
+DESCRIPTION
+===========
+
+Guitarix is a rock guitar amplifier for Jack (Jack Audio Connection
+Kit) with one input and two outputs. It is designed to get nice
+trash/metal/rock guitar sounds.  Guitarix comes with a GTK+ graphical
+user interface and a set of LADSPA plugins. This manual page describes
+the GTK+ interface.
+
+Guitarix provides one JACK input port and two JACK output ports.
+Controls for bass, treble, gain, compressor, preamp, balance, distortion,
+freeverb, crybaby (wah) and echo are available. A fixed resonator is
+used when distortion is disabled. To modify the sound 'pressure', you
+can use the feedback and feedforward sliders.
+
+Guitarix includes an experimental tuner and a JACK MIDI output port
+with 3 channels. They are fed by a mix from a pitch tracker and a
+beat detector. You can pitch the octave (2 octaves up or down), choose the
+MIDI channel, the MIDI program, the velocity and the sensitiviy, which
+translates into how fast the note will read after the beat detector
+emits a signal. Values for the beat detector can be set for all
+channels.
+
+OPTIONS
+=======
+
+All parameters are optional. Examples::
+
+  guitarix
+  guitarix -r gx4-black -i system:capture_3
+  guitarix -c -o system:playback_1 -o system:playback_2
+
+Help Options:
+  -h, --help                      Show help options
+  --help-all                      Show all help options
+  --help-style                    GTK style configuration options
+  --help-jack                     JACK configuration options
+  --help-overload                 Switch to bypass mode on overload condition
+  --help-file                     File options
+  --help-debug                    Debug options
+  --help-gtk                      Show GTK+ Options
+
+GTK style configuration options
+  -c, --clear                     Use 'default' GTK style
+  -r, --rcset=STYLE               Style to use, 'gx1-alloy', 'gx2-emerald', 'gx3-dezert', 'gx4-black', 'gx5-gree', 'gx6-blue', 'gx7-blues', 'gx8-dark', 'gx9-flat', 'gx9-grass'
+
+JACK configuration options
+  -i, --jack-input=PORT           Guitarix JACK input
+  -o, --jack-output=PORT          Guitarix JACK outputs
+  -m, --jack-midi=PORT            Guitarix JACK midi control
+  -J, --jack-no-conect            dissable self-connect JACK ports
+  -n, --name=NAME                 instance name (default gx_head)
+  -U, --jack-uuid=UUID            JackSession ID
+  -A, --jack-uuid2=UUID2          JackSession ID
+  -s, --server-name=NAME          JACK server name to connect to
+
+Switch to bypass mode on overload condition
+  -I, --idle-timeout=SECONDS      starved idle thread probe (default: disabled)
+  -C, --no-convolver-overload     disable overload on convolver missed deadline
+  -X, --xrun-overload             JACK xrun (default: false)
+  -S, --sporadic=SECONDS          allow single overload events per interval (default: disabled)
+
+File options
+  -f, --load-file=FILE            load state file on startup
+  -P, --plugin-dir=DIR            directory with guitarix plugins (.so files)
+  -K, --disable-save-on-exit      disable auto save to state file when quit
+  -a, --auto-save                 enable auto save (only in server mode)
+
+Debug options
+  -B, --builder-dir=DIR           directory from which .glade files are loaded
+  --style-dir=DIR                 directory with skin style definitions (.rc files)
+  -t, --log-terminal              print log on terminal
+  -d, --dump-parameter            dump parameter table in json format
+
+GTK+ Options
+  --class=CLASS                   Program class as used by the window manager
+  --gtk-name=NAME                 Program name as used by the window manager
+  --screen=SCREEN                 X screen to use
+  --sync                          Make X calls synchronous
+  --gtk-module=MODULES            Load additional GTK+ modules
+  --g-fatal-warnings              Make all warnings fatal
+
+Application Options:
+  -v, --version                   Print version string and exit
+  -N, --nogui                     start without GUI
+  -p, --rpcport=PORT              start a JSON-RPC server listening on port PORT
+  -H, --rpchost=HOSTNAME          set hostname to connect to
+  -G, --onlygui                   start only GUI
+  -L, --liveplaygui               start with Live Play GUI
+  -M, --mute                      start with engine muted
+  --display=DISPLAY               X display to use
+