7 files changed, 90 insertions, 15 deletions
diff --git a/source/l/esound/esound-0.2.38-drain.patch b/source/l/esound/esound-0.2.38-drain.patch
new file mode 100644
index 000000000..f2fb716ba
--- /dev/null
+++ b/source/l/esound/esound-0.2.38-drain.patch
@@ -0,0 +1,11 @@
+--- esound-0.2.38/audio_alsa09.c.old	2007-06-11 12:22:24.000000000 +0200
++++ esound-0.2.38/audio_alsa09.c	2007-06-11 12:22:49.000000000 +0200
+@@ -486,7 +486,7 @@ void esd_audio_flush(void)
+ 	}
+ 
+ 	if (alsa_playback_handle != NULL)
+-		snd_pcm_drain( alsa_playback_handle );
++		snd_pcm_drop( alsa_playback_handle );
+   
+ 	if (alsadbg) 
+ 		print_state();
diff --git a/source/l/esound/esound-0.2.38-fix-open-macro.patch b/source/l/esound/esound-0.2.38-fix-open-macro.patch
new file mode 100644
index 000000000..412eb9b6d
--- /dev/null
+++ b/source/l/esound/esound-0.2.38-fix-open-macro.patch
@@ -0,0 +1,10 @@
+--- esound-0.2.38/esddsp.c	2007-04-19 16:43:59.000000000 +0200
++++ esound-0.2.38.lennart/esddsp.c	2007-08-09 17:47:11.000000000 +0200
+@@ -252,6 +252,7 @@
+     return (*func) (pathname, flags, mode);
+ }
+ 
++#undef open
+ int
+ open (const char *pathname, int flags, ...)
+ {
diff --git a/source/l/esound/esound-0.2.41-libm.patch b/source/l/esound/esound-0.2.41-libm.patch
new file mode 100644
index 000000000..cd30322f3
--- /dev/null
+++ b/source/l/esound/esound-0.2.41-libm.patch
@@ -0,0 +1,12 @@
+diff -up esound-0.2.41/Makefile.am.jx esound-0.2.41/Makefile.am
+--- esound-0.2.41/Makefile.am.jx	2008-11-18 12:33:39.000000000 -0500
++++ esound-0.2.41/Makefile.am	2012-11-07 13:00:47.095346842 -0500
+@@ -125,7 +125,7 @@ esdplay_SOURCES = \
+ 
+ LDADD = libesd.la $(AUDIOFILE_LIBS)
+ 
+-esd_LDADD = $(WRAP_LIB) $(LDADD)
++esd_LDADD = $(WRAP_LIB) $(LDADD) -lm
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
diff --git a/source/l/esound/esound-nospawn.patch b/source/l/esound/esound-nospawn.patch
new file mode 100644
index 000000000..3d5b6463d
--- /dev/null
+++ b/source/l/esound/esound-nospawn.patch
@@ -0,0 +1,12 @@
+diff -up esound-0.2.41/esd_config.c.nospawn esound-0.2.41/esd_config.c
+--- esound-0.2.41/esd_config.c.nospawn	2009-03-31 23:57:35.860368388 -0400
++++ esound-0.2.41/esd_config.c	2009-03-31 23:57:51.032658859 -0400
+@@ -6,7 +6,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ 
+-int esd_no_spawn=0; /* If we can't even find the system config file,
++int esd_no_spawn=1; /* If we can't even find the system config file,
+ 		       things are screwed up - don't try to make things
+ 		       worse. */
+ int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an
diff --git a/source/l/esound/esound.SlackBuild b/source/l/esound/esound.SlackBuild
index c7894fcd0..b3261e5c8 100755
--- a/source/l/esound/esound.SlackBuild
+++ b/source/l/esound/esound.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,31 +20,39 @@
 #  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)
 
 PKGNAM=esound
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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 "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -59,8 +67,8 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -70,6 +78,14 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/esound-0.2.38-drain.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/esound-0.2.38-fix-open-macro.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/esound-0.2.41-libm.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/esound-nospawn.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/remove-confusing-spew.patch.gz | patch -p1 --verbose || exit 1
+
+autoreconf -vif
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,12 +95,15 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Don't clobber an existing esd.conf
 mv $PKG/etc/esd.conf $PKG/etc/esd.conf.new
 
diff --git a/source/l/esound/remove-confusing-spew.patch b/source/l/esound/remove-confusing-spew.patch
new file mode 100644
index 000000000..ac46cb954
--- /dev/null
+++ b/source/l/esound/remove-confusing-spew.patch
@@ -0,0 +1,11 @@
+diff -up esound-0.2.38/esdlib.c.spew esound-0.2.38/esdlib.c
+--- esound-0.2.38/esdlib.c.spew	2007-04-19 10:43:59.000000000 -0400
++++ esound-0.2.38/esdlib.c	2007-09-19 08:45:44.000000000 -0400
+@@ -479,7 +479,6 @@ esd_connect_tcpip(const char *host)
+          strcpy ( connect_host, "localhost" );
+ 
+        if ( getaddrinfo ( connect_host, NULL, &hints, &result ) != 0 ) {
+-         printf ("Usage:program_name [address][:port]");
+          return (-1);
+        }
+ 
diff --git a/source/l/esound/slack-desc b/source/l/esound/slack-desc
index 74da12178..e9e63631c 100644
--- a/source/l/esound/slack-desc
+++ b/source/l/esound/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
@@ -12,7 +12,7 @@ esound: EsounD, the Enlightened Sound Daemon, is a server process that mixes
 esound: several audio streams for playback by a single audio device. For
 esound: example, if you're listening to music on a CD and you receive a
 esound: sound-related event from ICQ, the two applications won't have to
-esound: jockey for the use of your sound card.  Install esound if you'd like
+esound: jockey for the use of your sound card. Install esound if you'd like
 esound: to let sound applications share your audio device.
 esound:
 esound: