audio/jaaa: New-style icons, expand man page.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

8 files changed, 257 insertions, 281 deletions

diff --git a/audio/jaaa/doinst.sh b/audio/jaaa/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/audio/jaaa/doinst.sh
+++ b/audio/jaaa/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/audio/jaaa/jaaa-alsa.desktop b/audio/jaaa/jaaa-alsa.desktop
new file mode 100644
index 0000000000..b02de758d0
--- /dev/null
+++ b/audio/jaaa/jaaa-alsa.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=JAAA (ALSA)
+Comment=JACK and ALSA Audio Analyser
+Exec=jaaa -A
+Icon=jaaa
+Terminal=false
+Type=Application
+Categories=AudioVideo;Audio;
diff --git a/audio/jaaa/jaaa.1 b/audio/jaaa/jaaa.1
index 9348dc152f..554429140e 100644
--- a/audio/jaaa/jaaa.1
+++ b/audio/jaaa/jaaa.1
@@ -1,196 +1,122 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
+.\" Man page generated from reStructuredText.
+.
+.
+.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]
 ..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
 ..
-.de Ve \" End verbatim text
-.ft R
-.fi
+.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
 ..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "JAAA 1"
-.TH JAAA 1 "2014-01-15" "0.8.4" "SlackBuilds.org"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
+.TH "JAAA" 1 "2021-11-29" "0.9.2" "SlackBuilds.org"
+.SH NAME
 jaaa \- JACK and ALSA Audio Analyser
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-jaaa \fIoptions\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-jaaa is an audio signal generator and spectrum analyser designed to make
-accurate measurements.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-Either \fB\-J\fR or \fB\-A\fR is required.
-.IP "\-h" 4
-.IX Item "-h"
-Display this text
-.IP "\-name <name>" 4
-.IX Item "-name <name>"
-\&\s-1JACK\s0 and X11 name
-.IP "\-J" 4
-.IX Item "-J"
-Use \s-1JACK,\s0 with options:
-.RS 4
-.IP "\-s <server>" 4
-.IX Item "-s <server>"
-Select \s-1JACK\s0 server
-.RE
-.RS 4
-.RE
-.IP "\-A" 4
-.IX Item "-A"
-Use \s-1ALSA,\s0 with options:
-.RS 4
-.IP "\-d <device>" 4
-.IX Item "-d <device>"
-\&\s-1ALSA\s0 device [hw:0]
-.IP "\-C <device>" 4
-.IX Item "-C <device>"
-Capture device
-.IP "\-P <device>" 4
-.IX Item "-P <device>"
-Playback device
-.IP "\-r <rate>" 4
-.IX Item "-r <rate>"
-Sample frequency [48000]
-.IP "\-p <period>" 4
-.IX Item "-p <period>"
-Period size [1024]
-.IP "\-n <nfrags>" 4
-.IX Item "-n <nfrags>"
-Number of fragments [2]
-.RE
-.RS 4
-.RE
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-(C) 2004\-2010 Fons Adriaensen  <fons@kokkinizita.net>
+.\" RST source for jaaa(1) man page. Convert with:
+.
+.\" rst2man.py jaaa.rst > jaaa.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+jaaa \fB\-J\fP [\fB\-name\fP \fIname\fP ] [\fB\-s\fP \fIserver\fP]
+.sp
+jaaa \fB\-A\fP [\fB\-name\fP \fIname\fP ] [\fB\-d\fP \fIdevice\fP] [\fB\-C\fP \fIdevice\fP ] [\fB\-P\fP \fIdevice\fP ] [\fB\-r\fP \fIrate\fP] [\fB\-p\fP \fIperiod\fP] [\fB\-n\fP \fInfrags\fP]
+.SH DESCRIPTION
+.sp
+jaaa is a graphical (X11) audio signal generator and spectrum analyser
+designed to make accurate measurements. For more information see
+/usr/doc/jaaa\-0.9.2/README.
+.sp
+In JACK mode (\fB\-J\fP), jaaa creates 8 input ports (for spectrum
+analysis) and 8 output ports (for signal generation), named
+\fIjaaa:in_<N>\fP and \fIjaaa:out_<N>\fP (where \fI<N>\fP ranges 1 to 8). By default,
+these aren\(aqt connected to anything; use e.g. \fBqjackctl\fP(1) or
+\fBjack_connect\fP(1) to connect to other JACK clients.
+.sp
+In ALSA mode, the inputs and outputs are connected directly to the
+ALSA device, meaning e.g. there will be 2 inputs and 2 outputs for a
+typical stereo audio card. If you get "Can\(aqt connect to ALSA", try a
+different device (use \fBalsamixer\fP(1) or \fBaplay\fP(1) to get a list
+of them).
+.SH OPTIONS
+.sp
+Either \fB\-J\fP or \fB\-A\fP is required.
+.INDENT 0.0
+.TP
+.B \fB\-h\fP
+Show built\-in help message.
+.TP
+.B \fB\-name\fP \fIname\fP
+Set X11 client name (and JACK client name, with \fB\-J\fP).
+.TP
+.B \fB\-J\fP
+Use JACK for audio. This option is available in JACK mode:
+.INDENT 7.0
+.TP
+.B \fB\-s\fP \fIserver\fP
+Connect to a specific JACK server. Default is \(aqdefault\(aq or
+\fB$JACK_DEFAULT_SERVER\fP environment variable.
+.UNINDENT
+.TP
+.B \fB\-A\fP
+Use ALSA for audio. These options are available in ALSA mode:
+.INDENT 7.0
+.TP
+.B \fB\-d\fP \fIdevice\fP
+ALSA device for capture and playback. This option sets the
+playback and capture devices to the same device. For separate
+capture and playback, use the \fB\-C\fP and \fB\-P\fP options.
+Default: \fBhw:0\fP unless \fB\-C\fP or \fB\-P\fP is used.
+.TP
+.B \fB\-C\fP \fIdevice\fP
+ALSA device for capture. Default: not used.
+.TP
+.B \fB\-P\fP \fIdevice\fP
+ALSA device for playback. Default: not used.
+.TP
+.B \fB\-r\fP \fIrate\fP
+Sample frequency. Default: 48000.
+.TP
+.B \fB\-p\fP \fIperiod\fP
+Period size. Default: 1024.
+.TP
+.B \fB\-n\fP \fInfrags\fP
+Number of fragments. Default: 2.
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/jaaa\-0.9.2/COPYING for license information.
+.SH AUTHORS
+.sp
+jaaa was written by Fons Adriaensen <\fI\%fons@kokkinizita.net\fP>.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBjackd\fP(1), \fBjapa\fP(1)
+.sp
+\fI\%https://kokkinizita.linuxaudio.org/linuxaudio/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/audio/jaaa/jaaa.SlackBuild b/audio/jaaa/jaaa.SlackBuild
index 78d390e77e..04fe83700b 100644
--- a/audio/jaaa/jaaa.SlackBuild
+++ b/audio/jaaa/jaaa.SlackBuild
@@ -6,11 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211129 bkw: BUILD=2, new-style icons, expand man page.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=jaaa
 VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -77,9 +76,21 @@ mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+for i in $PRGNAM $PRGNAM-alsa; do
+  cat $CWD/$i.desktop > $PKG/usr/share/applications/$i.desktop
+done
+
+# the 32x32 icon comes from Debian.
+# the 48x48 icon is the 32x32 one, centered in a 48x48 transparent PNG.
+mkdir -p $PKG/usr/share/icons/hicolor/{32x32,48x48}/apps
+convert $CWD/$PRGNAM.xpm \
+        $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+convert -background none -extent 48x48 -gravity center \
+        $CWD/$PRGNAM.xpm \
+        $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 cat $CWD/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/jaaa/jaaa.desktop b/audio/jaaa/jaaa.desktop
index dd556a5745..88dfc37069 100644
--- a/audio/jaaa/jaaa.desktop
+++ b/audio/jaaa/jaaa.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=JAAA
+Name=JAAA (JACK)
 Comment=JACK and ALSA Audio Analyser
 Exec=jaaa -J
 Icon=jaaa
diff --git a/audio/jaaa/jaaa.info b/audio/jaaa/jaaa.info
index 661a408475..86aedbd022 100644
--- a/audio/jaaa/jaaa.info
+++ b/audio/jaaa/jaaa.info
@@ -1,7 +1,7 @@
 PRGNAM="jaaa"
 VERSION="0.9.2"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jaaa-0.9.2.tar.bz2"
+HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/"
+DOWNLOAD="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/jaaa-0.9.2.tar.bz2"
 MD5SUM="02ceeda017e57635c64302e6271ad094"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/jaaa/jaaa.pod b/audio/jaaa/jaaa.pod
deleted file mode 100644
index 77dc350ed2..0000000000
--- a/audio/jaaa/jaaa.pod
+++ /dev/null
@@ -1,81 +0,0 @@
-# pod source for jaaa man page
-# pod2man -s1 -r0.8.4 --stderr -nJAAA -cSlackBuilds.org < jaaa.pod > jaaa.1
-
-=pod
-
-=head1 NAME
-
-jaaa - JACK and ALSA Audio Analyser
-
-=head1 SYNOPSIS
-
-jaaa I<options>
-
-=head1 DESCRIPTION
-
-jaaa is an audio signal generator and spectrum analyser designed to make
-accurate measurements.
-
-=head1 OPTIONS
-
-Either B<-J> or B<-A> is required.
-
-=over
-
-=item -h
-
-Display this text
-
-=item -name <name>
-
-JACK and X11 name
-
-=item -J
-
-Use JACK, with options:
-
-=over
-
-=item -s <server>
-
-Select JACK server
-
-=back
-
-=item -A
-
-Use ALSA, with options:
-
-=over
-
-=item -d <device>
-
-ALSA device [hw:0]
-
-=item -C <device>
-
-Capture device
-
-=item -P <device>
-
-Playback device
-
-=item -r <rate>
-
-Sample frequency [48000]
-
-=item -p <period>
-
-Period size [1024]
-
-=item -n <nfrags>
-
-Number of fragments [2]
-
-=back
-
-=back
-
-=head1 AUTHOR
-
-(C) 2004-2010 Fons Adriaensen  <fons@kokkinizita.net>
diff --git a/audio/jaaa/jaaa.rst b/audio/jaaa/jaaa.rst
new file mode 100644
index 0000000000..ac4479df04
--- /dev/null
+++ b/audio/jaaa/jaaa.rst
@@ -0,0 +1,107 @@
+.. RST source for jaaa(1) man page. Convert with:
+..   rst2man.py jaaa.rst > jaaa.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.9.2
+.. |date| date::
+
+====
+jaaa
+====
+
+----------------------------
+JACK and ALSA Audio Analyser
+----------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+jaaa **-J** [**-name** *name* ] [**-s** *server*]
+
+jaaa **-A** [**-name** *name* ] [**-d** *device*] [**-C** *device* ] [**-P** *device* ] [**-r** *rate*] [**-p** *period*] [**-n** *nfrags*]
+
+DESCRIPTION
+===========
+
+jaaa is a graphical (X11) audio signal generator and spectrum analyser
+designed to make accurate measurements. For more information see
+/usr/doc/jaaa-|version|/README.
+
+In JACK mode (**-J**), jaaa creates 8 input ports (for spectrum
+analysis) and 8 output ports (for signal generation), named
+*jaaa:in_<N>* and *jaaa:out_<N>* (where *<N>* ranges 1 to 8). By default,
+these aren't connected to anything; use e.g. **qjackctl**\(1) or
+**jack_connect**\(1) to connect to other JACK clients.
+
+In ALSA mode, the inputs and outputs are connected directly to the
+ALSA device, meaning e.g. there will be 2 inputs and 2 outputs for a
+typical stereo audio card. If you get "Can't connect to ALSA", try a
+different device (use **alsamixer**\(1) or **aplay**\(1) to get a list
+of them).
+
+OPTIONS
+=======
+
+Either **-J** or **-A** is required.
+
+**-h**
+  Show built-in help message.
+
+**-name** *name*
+  Set X11 client name (and JACK client name, with **-J**).
+
+**-J**
+  Use JACK for audio. This option is available in JACK mode:
+
+  **-s** *server*
+    Connect to a specific JACK server. Default is 'default' or
+    **$JACK_DEFAULT_SERVER** environment variable.
+
+**-A**
+  Use ALSA for audio. These options are available in ALSA mode:
+
+  **-d** *device*
+    ALSA device for capture and playback. This option sets the
+    playback and capture devices to the same device. For separate
+    capture and playback, use the **-C** and **-P** options.
+    Default: **hw:0** unless **-C** or **-P** is used.
+
+  **-C** *device*
+    ALSA device for capture. Default: not used.
+
+  **-P** *device*
+    ALSA device for playback. Default: not used.
+
+  **-r** *rate*
+    Sample frequency. Default: 48000.
+
+  **-p** *period*
+    Period size. Default: 1024.
+
+  **-n** *nfrags*
+    Number of fragments. Default: 2.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/jaaa-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+jaaa was written by Fons Adriaensen <fons@kokkinizita.net>.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**jackd**\(1), **japa**\(1)
+
+https://kokkinizita.linuxaudio.org/linuxaudio/