[arch-commits] Commit in cuetools/trunk (3 files)

[Lukas Jirkovsky]

    Date: Sunday, October 20, 2013 @ 11:41:37
  Author: stativ
Revision: 98849

upgpkg: cuetools 1.4.0-1

update to 1.4.0

Added:
  cuetools/trunk/fix_build_with_automake-1.12.diff
Modified:
  cuetools/trunk/PKGBUILD
Deleted:
  cuetools/trunk/cuetag.patch

-----------------------------------+
 PKGBUILD                          |   40 ++++++++++++++++++++----------------
 cuetag.patch                      |   37 ---------------------------------
 fix_build_with_automake-1.12.diff |   24 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-20 09:15:03 UTC (rev 98848)
+++ PKGBUILD	2013-10-20 09:41:37 UTC (rev 98849)
@@ -1,33 +1,39 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname=cuetools
-pkgver=1.3.1
-pkgrel=5
-pkgdesc="Set of utilities for working with cue files and toc files"
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Cue and toc file parsers and utilities"
 arch=('i686' 'x86_64')
-url="http://developer.berlios.de/projects/cuetools/"
+url="https://github.com/svend/cuetools"
+#url="http://developer.berlios.de/projects/cuetools/"
 license=('GPL')
 depends=('glibc')
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz \
-        cuetag.patch)
-md5sums=('45575f7a1bdc6615599fa6cb49845cca'
-         '38969241a7b6ac88e2f1b46c3da0ecc2')
+source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz"
+	"fix_build_with_automake-1.12.diff")
+md5sums=('4492dae2b3f9e077f6455a1f1cddef3b'
+         '67a3b32711d1a1f508be6ed0f1bdadf3')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true
+
+  aclocal
+  autoheader
+  automake --force-missing --add-missing
+  autoconf
+}
+
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # fix cuetag
-  patch -Np0 < "$srcdir"/cuetag.patch
-  sed -i -e 's/--import-vc-from/--import-tags-from/' \
-    -e 's/--remove-vc-all/--remove-all-tags/' extras/cuetag.sh
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -m755 extras/cuetag.sh "$pkgdir"/usr/bin/cuetag.sh
 }

Deleted: cuetag.patch
===================================================================
--- cuetag.patch	2013-10-20 09:15:03 UTC (rev 98848)
+++ cuetag.patch	2013-10-20 09:41:37 UTC (rev 98849)
@@ -1,37 +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"

Added: fix_build_with_automake-1.12.diff
===================================================================
--- fix_build_with_automake-1.12.diff	                        (rev 0)
+++ fix_build_with_automake-1.12.diff	2013-10-20 09:41:37 UTC (rev 98849)
@@ -0,0 +1,24 @@
+From 761eba5b9b9c87a872a18b7ba4bf3d77a96e2157 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Horv=C3=A1th=20Bal=C3=A1zs?= <q at 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
+