Hello community, here is the log from the commit of package vorbis-tools checked in at Fri Feb 2 15:57:06 CET 2007. -------- --- vorbis-tools/vorbis-tools.changes 2006-10-16 00:28:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/vorbis-tools/vorbis-tools.changes 2007-02-02 11:45:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 2 11:12:59 CET 2007 - mmarek@suse.cz + +- fix build with curl-7.16 +- fixed some more compiler warnings + +------------------------------------------------------------------- New: ---- vorbis-tools-1.1.1-curl-7.16.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vorbis-tools.spec ++++++ --- /var/tmp/diff_new_pack.e30136/_old 2007-02-02 15:56:55.000000000 +0100 +++ /var/tmp/diff_new_pack.e30136/_new 2007-02-02 15:56:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vorbis-tools (Version 1.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,14 +14,15 @@ BuildRequires: alsa-devel audiofile-devel curl-devel flac-devel libao-devel libvorbis-devel pkgconfig speex-devel Summary: Ogg Vorbis Tools Version: 1.1.1 -Release: 22 +Release: 48 Group: Productivity/Multimedia/Sound/Utilities -License: GPL +License: GNU General Public License (GPL) URL: http://www.xiph.org/ Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}-warning-fixes.diff Patch1: vorbis-tools-cflags.diff Patch2: vorbis-tools-config.diff +Patch3: vorbis-tools-%{version}-curl-7.16.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,6 +42,7 @@ %patch %patch1 %patch2 +%patch3 %build %{?suse_update_config:%{suse_update_config -f}} @@ -66,6 +68,9 @@ %{_datadir}/locale/*/*/* %changelog -n vorbis-tools +* Fri Feb 02 2007 - mmarek@suse.cz +- fix build with curl-7.16 +- fixed some more compiler warnings * Mon Oct 16 2006 - schwab@suse.de - Make sure config.rpath is present. * Wed Aug 23 2006 - tiwai@suse.de ++++++ vorbis-tools-1.1.1-curl-7.16.diff ++++++ --- ogg123/http_transport.c +++ ogg123/http_transport.c @@ -116,7 +116,11 @@ void set_curl_opts (http_private_t *priv if (inputOpts.ProxyTunnel) curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); */ +#if LIBCURL_VERSION_NUM < 0x070800 + /* CURLOPT_MUTE is a nop since quite a long time, but it was still kept + * in curl.h until 7.16 */ 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); ++++++ vorbis-tools-1.1.1-warning-fixes.diff ++++++ --- /var/tmp/diff_new_pack.e30136/_old 2007-02-02 15:56:55.000000000 +0100 +++ /var/tmp/diff_new_pack.e30136/_new 2007-02-02 15:56:55.000000000 +0100 @@ -1,10 +1,12 @@ ---- ogginfo/theora.c-dist 2005-10-18 15:34:11.000000000 +0200 -+++ ogginfo/theora.c 2005-10-18 15:34:34.000000000 +0200 -@@ -113,9 +113,9 @@ void theora_comment_clear(theora_comment +--- ogginfo/theora.c ++++ ogginfo/theora.c +@@ -112,21 +112,21 @@ void theora_comment_clear(theora_comment + } static int _theora_unpack_comment(theora_comment *tc, oggpack_buffer *opb){ - int i; +- int i; - int len; ++ long i; + long len; - _tp_readlsbint(opb,(long *) &len); @@ -12,7 +14,11 @@ if(len<0)return(OC_BADHEADER); tc->vendor=_ogg_calloc(1,len+1); _tp_readbuffer(opb,tc->vendor, len); -@@ -126,7 +126,7 @@ static int _theora_unpack_comment(theora + tc->vendor[len]='\0'; + +- _tp_readlsbint(opb,(long *) &tc->comments); ++ _tp_readlsbint(opb, &tc->comments); + if(tc->comments<0)goto parse_err; tc->user_comments=_ogg_calloc(tc->comments,sizeof(*tc->user_comments)); tc->comment_lengths=_ogg_calloc(tc->comments,sizeof(*tc->comment_lengths)); for(i=0;i<tc->comments;i++){ @@ -21,3 +27,61 @@ if(len<0)goto parse_err; tc->user_comments[i]=_ogg_calloc(1,len+1); _tp_readbuffer(opb,tc->user_comments[i],len); +--- ogginfo/ogginfo2.c ++++ ogginfo/ogginfo2.c +@@ -306,7 +306,8 @@ static void theora_process(stream_proces + { + ogg_packet packet; + misc_theora_info *inf = stream->data; +- int i, header=0; ++ int header=0; ++ long i; + + ogg_stream_pagein(&stream->os, page); + if(inf->doneheaders < 3) +@@ -453,8 +454,8 @@ static void vorbis_process(stream_proces + { + ogg_packet packet; + misc_vorbis_info *inf = stream->data; +- int i, header=0; +- int k; ++ int k, header=0; ++ long i; + + ogg_stream_pagein(&stream->os, page); + if(inf->doneheaders < 3) +--- ogginfo/theora.h ++++ ogginfo/theora.h +@@ -122,7 +122,7 @@ typedef struct { + typedef struct theora_comment{ + char **user_comments; /**< an array of comment string vectors */ + int *comment_lengths; /**< an array of corresponding string vector lengths in bytes */ +- int comments; /**< the total number of comment string vectors */ ++ long comments; /**< the total number of comment string vectors */ + char *vendor; /**< the vendor string identifying the encoder, null terminated */ + + } theora_comment; +--- oggenc/oggenc.c ++++ oggenc/oggenc.c +@@ -752,8 +752,8 @@ static void parse_options(int argc, char + opt->namefmt = strdup(optarg); + break; + case 'X': +- if(opt->namefmt_remove && opt->namefmt_remove != +- DEFAULT_NAMEFMT_REMOVE) ++ if(opt->namefmt_remove && strcmp(opt->namefmt_remove, ++ DEFAULT_NAMEFMT_REMOVE) != 0) + { + fprintf(stderr, _("WARNING: Multiple name format filters specified, using final\n")); + free(opt->namefmt_remove); +--- oggenc/resample.c ++++ oggenc/resample.c +@@ -170,7 +170,7 @@ int res_init(res_state *state, int chann + assert(beta > 2.0); + break; + default: +- assert("arglist" == "valid"); ++ assert(!"arglist not valid"); + return -1; + } + op1 = va_arg(argp, res_parameter); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de