summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author ArTourter <artourter@gmail.com>2015-11-21 09:39:51 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2015-11-21 09:39:59 +0700
commitab3a6b708f3fb8b20bd04e99ee0ad51119f13e07 (patch)
tree9eb6f0623115fbe19de3b60c70ce64c7527373a9
parent736d73a2c6b71473804f4bf14a00f1352e0dc560 (diff)
downloadslackbuilds-ab3a6b708f3fb8b20bd04e99ee0ad51119f13e07.tar.gz
slackbuilds-ab3a6b708f3fb8b20bd04e99ee0ad51119f13e07.tar.xz
multimedia/cuetools: Updated for version 1.4.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/cuetools/cuetag-fix_spaces.diff46
-rw-r--r--multimedia/cuetools/cuetag.patch38
-rw-r--r--multimedia/cuetools/cuetools.SlackBuild10
-rw-r--r--multimedia/cuetools/cuetools.info6
-rw-r--r--multimedia/cuetools/fix_build_with_automake-1.12.diff24
5 files changed, 6 insertions, 118 deletions
diff --git a/multimedia/cuetools/cuetag-fix_spaces.diff b/multimedia/cuetools/cuetag-fix_spaces.diff
deleted file mode 100644
index f240e9d375..0000000000
--- a/multimedia/cuetools/cuetag-fix_spaces.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From 21ee6cc40f02693928efbc4f3beeb681950c16b5 Mon Sep 17 00:00:00 2001
-From: Svend Sorensen <svend@ciffer.net>
-Date: Sat, 23 Nov 2013 17:23:01 -0800
-Subject: [PATCH] cuetag: Fix handling of spaces in file names
-
-Fixes #14
----
- src/tools/cuetag.sh | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
-index f26fa20..448920f 100755
---- a/src/tools/cuetag.sh
-+++ b/src/tools/cuetag.sh
-@@ -182,16 +182,15 @@ main()
- ntrack=$(cueprint -d '%N' "$cue_file")
- trackno=1
-
-- FILES= FIELDS=
-+ NUM_FILES=0 FIELDS=
- for arg in "$@"; do
- case "$arg" in
-- *.*) FILES="$FILES $arg";;
-+ *.*) NUM_FILES=$(expr $NUM_FILES + 1);;
- *) FIELDS="$FIELDS $arg";;
- esac
- done
-
-- set -- $FILES
-- if [ $# -ne $ntrack ]; then
-+ if [ $NUM_FILES -ne $ntrack ]; then
- echo "warning: number of files does not match number of tracks"
- fi
-
-@@ -209,7 +208,7 @@ main()
- *.[Tt][Xx][Tt])
- vorbis $trackno "$file"
- ;;
-- *)
-+ *.*)
- echo "$file: uknown file type"
- ;;
- esac
---
-1.8.5.1
-
diff --git a/multimedia/cuetools/cuetag.patch b/multimedia/cuetools/cuetag.patch
deleted file mode 100644
index ffda639c28..0000000000
--- a/multimedia/cuetools/cuetag.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- extras/cuetag.sh 2006-09-06 14:24:47.000000000 -0400
-+++ extras/cuetag.sh 2007-01-26 00:13:23.000000000 -0500
-@@ -63,7 +63,7 @@
- (for field in $fields; do
- value=""
- for conv in `eval echo \\$$field`; do
-- value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+ value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
-
- if [ -n "$value" ]; then
- echo "$field=$value"
-@@ -96,7 +96,7 @@
- for field in $fields; do
- value=""
- for conv in `eval echo \\$$field`; do
-- value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+ value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
-
- if [ -n "$value" ]; then
- break
-@@ -141,14 +141,14 @@
- cue_file=$1
- shift
-
-- ntrack=`cueprint -d '%N' $cue_file`
-+ ntrack=`cueprint -d '%N' "$cue_file"`
- trackno=1
-
- if [ $# -ne $ntrack ]; then
- echo "warning: number of files does not match number of tracks"
- fi
-
-- for file in $@; do
-+ for file in "$@"; do
- case $file in
- *.[Ff][Ll][Aa][Cc])
- vorbis $trackno "$file"
-
diff --git a/multimedia/cuetools/cuetools.SlackBuild b/multimedia/cuetools/cuetools.SlackBuild
index 257cfc8a05..37113df872 100644
--- a/multimedia/cuetools/cuetools.SlackBuild
+++ b/multimedia/cuetools/cuetools.SlackBuild
@@ -17,7 +17,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cuetools
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -54,7 +54,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -63,10 +63,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patching with patches from Archlinux
-patch -Np1 < "$CWD/fix_build_with_automake-1.12.diff"
-patch -Np1 < "$CWD/cuetag-fix_spaces.diff"
-
aclocal
autoheader
automake --force-missing --add-missing
@@ -92,7 +88,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/multimedia/cuetools/cuetools.info b/multimedia/cuetools/cuetools.info
index 1d1e831877..737fc91b7e 100644
--- a/multimedia/cuetools/cuetools.info
+++ b/multimedia/cuetools/cuetools.info
@@ -1,8 +1,8 @@
PRGNAM="cuetools"
-VERSION="1.4.0"
+VERSION="1.4.1"
HOMEPAGE="https://github.com/svend/cuetools"
-DOWNLOAD="https://github.com/svend/cuetools/archive/1.4.0.tar.gz"
-MD5SUM="4492dae2b3f9e077f6455a1f1cddef3b"
+DOWNLOAD="https://github.com/svend/cuetools/archive/1.4.1.tar.gz"
+MD5SUM="b1f365fc7ab02eff4b58b6a54ecee080"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/multimedia/cuetools/fix_build_with_automake-1.12.diff b/multimedia/cuetools/fix_build_with_automake-1.12.diff
deleted file mode 100644
index 9090f32c3d..0000000000
--- a/multimedia/cuetools/fix_build_with_automake-1.12.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From 761eba5b9b9c87a872a18b7ba4bf3d77a96e2157 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Horv=C3=A1th=20Bal=C3=A1zs?= <q@qroa.ch>
-Date: Tue, 15 Oct 2013 01:17:52 +0200
-Subject: [PATCH] Fix build with automake-1.12.
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index f54bb92..9f36932 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,6 +4,7 @@ AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AM_PROG_LEX
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- AC_PROG_YACC
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lib/Makefile src/tools/Makefile extras/Makefile])
---
-1.8.4
-