summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-12-09 09:40:31 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-12-09 09:40:31 +0000
commit582f8cead0c35315cb5c229013683cb9bb575e9d (patch)
tree869ec6fa1d49c4f7f8d9596451c92c2d80468d10 /media-sound/vorbis-tools
parentAdd ~x86-fbsd keyword. (diff)
downloadgentoo-2-582f8cead0c35315cb5c229013683cb9bb575e9d.tar.gz
gentoo-2-582f8cead0c35315cb5c229013683cb9bb575e9d.tar.bz2
gentoo-2-582f8cead0c35315cb5c229013683cb9bb575e9d.zip
Patch from Daniel Black <dragonheart@gentoo.org> to build against curl-7.16.0
(Portage version: 2.1.2_rc3)
Diffstat (limited to 'media-sound/vorbis-tools')
-rw-r--r--media-sound/vorbis-tools/ChangeLog6
-rw-r--r--media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch10
-rw-r--r--media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild3
3 files changed, 17 insertions, 2 deletions
diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 61c869e7d6f9..d4417685beb8 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/vorbis-tools
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.45 2006/11/17 23:49:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.46 2006/12/09 09:40:31 aballier Exp $
+
+ 09 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+ +files/vorbis-tools-1.1.1-curl-7.16.0.patch, vorbis-tools-1.1.1-r3.ebuild:
+ Patch from Daniel Black <dragonheart@gentoo.org> to build against curl-7.16.0
17 Nov 2006; Alexis Ballier <aballier@gentoo.org>
vorbis-tools-1.1.1-r3.ebuild:
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
new file mode 100644
index 000000000000..2aabebe19d37
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
@@ -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);
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
index 32771495e1b5..848c27f8d194 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.2 2006/11/17 23:49:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.3 2006/12/09 09:40:31 aballier Exp $
IUSE="nls flac speex"
@@ -42,6 +42,7 @@ src_unpack() {
epatch "${WORKDIR}/${P}+flac-1.1.3-1.patch"
epatch "${WORKDIR}/${P}+flac-1.1.3-2.patch"
epatch "${WORKDIR}/${P}+flac-1.1.3-3.patch"
+ epatch "${FILESDIR}/${P}-curl-7.16.0.patch"
AT_M4DIR="m4" eautoreconf
}