[arch-commits] CVS update of arch/build/multimedia/vorbis-tools (PKGBUILD curl.patch)

[Tobias Powalowski]

    Date: Thursday, June 7, 2007 @ 10:10:44
  Author: tpowa
    Path: /home/cvs-arch/arch/build/multimedia/vorbis-tools

   Added: curl.patch (1.1)
Modified: PKGBUILD (1.19 -> 1.20)

'upgpkg: rebuild against new curl'


------------+
 PKGBUILD   |   13 ++++++++-----
 curl.patch |   10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)


Index: arch/build/multimedia/vorbis-tools/PKGBUILD
diff -u arch/build/multimedia/vorbis-tools/PKGBUILD:1.19 arch/build/multimedia/vorbis-tools/PKGBUILD:1.20
--- arch/build/multimedia/vorbis-tools/PKGBUILD:1.19	Sat Apr 14 09:17:32 2007
+++ arch/build/multimedia/vorbis-tools/PKGBUILD	Thu Jun  7 10:10:43 2007
@@ -1,19 +1,22 @@
-# $Id: PKGBUILD,v 1.19 2007/04/14 13:17:32 tpowa Exp $
+# $Id: PKGBUILD,v 1.20 2007/06/07 14:10:43 tpowa Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=vorbis-tools
 pkgver=1.1.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Extra tools for Ogg-Vorbis"
 arch=(i686 x86_64)
 licenses=('GPL')
-depends=('libao' 'libvorbis' 'curl' 'flac>=1.1.4')
+depends=('libao' 'libvorbis' 'curl>=7.16.2' 'flac>=1.1.4')
 source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz
-	vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch)
-md5sums=('47845fd76f5f2354a3619c4097575487' 'a4916ded8ce653457c2d5ee732902685')
+	vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch curl.patch)
+md5sums=('47845fd76f5f2354a3619c4097575487'
+         'a4916ded8ce653457c2d5ee732902685'
+         'ffc1a4ae45a778dd2251b8186d5dbdfb')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np1 -i ../curl.patch || return 1
   patch -Np1 -i ../vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch || return 1
   autoconf
   ./configure --prefix=/usr --without-speex --mandir=/usr/man
Index: arch/build/multimedia/vorbis-tools/curl.patch
diff -u /dev/null arch/build/multimedia/vorbis-tools/curl.patch:1.1
--- /dev/null	Thu Jun  7 10:10:43 2007
+++ arch/build/multimedia/vorbis-tools/curl.patch	Thu Jun  7 10:10:43 2007
@@ -0,0 +1,10 @@
+--- vorbis-tools-1.1.1/ogg123/http_transport.c.orig	2006-12-09 16:34:44.000000000 +1100
++++ vorbis-tools-1.1.1/ogg123/http_transport.c	2006-12-09 16:39:46.000000000 +1100
+@@ -116,7 +116,6 @@
+   if (inputOpts.ProxyTunnel)
+     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
+   */
+-  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
+   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);