1 files changed, 19 insertions, 37 deletions
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index 47e63d66f4..4d23b287f9 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -3,7 +3,7 @@
 # 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-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mixxx
-VERSION=${VERSION:-2.2.4}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,9 +72,9 @@ 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 \
@@ -82,42 +82,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# scons is now python3 based
-sed -i "s|from features|from .features|" build/depends.py
-
-# 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
-
-# 20201104 bkw: Install udev rules to $PKG/etc, not the real /etc!
-# The dir has to already exist, too.
-sed -i "s,/etc/udev,$PKG&," src/SConscript
-mkdir -p $PKG/etc/udev/rules.d
-
-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
+mkdir -p build
+cd build
+  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 ..
+
+mkdir -p $PKG/etc
+mv $PKG/usr/share/mixxx/udev $PKG/etc/
 
 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