OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Nov-2006 15:01:46
Branch: HEAD Handle: 2006110414014401
Modified files:
openpkg-src/vorbis-tools
vorbis-tools.patch vorbis-tools.spec
Log:
fix building against our cURL 7.16 in CURRENT
Summary:
Revision Changes Path
1.2 +13 -2 openpkg-src/vorbis-tools/vorbis-tools.patch
1.15 +3 -3 openpkg-src/vorbis-tools/vorbis-tools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vorbis-tools/vorbis-tools.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 vorbis-tools.patch
--- openpkg-src/vorbis-tools/vorbis-tools.patch 24 Oct 2006 16:31:16
-0000 1.1
+++ openpkg-src/vorbis-tools/vorbis-tools.patch 4 Nov 2006 14:01:44
-0000 1.2
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2003-11-17 17:51:14.000000000 +0100
-+++ configure 2006-10-24 18:29:47.070909153 +0200
+--- configure.orig 2003-11-17 17:51:14 +0100
++++ configure 2006-11-04 14:56:50 +0100
@@ -10373,9 +10373,9 @@
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;;
@@ -14,3 +14,14 @@
;;
*-*-darwin*)
DEBUG="-fno-common -g -Wall -fsigned-char"
+Index: ogg123/http_transport.c
+--- ogg123/http_transport.c.orig 2003-08-07 01:14:12 +0200
++++ ogg123/http_transport.c 2006-11-04 14:59:11 +0100
+@@ -113,7 +113,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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vorbis-tools/vorbis-tools.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 vorbis-tools.spec
--- openpkg-src/vorbis-tools/vorbis-tools.spec 24 Oct 2006 16:31:16
-0000 1.14
+++ openpkg-src/vorbis-tools/vorbis-tools.spec 4 Nov 2006 14:01:45
-0000 1.15
@@ -37,7 +37,7 @@
Group: Audio
License: GPL
Version: %{V_tools}
-Release: 20061024
+Release: 20061104
# list of sources
Source0:
http://www.vorbis.com/files/%{V_whole}/unix/vorbis-tools-%{V_tools}.tar.gz
@@ -48,8 +48,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, bison
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: vorbis-libs, curl, libiconv
-PreReq: vorbis-libs, curl, libiconv
+BuildPreReq: vorbis-libs, curl >= 7.16, libiconv
+PreReq: vorbis-libs, curl >= 7.16, libiconv
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
