[arch-commits] CVS update of extra/multimedia/graveman (PKGBUILD sox.patch)

[Jan de Groot]

    Date: Wednesday, May 30, 2007 @ 17:32:24
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/graveman

   Added: sox.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15)

upgpkg: graveman 0.3.12.5-3
Fix graveman to work with later versions of sox


-----------+
 PKGBUILD  |   13 +++++++------
 sox.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 6 deletions(-)


Index: extra/multimedia/graveman/PKGBUILD
diff -u extra/multimedia/graveman/PKGBUILD:1.14 extra/multimedia/graveman/PKGBUILD:1.15
--- extra/multimedia/graveman/PKGBUILD:1.14	Sun Mar 11 17:12:39 2007
+++ extra/multimedia/graveman/PKGBUILD	Wed May 30 17:32:24 2007
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD,v 1.14 2007/03/11 21:12:39 jgc Exp $
+# $Id: PKGBUILD,v 1.15 2007/05/30 21:32:24 jgc Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=graveman
 pkgver=0.3.12.5
 _realver=0.3.12-5
-pkgrel=2
+pkgrel=3
 pkgdesc="A CD-burning frontend for mkisofs, cdrecord and friends"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://graveman.tuxfamily.org"
 depends=('libvorbis' 'libid3tag' 'libglade' 'libmad' 'cdrdao' 'cdrtools'
-	 'sox' 'dvd+rw-tools' 'flac>=1.1.4' 'libmng')
+	 'sox>=13.0.0' 'dvd+rw-tools' 'flac>=1.1.4' 'libmng')
 makedepends=('perlxml')
-source=(http://graveman.tuxfamily.org/sources/graveman-${_realver}.tar.bz2)
-md5sums=('c9c80782282c6699effa91d1a806723b')
-sha1sums=('9c099a777314717cee5fb4d6dc640ef0a16235b0')
+source=(http://graveman.tuxfamily.org/sources/graveman-${_realver}.tar.bz2
+	sox.patch)
+md5sums=('c9c80782282c6699effa91d1a806723b' 'c80456110e178e9c29aa1f1875e28539')
 
 build() {
   cd ${startdir}/src/${pkgname}-${_realver}
+  patch -Np0 -i ${startdir}/src/sox.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc
   make || return 1
   mkdir -p ${startdir}/pkg/usr/man/man1
Index: extra/multimedia/graveman/sox.patch
diff -u /dev/null extra/multimedia/graveman/sox.patch:1.1
--- /dev/null	Wed May 30 17:32:24 2007
+++ extra/multimedia/graveman/sox.patch	Wed May 30 17:32:24 2007
@@ -0,0 +1,37 @@
+--- src/sox.c	2005-05-28 02:37:14.000000000 +0200
++++ src/sox.c	2007-01-27 18:22:11.000000000 +0100
+@@ -37,7 +37,7 @@
+ gboolean check_sox()
+ {
+   gchar *Lsox = conf_get_string("sox");
+-  gchar *Lcommandline, *Lerr = NULL;
++  gchar *Lcommandline, *Lerr = NULL, *Lstdout = NULL;
+   gboolean Lstatus;
+   gint Lexit = 0;
+ 
+@@ -47,12 +47,22 @@
+   if (!Lsox || !*Lsox) return FALSE;
+ 
+   Lcommandline = g_strdup_printf("%s -help", conf_get_string("sox"));
+-  Lstatus = g_spawn_command_line_sync(Lcommandline, NULL, &Lerr, &Lexit, NULL);
++  Lstatus = g_spawn_command_line_sync(Lcommandline, &Lstdout, &Lerr, &Lexit, NULL);
+   g_free(Lcommandline);
+ 
+-  GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
+-  GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  /* sox 12.17 outputs -help to stderr */ 
++  if (Lerr && strstr(Lerr, "12.17")) {
++	GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  }
++
++  /* sox 12.18 outputs -help to stdout */
++  else {
++	GsupportMp3 = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_OGG))));
++  }
+   
++  g_free(Lstdout);
+   g_free(Lerr);
+ 
+   return Lstatus;