From b227f10203ff5f9e4b9193fb60246c3cf94041e7 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 8 Apr 2022 13:11:26 -0400 Subject: [PATCH] audio/atunes: Make arch-dependent (not noarch). Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- audio/atunes/README | 3 +++ audio/atunes/atunes.SlackBuild | 44 +++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/audio/atunes/README b/audio/atunes/README index 07b10c9706..b8546dc1ea 100644 --- a/audio/atunes/README +++ b/audio/atunes/README @@ -4,3 +4,6 @@ Windows, Linux and Unix-like systems, ... Currently plays mp3, ogg, wma, wav, flac, mp4 and radio streaming, allowing users to easily edit tags, organize music and rip Audio CDs. + +Note: Global Hotkey support only works on 32-bit x86. On x86_64 and +other (arm, etc) architectures, the global hotkey feature is disabled. diff --git a/audio/atunes/atunes.SlackBuild b/audio/atunes/atunes.SlackBuild index 71ce3de450..c7f91c1b35 100644 --- a/audio/atunes/atunes.SlackBuild +++ b/audio/atunes/atunes.SlackBuild @@ -3,17 +3,28 @@ # Slackware build script for aTunes # Written by Diogo Leal(estranho) - diogo@diogoleal.com +# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2: +# - this isn't quite noarch. remove 32-bit libJXGrabKey.so +# from the package for non-x86 ARCH. +# - add a /usr/bin/atunes wrapper. +# - absolute path to icon in .desktop file. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=atunes VERSION=${VERSION:-3.1.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# 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 "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -23,8 +34,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -ARCH=noarch - set -e rm -rf $PKG @@ -36,9 +45,9 @@ 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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ cp aTunes.sh aTunes chmod +x aTunes @@ -52,6 +61,25 @@ install -D -m 644 $CWD/atunes.png $PKG/usr/share/pixmaps/atunes.png 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 +# 20220408 bkw: the precompiled JNI library needed for global hotkey +# support is 32-bit x86. remove it from the package if we can't use it. +case "$ARCH" in + i?86) ;; # OK + *) rm -f $PKG/opt/aTunes/libJXGrabKey.so ;; +esac + +# 20220408 bkw: add this wrapper so we can run the app from the shell +# just by typing its name. +mkdir -p $PKG/usr/bin +cat > $PKG/usr/bin/$PRGNAM < $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild