From efb082287843d936fc5dcecb8fbcc580119f6705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Feb 2008 18:15:45 +0000 Subject: [PATCH] Allow compilation of `ogg123' by fixing `http_transport.c'. svn path=/nixpkgs/trunk/; revision=10650 --- pkgs/applications/audio/vorbis-tools/default.nix | 12 ++++-------- .../audio/vorbis-tools/ogg123-curlopt-mute.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/audio/vorbis-tools/ogg123-curlopt-mute.patch diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 13fe5a48cfaa..626dc1c9d96c 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc , speex, flac}: -# FIXME: We'd need `libOggFLAC' too. - stdenv.mkDerivation { name = "vorbis-tools-1.1.1"; src = fetchurl { @@ -10,13 +8,11 @@ stdenv.mkDerivation { sha256 = "617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad"; }; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac glibc ]; + # FIXME: Vorbis-tools expects `libOggFLAC', but this library was + # merged with `libFLAC' as of FLAC 1.1.3. + buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ]; - configureFlagsArray = [ - ("--with-curl=" + curl) - ("--with-curl-libraries=" + curl + "/lib") - ("--with-curl-includes=" + curl + "/include") - ]; + patches = [ ./ogg123-curlopt-mute.patch ]; meta = { description = ''A set of command-line tools to manipulate Ogg Vorbis diff --git a/pkgs/applications/audio/vorbis-tools/ogg123-curlopt-mute.patch b/pkgs/applications/audio/vorbis-tools/ogg123-curlopt-mute.patch new file mode 100644 index 000000000000..6437909411ea --- /dev/null +++ b/pkgs/applications/audio/vorbis-tools/ogg123-curlopt-mute.patch @@ -0,0 +1,13 @@ +--- vorbis-tools-1.1.1/ogg123/http_transport.c 2005-06-13 15:11:44.000000000 +0200 ++++ vorbis-tools-1.1.1/ogg123/http_transport.c 2008-02-12 18:38:41.000000000 +0100 +@@ -116,7 +116,9 @@ void set_curl_opts (http_private_t *priv + if (inputOpts.ProxyTunnel) + curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); + */ ++#ifdef CURLOPT_MUTE + curl_easy_setopt(handle, CURLOPT_MUTE, 1); ++#endif + curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error); + curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback); + curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private); +