4 files changed, 42 insertions, 64 deletions
diff --git a/audio/ardour/README b/audio/ardour/README
index ab2819d848..4d95504b53 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -2,4 +2,4 @@ Ardour is an application to fit the needs of musicians under Linux.
 It is designed to be a fully functional professional audio application,
 that uses the professional sound server jack for sound i/o.
 
-cppunit, lua and suil are optional dependencies.
+soundtouch, libwebsockets, cppunit and lua are optional dependencies.
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index 645681d7e7..8dfad24c8d 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ardour
 
 # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2018-2020 Matteo Bernardini, Pisa, Italy
+# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230703 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make .desktop file validate.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ardour
-VERSION=${VERSION:-6.3}
+VERSION=${VERSION:-8.6.0}
+MAJVER=$(echo $VERSION | cut -d. -f1)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,11 +43,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -59,6 +61,15 @@ else
   TARGET="$ARCH"
 fi
 
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -e
 
 rm -rf $PKG
@@ -70,14 +81,14 @@ cd Ardour-$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 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-patch -p1 < $CWD/vendor_qm-dsp.patch
+sed -i "s|env\ python|env\ python3|" waf wscript
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
+CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -89,10 +100,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
   --optimize \
   --freedesktop \
   --no-phone-home \
-  --nls \
-  --ptformat \
-  --lxvst \
-  --cxx11
+  --ptformat
 
 ./waf build
 
@@ -102,12 +110,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/share/{appdata,applications,icons}
-cp build/gtk2_ardour/ardour6.appdata.xml $PKG/usr/share/appdata/
-cp build/gtk2_ardour/ardour6.desktop $PKG/usr/share/applications/
+cp build/gtk2_ardour/ardour$MAJVER.appdata.xml $PKG/usr/share/appdata/
+
+# 20230703 bkw: desktop-file-validate complained about Categories.
+# The desktop menu spec:
+# https://specifications.freedesktop.org/menu-spec/latest/apa.html
+# ...has no such category as AudioEditing.
+sed 's,AudioEditing;,X-&,' build/gtk2_ardour/ardour$MAJVER.desktop \
+  > $PKG/usr/share/applications/ardour$MAJVER.desktop
+
 for isize in 16 22 32 48 ; do
   mkdir -p $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps
   cp gtk2_ardour/icons/application-x-ardour_${isize}px.png \
-    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour6.png
+    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour$MAJVER.png
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -120,12 +135,12 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Let's not clobber config files
-cd $PKG/etc/ardour6
+cd $PKG/etc/ardour$MAJVER
   for i in $(find . -type f) ; do
     mv $i $i.new
-    echo "config etc/ardour6/$i.new" >> $PKG/install/doinst.sh
+    echo "config etc/ardour$MAJVER/$i.new" >> $PKG/install/doinst.sh
   done
 cd -
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.$PKGTYPE
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 78c9f731fc..5a1196d197 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,10 +1,10 @@
 PRGNAM="ardour"
-VERSION="6.3"
+VERSION="8.6.0"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-6.3.tar.xz"
-MD5SUM="f1bca078c08034045e5e46201031e215"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.6.0.tar.bz2"
+MD5SUM="b3f176e79f14988c7b42479214c15184"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv"
+REQUIRES="aubio jack liblo liblrdf rubberband suil cwiid lilv vst3sdk"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/audio/ardour/vendor_qm-dsp.patch b/audio/ardour/vendor_qm-dsp.patch
deleted file mode 100644
index f8265fd6e4..0000000000
--- a/audio/ardour/vendor_qm-dsp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
-index 775098e06b..13f6b9410a 100644
---- i/libs/qm-dsp/wscript
-+++ w/libs/qm-dsp/wscript
-@@ -23,17 +23,10 @@ def options(opt):
-     autowaf.set_options(opt)
- 
- def configure(conf):
--    if conf.is_defined('USE_EXTERNAL_LIBS'):
--        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
--        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
--    else:
--        conf.load('compiler_cxx')
--        autowaf.configure(conf)
-+    conf.load('compiler_cxx')
-+    autowaf.configure(conf)
- 
- def build(bld):
--    if bld.is_defined('USE_EXTERNAL_LIBS'):
--        return
--
-     # Host Library
-     obj = bld(features = 'c cxx cxxstlib')
-     obj.source = '''
-diff --git i/wscript w/wscript
-index 1c9bb1ff5d..95d377d8a7 100644
---- i/wscript
-+++ w/wscript
-@@ -1041,8 +1041,6 @@ def configure(conf):
- 
-     if Options.options.use_external_libs:
-         conf.define('USE_EXTERNAL_LIBS', 1)
--        conf.env.append_value(
--            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
- 
-     if Options.options.boost_include != '':
-         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)