audio/rubberband: Updated for version 1.8.2.

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

4 files changed, 40 insertions, 9 deletions

diff --git a/audio/rubberband/README b/audio/rubberband/README
index 84db144df112..75bc642786c3 100644
--- a/audio/rubberband/README
+++ b/audio/rubberband/README
@@ -1,2 +1,9 @@
+rubberband (audio time-stretching and pitch-shifting)
+
 Rubber Band is a library and utility program that permits you to change 
 the tempo and pitch of an audio recording independently of one another.
+
+Starting with version 1.8.2, rubberband can be built with optional Java
+JNI support. To do this, install jdk or openjdk, make sure its profile
+script has been sourced (normally by logging out & back in), and build
+rubberband with JAVA=yes set in the environment.
diff --git a/audio/rubberband/rubberband.SlackBuild b/audio/rubberband/rubberband.SlackBuild
index 709220fd085f..c4bcaa16582e 100644
--- a/audio/rubberband/rubberband.SlackBuild
+++ b/audio/rubberband/rubberband.SlackBuild
@@ -2,9 +2,17 @@
 
 # Slackware build script for rubberband
 
-# Written by Luis Henrique <lmello.009@gmail.com>
+# Written by Luis Henrique <email removed>
+
+# Modified by B. Watson <yalhcru@gmail.com>. Original had no license.
+# Modified version licensed under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20180702 bkw:
+# - update for v1.8.2
+# - add optional Java support.
+# - add license to script.
 
-# Modified by B. Watson <yalhcru@gmail.com>
 # 20140915 bkw:
 # - took over maintenance
 # - get rid of static lib
@@ -13,8 +21,8 @@
 # - add man page
 
 PRGNAM=rubberband
-VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.8.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,6 +70,10 @@ find -L . \
 # Fixup libdir on x86_64
 sed -i "s,\<lib\>,lib$LIBDIRSUFFIX,g" Makefile.in *.pc.in
 
+# For 1.8.2, the Makefile tries to install the JNI stuff even if
+# we don't build it.
+sed -i '/cp *-f .*JNI_TARGET/s,$, || true,' Makefile.in
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,6 +82,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
+
+# 20180703 bkw: build java JNI stuff if we have javac in $PATH and
+# the user says JAVA=yes. Disabled by default because we have too many
+# choices for java compilers, and I can't be bothered to test them all
+# (jdk, openjdk 6 through 8, zulu-openjdk 6 thru 8). Plain "make"
+# doesn't build this...
+WITHJAVA=without
+if [ "${JAVA:-no}" = "yes" ] && which javac &>/dev/null; then
+  make lib$LIBDIRSUFFIX/librubberband-jni.so
+  WITHJAVA=with
+fi
+
 make install DESTDIR=$PKG
 
 # We don't need the static lib
@@ -87,7 +111,7 @@ cp -a CHANGELOG COPYING README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHJAVA@,$WITHJAVA," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/rubberband/rubberband.info b/audio/rubberband/rubberband.info
index 5564319eaf32..e171e2c668b4 100644
--- a/audio/rubberband/rubberband.info
+++ b/audio/rubberband/rubberband.info
@@ -1,8 +1,8 @@
 PRGNAM="rubberband"
-VERSION="1.8.1"
+VERSION="1.8.2"
 HOMEPAGE="http://www.breakfastquay.com/rubberband"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/rubberband-1.8.1.tar.bz2"
-MD5SUM="6c2b4e18a714bcc297d0db81a10f9348"
+DOWNLOAD="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
+MD5SUM="db0ecb4f1a647bdaf7e43ef2ca2f7883"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ladspa_sdk vamp-plugin-sdk"
diff --git a/audio/rubberband/slack-desc b/audio/rubberband/slack-desc
index c8a95403af92..65e2344901ed 100644
--- a/audio/rubberband/slack-desc
+++ b/audio/rubberband/slack-desc
@@ -14,6 +14,6 @@ rubberband: another.
 rubberband:
 rubberband: Homepage: http://breakfastquay.com/rubberband
 rubberband:
-rubberband:
+rubberband: This package was built @WITHJAVA@ Java JNI support.
 rubberband:
 rubberband: