1 files changed, 35 insertions, 22 deletions
diff --git a/audio/setBfree/setBfree.SlackBuild b/audio/setBfree/setBfree.SlackBuild
index 6e2ea8c4ba..722242abc9 100644
--- a/audio/setBfree/setBfree.SlackBuild
+++ b/audio/setBfree/setBfree.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for setBfree
 
-# Copyright 2019  Johannes Schoepfer, Germany
+# Copyright 2020-2023  Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=setBfree
-VERSION=${VERSION:-0.8.11}
+VERSION=${VERSION:-0.8.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -70,19 +77,19 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p0 < $CWD/libdir.patch
+patch -p1 < $CWD/setbfree-0.8.11-gl.patch
 
+export FONTFILE=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf 
 make clean
-make \
-  PREFIX=/usr OPTIMIZATIONS="$SLKCFLAGS" \
-  FONTFILE=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-make \
-  PREFIX=/usr DESTDIR=$PKG LIBDIR="lib$LIBDIRSUFFIX" \
-  FONTFILE=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf \
-  install
+make PREFIX=/usr LIBDIR=lib$LIBDIRSUFFIX OPTIMIZATIONS="$SLKCFLAGS"
+make PREFIX=/usr LIBDIR=lib$LIBDIRSUFFIX DESTDIR=$PKG install
 
 mkdir -p $PKG/usr/share/pixmaps
-cp doc/{$PRGNAM,x42-whirl}.png \
+cp doc/*.png \
   $PKG/usr/share/pixmaps/
+mkdir -p $PKG/usr/share/applications
+cp $CWD/{$PRGNAM,x42-whirl}.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/man/man1
 cp doc/*.1 $PKG/usr/man/man1/
 # remove jboverdrive man page, https://github.com/pantherb/setBfree/issues/46
@@ -96,22 +103,28 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog README.md doc/*.png \
+  AUTHORS ChangeLog COPYING README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+cd $PKG
 if [ "${SETCAP:-yes}" = "yes" ]; then
-  for bin in $(ls $PKG/usr/bin/); do
-    if [ $(readelf -d $PKG/usr/bin/$bin | grep libjack.so &> /dev/null) ]; then
-      echo "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$bin" >> $PKG/install/doinst.sh
-      chown root:audio $PKG/usr/bin/$bin
-      chmod 0750 $PKG/usr/bin/$bin
-    fi
+  for bin in $(find . -type f -exec file '{}' + | grep " ELF .* executable, " | cut -f 1 -d : ); do
+    [ -n "$(readelf -d $bin | grep libjack.so)" ] && \
+      jackbin+=" $bin" && chown root:audio $PKG/$bin && chmod 0750 $PKG/$file
   done
+  if [ -n "$jackbin" ]; then
+	cat <<- EOF >> $PKG/install/doinst.sh
+	if [ -x /sbin/setcap ]; then
+	  for file in$jackbin; do
+	    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep \$file
+	  done
+	fi
+	EOF
+  fi
 fi
-
-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