From 439fd63c2590971368a4c628efb47356082bf1ee Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 4 Dec 2018 01:46:12 -0500
Subject: audio/alsa-tools: Updated for version 1.1.7.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 audio/alsa-tools/alsa-tools.SlackBuild | 20 ++++++++------------
 audio/alsa-tools/alsa-tools.info       |  6 +++---
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'audio/alsa-tools')

diff --git a/audio/alsa-tools/alsa-tools.SlackBuild b/audio/alsa-tools/alsa-tools.SlackBuild
index d4e1e4eef037..4f29bff88dce 100644
--- a/audio/alsa-tools/alsa-tools.SlackBuild
+++ b/audio/alsa-tools/alsa-tools.SlackBuild
@@ -13,6 +13,7 @@
 # the firmware is being included in the package as well.
 # *** I agree.  --rworkman   :-)
 
+# 20181204 bkw: update for 1.1.7
 # 20180614 bkw: update for 1.1.6
 # 20171214 bkw: update for 1.1.5
 
@@ -32,7 +33,7 @@
 # 20140219 bkw: fix .desktop files so they validate
 
 PRGNAM=alsa-tools
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-1.1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,11 +80,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
@@ -152,11 +150,8 @@ rm -rf $FIRMWARE-$FIRMVER
 tar xvf $CWD/$FIRMWARE-$FIRMVER.tar.bz2
 cd $FIRMWARE-$FIRMVER
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -188,7 +183,8 @@ sed -i \
 # Niels Horn pointed out that some of the firmware shipped with this
 # package conflicts with Slackware's kernel-firmware package. The files
 # are identical, so just leave them out of this build.
-( cd $PKG/lib/firmware ; rm -rf ess korg sb16 yamaha )
+# 20181204 bkw: add a couple more files to this list.
+( cd $PKG/lib/firmware ; rm -rf ess korg sb16 yamaha ctspeq.bin ctefx.bin )
 
 # remove the hotplug scripts, since Slackware 13.37 & up doesn't use hotplug.
 # Instead, they've been converted to udev rules.
diff --git a/audio/alsa-tools/alsa-tools.info b/audio/alsa-tools/alsa-tools.info
index 289f635138e5..25d8d2a31f67 100644
--- a/audio/alsa-tools/alsa-tools.info
+++ b/audio/alsa-tools/alsa-tools.info
@@ -1,9 +1,9 @@
 PRGNAM="alsa-tools"
-VERSION="1.1.6"
+VERSION="1.1.7"
 HOMEPAGE="http://www.alsa-project.org/"
-DOWNLOAD="ftp://ftp.alsa-project.org/pub/tools/alsa-tools-1.1.6.tar.bz2 \
+DOWNLOAD="ftp://ftp.alsa-project.org/pub/tools/alsa-tools-1.1.7.tar.bz2 \
           ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-1.0.29.tar.bz2"
-MD5SUM="5ca8c9437ae779997cd62fb2815fef19 \
+MD5SUM="475bdf6457bcf55c8c895d653ee56a54 \
         9a1182f8a6ac44cb9af5774cc045565f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3