audio/lv2file: Updated for version 0.84.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 23 insertions, 28 deletions

diff --git a/audio/lv2file/argtable.diff b/audio/lv2file/argtable.diff
deleted file mode 100644
index 7bb25f8edf..0000000000
--- a/audio/lv2file/argtable.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2012-05-18 22:32:47.000000000 -0400
-+++ b/Makefile	2014-02-09 05:51:36.000000000 -0500
-@@ -1,5 +1,5 @@
--CFLAGS = -O3 -Wall -Wextra --std=c99 `pkg-config --cflags argtable2 sndfile lilv-0`
--LDLIBS = `pkg-config --libs argtable2 sndfile lilv-0` -lm
-+CFLAGS = -O3 -Wall -Wextra --std=c99 `pkg-config --cflags sndfile lilv-0`
-+LDLIBS = `pkg-config --libs sndfile lilv-0` -largtable2 -lm
- BINDIR = $(DESTDIR)/usr/bin
- INSTALL_PROGRAM = install
- 
diff --git a/audio/lv2file/lv2file.SlackBuild b/audio/lv2file/lv2file.SlackBuild
index 2533771459..629d166bda 100644
--- a/audio/lv2file/lv2file.SlackBuild
+++ b/audio/lv2file/lv2file.SlackBuild
@@ -6,8 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20141021 bkw:
+# update for 0.84, get rid of argtable patch as it's no longer needed.
+
 PRGNAM=lv2file
-VERSION=${VERSION:-0.83}
+VERSION=${VERSION:-0.84}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,23 +43,26 @@ fi
 
 set -e
 
+# The man page is in the debian archive, which might be an older
+# version than the release. For 0.84, the 0.83 man page is still valid.
+MANVER=0.83
+
+# download file has different name depending whether the Content-Disposition
+# header is honored.
+[ -e $CWD/$PRGNAM-upstream-$VERSION.tar.gz ] && \
+  mv $CWD/$PRGNAM-upstream-$VERSION.tar.gz $CWD/$VERSION.tar.gz
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+rm -rf $PRGNAM-upstream-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-upstream-$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 {} \;
 
-# The argtable on SBo is too old to have a pkg-config .pc file, so patch
-# the Makefile to not require it.
-patch -p1 < $CWD/argtable.diff
+# egregious permissions, instead of find/chown do this:
+chmod 755 .
+chmod 644 *
 
 if [ "${FORCE_SLACK_FLAGS:-no}" = "yes" ]; then
   sed -i "s/-O3/$SLKCFLAGS/" Makefile
@@ -70,7 +76,7 @@ make install DESTDIR=$PKG
 
 # Use the debian man page (which is actually by the lv2file author,
 # I dunno why it's not in the lv2file source distrib to begin with)
-tar xvf $CWD/${PRGNAM}_$VERSION-1.debian.tar.gz debian/$PRGNAM.1
+tar xvf $CWD/${PRGNAM}_$MANVER-1.debian.tar.gz debian/$PRGNAM.1
 mkdir -p $PKG/usr/man/man1
 gzip -9c < debian/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
diff --git a/audio/lv2file/lv2file.info b/audio/lv2file/lv2file.info
index 1ba08ee75d..97bc4bff9f 100644
--- a/audio/lv2file/lv2file.info
+++ b/audio/lv2file/lv2file.info
@@ -1,9 +1,9 @@
 PRGNAM="lv2file"
-VERSION="0.83"
+VERSION="0.84"
 HOMEPAGE="https://github.com/jeremysalwen/lv2file"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/l/lv2file/lv2file_0.83.orig.tar.gz
+DOWNLOAD="https://github.com/jeremysalwen/lv2file/archive/upstream/0.84.tar.gz \
           http://ftp.debian.org/debian/pool/main/l/lv2file/lv2file_0.83-1.debian.tar.gz"
-MD5SUM="3a2d1d1d118b581166afdae525e22715
+MD5SUM="259719c6291d4b774db3e3a485e12d18 \
         e73910547be4c8f37d43bde140e5096e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""