audio/sonic-visualiser: Updated for version 4.4.

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

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

8 files changed, 242 insertions, 188 deletions

diff --git a/audio/sonic-visualiser/README b/audio/sonic-visualiser/README
index 43cb4adb39..46660c88e6 100644
--- a/audio/sonic-visualiser/README
+++ b/audio/sonic-visualiser/README
@@ -5,16 +5,11 @@ contents of music audio files. The aim of Sonic Visualiser is to be
 the first program you reach for when want to study a musical recording
 rather than simply listen to it.
 
-Optional dependencies, detected at build time:
+Optional dependency, detected at build time:
 
 portaudio - allows sonic-visualiser to run without a JACK or pulseaudio
 server (using plain ALSA).
 
-jack - allows sonic-visualiser to use JACK for realtime audio
-recording/playback [*].
-
-liblo - allows remote control of sonic-visualiser via OSC.
-
 Note: PulseAudio seems to work but hasn't been thoroughly tested. If
 you have problems with the other audio I/O backends, try JACK. See File
 -> Preferences -> Audio I/O.
diff --git a/audio/sonic-visualiser/doinst.sh b/audio/sonic-visualiser/doinst.sh
index 9a8ded3c60..9424ce43ff 100644
--- a/audio/sonic-visualiser/doinst.sh
+++ b/audio/sonic-visualiser/doinst.sh
@@ -5,3 +5,9 @@ fi
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/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/sonic-visualiser/slack-desc b/audio/sonic-visualiser/slack-desc
index d29d068310..47a309052f 100644
--- a/audio/sonic-visualiser/slack-desc
+++ b/audio/sonic-visualiser/slack-desc
@@ -13,7 +13,7 @@ sonic-visualiser: contents of music audio files. The aim of Sonic Visualiser is
 sonic-visualiser: the first program you reach for when want to study a musical recording
 sonic-visualiser: rather than simply listen to it.
 sonic-visualiser:
-sonic-visualiser: Build options:
-sonic-visualiser: JACK support: @JACKYN@
-sonic-visualiser: PortAudio: @PAYN@
-sonic-visualiser: liblo (OSC): @LIBLOYN@
+sonic-visualiser: This package was built @WITH_PA@ PortAudio support.
+sonic-visualiser:
+sonic-visualiser:
+sonic-visualiser:
diff --git a/audio/sonic-visualiser/sonic-visualiser.1 b/audio/sonic-visualiser/sonic-visualiser.1
index f39f576533..ea0d050455 100644
--- a/audio/sonic-visualiser/sonic-visualiser.1
+++ b/audio/sonic-visualiser/sonic-visualiser.1
@@ -1,42 +1,98 @@
-.TH SONIC-VISUALISER 1 "November 17, 2010"
+.\" 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]
+..
+.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
+..
+.TH "SONIC-VISUALISER" 1 "2021-12-07" "4.4" "SlackBuilds.org"
 .SH NAME
-sonic-visualiser \- viewing and analysing the contents of music audio files
+sonic-visualiser \- view and analyze the contents of music files
+.\" RST source for sonic-visualiser(1) man page. Convert with:
+.
+.\" rst2man.py sonic-visualiser.rst > sonic-visualiser.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
 .SH SYNOPSIS
-.B sonic-visualiser
-[\fIoptions\fR] [\fIfile\fR] ...
+.sp
+sonic\-visualiser [\fI\-options\fP] [\fIfile\fP] ...
 .SH DESCRIPTION
-.B Sonic Visualiser
-is a program for viewing and exploring audio data for semantic music
-analysis and annotation.
-.PP
-.B Sonic Visualiser
-could be of particular interest to musicologists, archivists,
-signal-processing researchers and anyone else looking for a friendly way to
-take a look at what lies inside the audio file.
-.PP
-After the installation, the application is available from the
-.B Applications
-menu.
+.sp
+Sonic Visualiser is an application for viewing and analysing the
+contents of music audio files. The aim of Sonic Visualiser is to be
+the first program you reach for when want to study a musical recording
+rather than simply listen to it.
 .SH OPTIONS
+.INDENT 0.0
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+.B [\fIfile\fP] ...
+One or more Sonic Visualiser session files (\fB\&.sv\fP) or audio
+files may be given as arguments.
 .TP
-\fB\-\-no\-audio\fR
+.B \fB\-h\fP, \fB\-\-help\fP
+Display built\-in help.
+.TP
+.B \fB\-help\-all\fP
+Display built\-in help, including Qt\-specific options.
+.TP
+.B \fB\-v\fP, \fB\-\-version\fP
+Display Sonic Visualiser version number and exit.
+.TP
+.B \fB\-\-no\-audio\fP
 Do not attempt to open an audio output device.
 .TP
-\fB\-\-no\-osc\fR
+.B \fB\-no\-osc\fP
 Do not provide an Open Sound Control port for remote control.
-.PP
-One or more Sonic Visualiser (.sv) and audio files may be provided.
-.SH "SEE ALSO"
-The complete documentation is available online at:
-.br
-.B
-http://www.sonicvisualiser.org/documentation.html
-.SH "AUTHOR"
-sonic-visualiser was written by Chris Cannam <cannam@users.sourceforge.net>
-and others.
-.PP
-This manual page was written by Alessio Treglia <alessio@debian.org>,
-for the Debian project (but may be used by others).
+.TP
+.B \fB\-\-no\-splash\fP
+Do not show a splash screen.
+.TP
+.B \fB\-\-osc\-script\fP \fIscriptfile\fP
+Batch run the Open Sound Control script found in the
+given file. Supply "\-" as file to read from stdin.
+Scripts consist of /command arg1 arg2 ... OSC control
+lines, optionally interleaved with numbers to specify
+pauses in seconds.
+.TP
+.B \fB\-\-first\-run\fP
+Clear any saved settings and reset to first\-run behaviour.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/sonic\-visualiser\-4.4/COPYING for license information.
+.SH AUTHORS
+.sp
+sonic\-visualiser was initiated and developed in the Centre for Digital
+Music, Queen Mary University, of London. It is currently maintained
+primarily by Chris Cannam at Particular Programs, Ltd.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The sonic\-visualiser homepage: \fI\%https://sonicvisualiser.org/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/audio/sonic-visualiser/sonic-visualiser.SlackBuild b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
index 5fe1ea7f81..c900320bbd 100644
--- a/audio/sonic-visualiser/sonic-visualiser.SlackBuild
+++ b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
@@ -6,6 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211207 bkw: update for 4.4.
+# - liblo is now a hard dep.
+# - jack is a hard dep again.
+# - get rid of 10+ year outdated Debian man pages, write an up-to-date one.
+#   unfortunately I do not speak French, so the new man page is English-only.
+# - upstream switched to meson, can no longer build older versions with
+#   this script.
+
 # 20201104 bkw: update for 4.2.
 # 20191212 bkw:
 # - Update for 4.0.1.
@@ -63,7 +71,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sonic-visualiser
-VERSION=${VERSION:-4.2}
+VERSION=${VERSION:-4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -76,9 +84,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
@@ -114,114 +119,62 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# In case the user just now installed qt5 and hasn't sourced the profile
-# script, let's be nice and do it here.
-[ "$QT5DIR" = ""  ] && \
-  [ -x /etc/profile.d/qt5.sh ] && \
-  source /etc/profile.d/qt5.sh
-
-# Fudge the test suite, all but 2 tests pass. I think the error is in the
-# test suite, not a real error in the code. Even if it is broken code, the
-# failure is caused by a 32KHz mp3, which is is pretty uncommon sampling
-# rate to find in an mp3 and shouldn't prevent us using sonic-visualiser
-# on other filetypes (or mp3 at normal sampling rates, e.g. the 44.1KHz
-# test cases pass).
-rm -f svcore/data/fileio/test/audio/mp3/32000-1.mp3
-
-# The test suite uses utf8 encoded filenames, so it will *fail* if
-# the current locale is a non-utf8 one (such as Slackware's default
-# of en_US). Try to set a locale that makes sense for the user, fall
-# back on en_US.UTF-8 if we can't figure it out.
-FALLBACK="en_US.UTF-8"
-case "$LANG" in
-  *.utf8|*.UTF8|*.utf-8|*.UTF-8) ;; # already OK
-  ??_??) LANG="$LANG.UTF-8"      ;; # e.g "en_US", "de_DE"
-  *)     LANG=$FALLBACK          ;; # empty, "C", or garbage
-esac
-
-# Make sure the chosen locale exists. If it doesn't, the locale
-# command will give us errors that begin with "locale:" (its exit
-# status is always 0/success, how annoying).
-export LANG
-if locale 2>&1 >/dev/null | grep -q '^locale:'; then
-  LANG=$FALLBACK
-  export LANG
-fi
+# 20211207 bkw: upstream switched from autotools to meson/ninja. Also,
+# the test suite is no longer run by default, so all the extra code here
+# that was needed to make the tests pass, is gone. And, there's now a
+# functional 'install' target.
+# According to COMPILE_linux.md, mlton is required. But building without
+# it works fine and produces a binary that works fine...
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+# binaries already stripped, .desktop already installed.
+
+for i in icons/sv-*x*.png; do
+  size="$( basename $i | cut -d- -f2 | cut -d. -f1 )"
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cp -a $i $dir/$PRGNAM.png
+done
 
-QTDIR=$QT5DIR \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-# Override $HOME since the unit tests insist on writing useless stuff
-# there. In case the user's using ccache, this changes the cache dir,
-# so we put it back like it was (no harm done if user not using ccache).
-# Parallel build seems to work OK in 4.0.1. If not, uncomment the -j1
-# and email me a bug report.
-CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} \
-HOME=$( pwd ) \
-  make # -j1
-
-# There is a 'make install' in 3.0.1, but it's broken. It's not clear to
-# me whether piper-convert should be installed: it's used by the unit
-# tests, and mentioned in deploy/win32/sonic-visualiser.wxs but not in
-# deploy/linux/deploy-deb.sh. I'll include it, just in case.
-mkdir -p $PKG/usr/share/$PRGNAM/samples $PKG/usr/bin
-install -m0644 samples/* $PKG/usr/share/$PRGNAM/samples
-install -m0755 -s \
-  $PRGNAM \
-  vamp-plugin-load-checker \
-  piper-vamp-simple-server \
-  piper-convert \
-  $PKG/usr/bin/
-
-# man page borrowed from Debian
-mkdir -p $PKG/usr/man/man1 $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-gzip -9c < $CWD/$PRGNAM.fr.1 > $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
-iconv -f UTF-8 -t ISO8859-1 $CWD/$PRGNAM.fr.1 \
-  | gzip -9c > $PKG/usr/man/fr/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/share/applications
-sed "/^Icon/s,=.*,=/usr/share/pixmaps/$PRGNAM.png," $PRGNAM.desktop \
-  > $PKG/usr/share/applications/$PRGNAM.desktop
+# man page written by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 # define MIME types to associate *.sv and *.svl
 mkdir -p $PKG/usr/share/mime/packages
 cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml
 
-mkdir -p $PKG/usr/share/pixmaps
-cat icons/sv-128x128.png > $PKG/usr/share/pixmaps/$PRGNAM.png
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG CITATION COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-JACKYN=no; PAYN=no; LIBLOYN=no
-ldd $PKG/usr/bin/$PRGNAM > ldd.out
-#fgrep -q libjack.so ldd.out && JACKYN=yes # jack is dynamically loaded!
-pkg-config --exists jack && JACKYN=yes
-fgrep -q libportaudio.so ldd.out && PAYN=yes
-fgrep -q liblo.so ldd.out && LIBLOYN=yes
+WITH_PA=WITHOUT
+objdump -p $PKG/usr/bin/$PRGNAM | grep -q 'NEEDED.*libportaudio' && WITH_PA=WITH
 
 mkdir -p $PKG/install
-sed \
-  -e "s,@JACKYN@,$JACKYN," \
-  -e "s,@PAYN@,$PAYN," \
-  -e "s,@LIBLOYN@,$LIBLOYN," \
-  $CWD/slack-desc \
-  > $PKG/install/slack-desc
+sed "s,@WITH_PA@,$WITH_PA," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Only add capability stuff if not disabled (and if we built with JACK):
-if [ "${SETCAP:-yes}" = "yes" -a "$JACKYN" = "yes" ]; then
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
   cat $CWD/setcap.sh >> $PKG/install/doinst.sh
   # Only allow execution by audio group
   chown root:audio $PKG/usr/bin/$PRGNAM
diff --git a/audio/sonic-visualiser/sonic-visualiser.fr.1 b/audio/sonic-visualiser/sonic-visualiser.fr.1
deleted file mode 100644
index b55712b9ca..0000000000
--- a/audio/sonic-visualiser/sonic-visualiser.fr.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.TH SONIC-VISUALISER 1 "Novembre 17, 2010"
-.SH NOM
-sonic-visualiser \- affichage et analyse des contenus des fichiers audio de musique
-.SH SYNOPSIS
-.B sonic-visualiser
-[\fIoptions\fR] [\fIfile\fR] ...
-.SH DESCRIPTION
-.B Sonic Visualiser
-est un programme pour afficher et explorer les données audio pour de l'analyse
-et des annontations de musique sémantique.
-.PP
-.B Sonic Visualiser
-pourrait être utile pour les musicologues, les archivistes, les chercheurs dans
-le domaine du traitement de signal, et toute autre personne recherchant un
-moyen facile de jeter un oeil sur ce qui se trouve dans un fichier audio.
-.PP
-Après installatation, l'application est disponible à partir du menu
-.B Applications
-.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-affiche ce message d'aide et quitte
-.TP
-\fB\-\-no\-audio\fR
-Ne pas essayer d'ouvrir un périphérique de sortie audio.
-.TP
-\fB\-\-no\-osc\fR
-Ne pas fournir de port Open Sound Control pour le contrôle à distance.
-.PP
-Un, ou plusieurs, fichiers Sonic Visualiser (.sv) et audio peuvent être fournis.
-.SH "VOIR ÉGALEMENT"
-La documentation complète est disponible en ligne à
-<https://www.sonicvisualiser.org/documentation.html>.
-.SH "AUTEUR"
-sonic-visualisera été écrit par Chris Cannam <cannam@users.sourceforge.net> et
-d'autres.
-.PP
-Cette page de manuel a été écrite par Alessio Treglia <alessio@debian.org>, pour
-le projet Debian (mais peut être utilisée par d'autres).
-.PP
-La version française de cette page de manuel a été traduite par Olivier Humbert
-<trebmuh@tuxfamily.org>, pour le projet LibraZiK (mais peut être utilisée par
-d'autres).
\ No newline at end of file
diff --git a/audio/sonic-visualiser/sonic-visualiser.info b/audio/sonic-visualiser/sonic-visualiser.info
index d8d930cfd6..bea879fc7c 100644
--- a/audio/sonic-visualiser/sonic-visualiser.info
+++ b/audio/sonic-visualiser/sonic-visualiser.info
@@ -1,10 +1,10 @@
 PRGNAM="sonic-visualiser"
-VERSION="4.2"
+VERSION="4.4"
 HOMEPAGE="https://sonicvisualiser.org/"
-DOWNLOAD="https://code.soundsoftware.ac.uk/attachments/download/2755/sonic-visualiser-4.2.tar.gz"
-MD5SUM="8ea411b2014e694f8dfc1a9684f4f538"
+DOWNLOAD="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v4.4/sonic-visualiser-4.4.tar.gz"
+MD5SUM="efb3301b1b55c2f54dd017660cc794d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="liblrdf rubberband vamp-plugin-sdk sord capnproto libfishsound"
+REQUIRES="jack liblrdf rubberband vamp-plugin-sdk sord capnproto libfishsound liblo"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/sonic-visualiser/sonic-visualiser.rst b/audio/sonic-visualiser/sonic-visualiser.rst
new file mode 100644
index 0000000000..f18fb74290
--- /dev/null
+++ b/audio/sonic-visualiser/sonic-visualiser.rst
@@ -0,0 +1,88 @@
+.. RST source for sonic-visualiser(1) man page. Convert with:
+..   rst2man.py sonic-visualiser.rst > sonic-visualiser.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 4.4
+.. |date| date::
+
+================
+sonic-visualiser
+================
+
+--------------------------------------------
+view and analyze the contents of music files
+--------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+sonic-visualiser [*-options*] [*file*] ...
+
+DESCRIPTION
+===========
+
+Sonic Visualiser is an application for viewing and analysing the
+contents of music audio files. The aim of Sonic Visualiser is to be
+the first program you reach for when want to study a musical recording
+rather than simply listen to it.
+
+OPTIONS
+=======
+
+[*file*] ...
+  One or more Sonic Visualiser session files (**.sv**) or audio
+  files may be given as arguments.
+
+**-h**, **--help**
+  Display built-in help.
+
+**-help-all**
+  Display built-in help, including Qt-specific options.
+
+**-v**, **--version**
+  Display Sonic Visualiser version number and exit.
+
+**--no-audio**
+  Do not attempt to open an audio output device.
+
+**-no-osc**
+  Do not provide an Open Sound Control port for remote control.
+
+**--no-splash**
+  Do not show a splash screen.
+
+**--osc-script** *scriptfile*
+  Batch run the Open Sound Control script found in the
+  given file. Supply "-" as file to read from stdin.
+  Scripts consist of /command arg1 arg2 ... OSC control
+  lines, optionally interleaved with numbers to specify
+  pauses in seconds.
+
+**--first-run**
+  Clear any saved settings and reset to first-run behaviour.
+
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/sonic-visualiser-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+sonic-visualiser was initiated and developed in the Centre for Digital
+Music, Queen Mary University, of London. It is currently maintained
+primarily by Chris Cannam at Particular Programs, Ltd.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The sonic-visualiser homepage: https://sonicvisualiser.org/