From e1fae02ca49cf443ef27a4a77a1d65c5e6440f88 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Thu, 11 Jan 2018 23:03:55 -0500
Subject: multimedia/xmms-crossfade: New maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 multimedia/xmms-crossfade/README                   |  2 ++
 .../xmms-crossfade/xmms-crossfade.SlackBuild       | 35 +++++++++++++++-------
 multimedia/xmms-crossfade/xmms-crossfade.info      |  4 +--
 3 files changed, 29 insertions(+), 12 deletions(-)

(limited to 'multimedia/xmms-crossfade')

diff --git a/multimedia/xmms-crossfade/README b/multimedia/xmms-crossfade/README
index 095c33b555..3272c8660c 100644
--- a/multimedia/xmms-crossfade/README
+++ b/multimedia/xmms-crossfade/README
@@ -1,3 +1,5 @@
+xmms-crossfade (A Crossfade/Gapless plugin for XMMS)
+
 This plugin can be used to remove the gaps between two songs, or to 
 smoothly crossfade inbetween.
 
diff --git a/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild b/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
index 30ae8889a3..4dc4e8e6b9 100644
--- a/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
+++ b/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
@@ -2,7 +2,20 @@
 
 # Slackware build script for xmms-crossfade
 
-# Written by Luis Henrique <lmello.009@gmail.com>
+# Written by Luis Henrique <email removed>
+
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20180111 bkw:
+# - take over maintenance
+# - i486 => i586
+# - minor script cleanups
+
+# 20180111 bkw: note: the dire warnings about using an unpatched
+# XMMS don't seem to matter: I can't get it to segfault in the ways
+# described. If anyone does have segfaults, please let me know.
 
 PRGNAM=xmms-crossfade
 VERSION=${VERSION:-0.3.14}
@@ -11,7 +24,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,12 +35,16 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# 20180111 bkw: TODO: investigate FFTW and ID3 stuff, see if it's stable
+# and useful or not. These defaults are the way I found them, and they seem
+# to have come from upstream's recommendations.
+
 SAMPLERATE=${SAMPLERATE:-yes}	# enable libsamplerate support
 FFTW=${FFTW:-no}		# enable FFTW test code
 ID3=${ID3:-no}			# enable libid3 support for reading track number
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -45,10 +62,11 @@ 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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
+LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS -fgnu89-inline" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -69,11 +87,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install 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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/xmms-crossfade/xmms-crossfade.info b/multimedia/xmms-crossfade/xmms-crossfade.info
index 7595c4b6ae..1b82ba026b 100644
--- a/multimedia/xmms-crossfade/xmms-crossfade.info
+++ b/multimedia/xmms-crossfade/xmms-crossfade.info
@@ -6,5 +6,5 @@ MD5SUM="026c52544c7f3193d384288c9f8296aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Luis Henrique"
-EMAIL="lmello.009@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
-- 
cgit v1.2.3