libraries/lame: Updated for version 3.100, new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 32 insertions, 25 deletions

diff --git a/libraries/lame/README b/libraries/lame/README
index b196d4079f..6e4fe7db20 100644
--- a/libraries/lame/README
+++ b/libraries/lame/README
@@ -1,3 +1,5 @@
+lame (LAME Ain't an Mp3 Encoder)
+
 LAME is an educational tool to be used for learning about MP3 encoding.
 The goal of the LAME project is to use the open source model to improve
 the psycho acoustics, noise shaping, and speed of MP3.
diff --git a/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild
index 2b44132473..368f47b1ee 100644
--- a/libraries/lame/lame.SlackBuild
+++ b/libraries/lame/lame.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
 # Copyright 2008,2010  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2019 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +24,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20191231 bkw:
+# - take over maintenance
+# - update for v3.100
+
 PRGNAM=lame
-VERSION=${VERSION:-3.99.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.100}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,20 +71,21 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix for the newer gcc
-# http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html
-case $(uname -m) in
-  i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
-esac
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# This stuff isn't needed for 3.100, but keep compatibility with the
+# old 3.99.5 version:
+if [ "$VERSION" = "3.99.5" ]; then
+  # Fix for the newer gcc
+  # http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html
+  case "$ARCH" in
+    i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
+  esac
 
-# Fix CVE-2017-15018
-zcat $CWD/CVE-2017-15018.patch.gz | patch -p1
+  # Fix CVE-2017-15018
+  zcat $CWD/CVE-2017-15018.patch.gz | patch -p1
+fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -94,12 +102,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make pkgdocdir=/usr/doc/$PRGNAM-$VERSION
-make install pkgdocdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip pkgdocdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a API COPYING ChangeLog DEFINES HACKING INSTALL* LICENSE README* \
diff --git a/libraries/lame/lame.info b/libraries/lame/lame.info
index 88b34affad..3ce4d08494 100644
--- a/libraries/lame/lame.info
+++ b/libraries/lame/lame.info
@@ -1,10 +1,10 @@
 PRGNAM="lame"
-VERSION="3.99.5"
+VERSION="3.100"
 HOMEPAGE="http://lame.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/lame/lame-3.99.5.tar.gz"
-MD5SUM="84835b313d4a8b68f5349816d33e07ce"
+DOWNLOAD="http://downloads.sourceforge.net/lame/lame-3.100.tar.gz"
+MD5SUM="83e260acbe4389b54fe08e0bdbf7cddb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"