mixxx: update to 2.3.2

1 files changed, 31 insertions, 47 deletions

diff --git a/mixxx/build/mixxx.SlackBuild b/mixxx/build/mixxx.SlackBuild
index 051bf7a6..67031978 100755
--- a/mixxx/build/mixxx.SlackBuild
+++ b/mixxx/build/mixxx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2020  Eric Hameleers, Eindhoven. NL
+# Copyright 2020, 2022  Eric Hameleers, Eindhoven. NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -41,6 +41,8 @@
 #              * Recompiled against new protobuf.
 # 2.2.4-4:     11/dec/2020 by Eric Hameleers <alien@slackware.com>
 #              * Rebuilt against the "Big Merge" update of 7-dec-20.
+# 2.3.2-1:     27/feb/2022 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh mixxx.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -49,11 +51,12 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=mixxx
-VERSION=${VERSION:-2.2.4}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-2.3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
-DOCS="CHANGELOG CODE_OF_CONDUCT.md COPYING LICENSE Mixxx-Manual.pdf README*"
+DOCS="CHANGELOG.md CODE_OF_CONDUCT.md COPYING LICENSE README* \
+  res/Mixxx-Keyboard-Shortcuts.pdf"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -63,8 +66,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-release-${VERSION}.tar.gz"
-SRCURL="https://github.com/${PRGNAM}dj/${PRGNAM}/archive/release-${VERSION}.tar.gz"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="https://github.com/${PRGNAM}dj/${PRGNAM}/archive/${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -155,52 +158,33 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
-cd ${PRGNAM}-release-${VERSION}
-
-# See https://github.com/mixxxdj/mixxx/commit/03fad27
-cat $SRCDIR/patches/mixxx_list-fix.patch \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+cd ${PRGNAM}-${VERSION}
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
-# Fix library installation path (thanks to SBo):
-sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript
-sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript
-
-# Scons is now python3 based (thanks ponce, this was really bugging me!):
-sed -i "s|from features|from .features|" build/depends.py
-
-# Scons ignores MAKEFLAGS and will autodetect your cores. If you want
-# a custom parallellization, change this setting:
-export SCONSFLAGS="-j $(nproc)"
-
-CFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-QTDIR=/usr/lib$LIBDIRSUFFIX/qt5 \
-scons \
-  build=release \
-  prefix=/usr \
-  target=linux \
-  faad=1 \
-  ffmpeg=1 \
-  lilv=1 \
-  modplug=1 \
-  opus=1 \
-  qt_sqlite_plugin=0 \
-  qtkeychain=1 \
-  shoutcast=1 \
-  test=0 \
-  vamp=1 \
-  virtualize=0 \
-  wv=1 \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-scons install \
-  prefix=/usr \
-  install_root=$PKG/usr \
-  2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+  CFLAGS="$SLKCFLAGS" \
+  LDFLAGS="$SLKLDFLAGS" \
+  QTDIR=/usr/lib$LIBDIRSUFFIX/qt5 \
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -Wno-dev \
+    .. \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+cd - 1>/dev/null
 
 # Add 'X-DAW' category to the desktop file (for liveslak):
 for DESKTOPF in $PKG/usr/share/applications/*.desktop ; do