3 files changed, 41 insertions, 43 deletions
diff --git a/audio/mixxx/README b/audio/mixxx/README
index e029f97fab..e8e1406e74 100644
--- a/audio/mixxx/README
+++ b/audio/mixxx/README
@@ -5,7 +5,3 @@ and FLAC playback, pitch independent time stretch, vinyl emulation,
 wave recording, BPM detection, multichannel and multiple soundcard
 support, MIDI controllers support and scripting engine, a skinnable
 interface.
-
-NOTE: mixxx uses scons to build so it will ignore your MAKEFLAGS
-jobs settings: it will instead autodetect the number of cores and
-start a proper jobs number accordingly.
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index d29e4a1da6..05d95e62b7 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mixxx
 
 # Copyright 2011 Elvio "HelLViS69" Basello <hellvis69@gmail.com>
-# Copyright 2018-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2018-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,14 @@
 
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mixxx
-VERSION=${VERSION:-2.2.4}
+VERSION=${VERSION:-2.3.6}
+KEYFVER=${KEYFVER:-2.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,44 +73,33 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-release-$VERSION
-tar xvf $CWD/$PRGNAM-release-$VERSION.tar.gz
-cd $PRGNAM-release-$VERSION
+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 \
+  -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 {} \;
-
-# Fix library installation path
-sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1
-sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1
-
-export SCONSFLAGS="-j $(nproc)"
-CFLAGS="$SLKCFLAGS" \
-QTDIR=/usr/lib$LIBDIRSUFFIX/qt5 \
-scons \
-  shoutcast=1 \
-  faad=1 \
-  modplug=1 \
-  opus=1 \
-  build=release \
-  virtualize=0 \
-  qt_sqlite_plugin=0 \
-  vamp=1 \
-  lilv=1 \
-  wv=1 \
-  install_root=$PKG/usr \
-  prefix=/usr \
-  install
-
-rm -f $PKG/usr/bin/$PRGNAM-test
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  mkdir -p downloads
+  cp -a $CWD/libkeyfinder-$KEYFVER.zip downloads/
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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
 
-mkdir $PKG/usr/doc
+mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -109,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index 4d9d06a3df..cde9885a16 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -1,10 +1,12 @@
 PRGNAM="mixxx"
-VERSION="2.2.4"
+VERSION="2.3.6"
 HOMEPAGE="https://www.mixxx.org"
-DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.2.4/mixxx-release-2.2.4.tar.gz"
-MD5SUM="25bbebca0187254db4d1c53dc0bdd77d"
+DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/2.3.6/mixxx-2.3.6.tar.gz \
+          https://github.com/mixxxdj/libkeyfinder/archive/v2.2.6/libkeyfinder-2.2.6.zip"
+MD5SUM="4a8e6aa35bec7240a02f27afa65754d5 \
+        8a6f2a59265aa16fbbd532b83fa45541"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf qt5 rubberband speex vamp-plugin-sdk"
+REQUIRES="chromaprint faad2 hidapi libmodplug libmp4v2 libshout lilv opencore-amr portaudio portmidi protobuf3 rubberband"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"