qjackctl: updated to 0.9.0

1 files changed, 34 insertions, 21 deletions

diff --git a/qjackctl/build/qjackctl.SlackBuild b/qjackctl/build/qjackctl.SlackBuild
index e0e3dee4..225ad8b0 100755
--- a/qjackctl/build/qjackctl.SlackBuild
+++ b/qjackctl/build/qjackctl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009, 2013, 2019, 2020  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2013, 2019, 2020, 2021  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,6 +40,10 @@
 #             * Update.
 # 0.6.2-1:    09/jun/2020 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 0.6.3-1:    10/oct/2020 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 0.9.0-1:    03/jan/2021 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh qjackctl.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -50,7 +54,7 @@
 # Set initial variables:
 
 PRGNAM=qjackctl
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -162,25 +166,34 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
-touch $OUTPUT/configure-${PRGNAM}.log
-[ ! -x configure ] && autoreconf -vif \
-  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$TARGET \
-  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
-
-make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+export LDFLAGS="$SLKLDFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+  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 \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    .. \
+    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
+  if ! grep -q X-DAW $DESKTOPF ; then
+    sed -i $DESKTOPF \
+      -e "s/^Categories=\(.*\)/Categories=X-DAW;\1/"
+  fi
+done
 
 # Only allow execution by user in 'audio' group:
 chown root:audio $PKG/usr/bin/*