Hello community, here is the log from the commit of package sox checked in at Sun Feb 25 23:39:18 CET 2007. -------- --- sox/sox.changes 2007-02-14 15:12:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/sox/sox.changes 2007-02-22 19:19:09.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Feb 22 18:09:04 CET 2007 - prusnak@suse.cz + +- updated to 13.0.0 + * added ability to merge e.g. 2 mono files to 1 stereo file + * removed the restrictions whereby multiple input files had to have + the same data encoding & size and same # of channels + * added large file support + * more fixes to MP3 tag reading + * fix to stop, avoiding a crash, when starting of effects fails + * fixed a bug introduced in 12.18.2 that stopped the draining + of effects from occuring. This had stopped the reverse effect, + among others, from working. + * fix rounding error when reading command-line time parameters + o fixed deemph & earwax effects to work with MP3, vorbis & FLAC + * fix wav file handler discarding the last PCM sample in certain + circumstances + * improved the accuracy of integer and floating point PCM + conversions + * full changelog here: + http://sf.net/project/shownotes.php?group_id=10706&release_id=485784 +- fixed random return value (retval.patch) +- dropped obsoleted patches: + * sox-12.18.1-external_gsm.patch (included in update) + * sox-12.18.1-makefile.patch (included in update) + * sox-12.18.1-pitch.patch (included in update) + +------------------------------------------------------------------- Old: ---- sox-12.18.1.dif sox-12.18.1-external_gsm.patch sox-12.18.1-pitch.patch sox-12.18.1.tar.bz2 sox-12.18.1-warnings.patch New: ---- sox-13.0.0-retval.patch sox-13.0.0.tar.bz2 sox-13.0.0-trash16.patch sox-13.0.0-vorbis.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sox.spec ++++++ --- /var/tmp/diff_new_pack.j19282/_old 2007-02-25 23:38:56.000000000 +0100 +++ /var/tmp/diff_new_pack.j19282/_new 2007-02-25 23:38:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sox (Version 12.18.1) +# spec file for package sox (Version 13.0.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,20 +10,20 @@ Name: sox -BuildRequires: alsa-devel libgsm-devel libvorbis-devel +BuildRequires: alsa-devel flac-devel libgsm-devel libvorbis-devel +Requires: alsa libgsm libvorbis flac License: BSD License and BSD-like, GNU General Public License (GPL) Group: Productivity/Multimedia/Sound/Editors and Convertors Autoreqprov: on -Version: 12.18.1 -Release: 28 +Version: 13.0.0 +Release: 1 Summary: Sound Conversion Tools and Library URL: http://sox.sourceforge.net -Source: sox-%{version}.tar.bz2 -Source2: audioio.h -Patch: sox-%{version}.dif -Patch1: sox-%{version}-warnings.patch -Patch2: sox-%{version}-external_gsm.patch -Patch3: sox-%{version}-pitch.patch +Source: %{name}-%{version}.tar.bz2 +Source1: audioio.h +Patch1: %{name}-%{version}-trash16.patch +Patch2: %{name}-%{version}-vorbis.patch +Patch3: %{name}-%{version}-retval.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,45 +40,64 @@ %prep %setup -q -%patch %patch1 %patch2 %patch3 -mv src/gsm src/gsm_internal %build %{?suse_update_config -f} autoconf -if [ ! -f /usr/include/sun/audioio.h ]; then +if [ ! -f %{_includedir}/sun/audioio.h ]; then mkdir -p include/sun - cp $RPM_SOURCE_DIR/audioio.h include/sun/audioio.h + cp %{S:1} include/sun/audioio.h fi -CFLAGS="$RPM_OPT_FLAGS -fstack-protector -DHAVE_SYS_SOUNDCARD_H" \ +CFLAGS="$RPM_OPT_FLAGS -fstack-protector -DEXTERNAL_GSM -DHAVE_SYS_SOUNDCARD_H -fPIC -DPIC" \ CPPFLAGS=-I$PWD/include \ -./configure --prefix=/usr --mandir=%{_mandir} \ - --with-oss-dsp=yes \ - --with-sun-audio=yes \ - --libdir=%{_libdir} +./configure --disable-static --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} make %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,%{_lib}} $RPM_BUILD_ROOT/%{_mandir}/{man1,man3} -make install install-lib install-play \ - DESTDIR=$RPM_BUILD_ROOT \ +mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_mandir}/{man1,man3,man7} +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) -/usr/bin/* +%{_bindir}/* %{_libdir}/lib* -/usr/include/* +%{_includedir}/* %{_mandir}/man1/* %{_mandir}/man3/* -%doc Changelog INSTALL README* TODO src/monkey.* +%{_mandir}/man7/* +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README src/monkey.* -%changelog -n sox +%changelog +* Thu Feb 22 2007 - prusnak@suse.cz +- updated to 13.0.0 + * added ability to merge e.g. 2 mono files to 1 stereo file + * removed the restrictions whereby multiple input files had to have + the same data encoding & size and same # of channels + * added large file support + * more fixes to MP3 tag reading + * fix to stop, avoiding a crash, when starting of effects fails + * fixed a bug introduced in 12.18.2 that stopped the draining + of effects from occuring. This had stopped the reverse effect, + among others, from working. + * fix rounding error when reading command-line time parameters + o fixed deemph & earwax effects to work with MP3, vorbis & FLAC + * fix wav file handler discarding the last PCM sample in certain + circumstances + * improved the accuracy of integer and floating point PCM + conversions + * full changelog here: + http://sf.net/project/shownotes.php?group_id=10706&release_id=485784 +- fixed random return value (retval.patch) +- dropped obsoleted patches: + * sox-12.18.1-external_gsm.patch (included in update) + * sox-12.18.1-makefile.patch (included in update) + * sox-12.18.1-pitch.patch (included in update) * Wed Feb 14 2007 - schwab@suse.de - Fix building as non-root. * Thu Nov 09 2006 - prusnak@suse.cz ++++++ sox-13.0.0-retval.patch ++++++ --- src/wve.c +++ src/wve.c @@ -168,6 +168,8 @@ return(ST_EOF); } wvewriteheader(ft); + + return ST_SUCCESS; } static void wvewriteheader(ft_t ft) ++++++ sox-12.18.1.tar.bz2 -> sox-13.0.0.tar.bz2 ++++++ ++++ 122071 lines of diff (skipped) ++++++ sox-13.0.0-trash16.patch ++++++ --- src/aiff.c +++ src/aiff.c @@ -251,7 +251,7 @@ st_readb(ft, (unsigned char *)&trash8); /* Hi velocity */ st_readb(ft, (unsigned char *)&trash8); - st_readw(ft, (unsigned short *)&trash16);/* gain */ + st_readw(ft, (unsigned short *)(void *)&trash16);/* gain */ st_readw(ft, &looptype); /* sustain loop */ ft->loops[0].type = looptype; st_readw(ft, &sustainLoopBegin); /* begin marker */ --- src/maud.c +++ src/maud.c @@ -97,7 +97,7 @@ st_readw(ft, &bitpersam); /* number of bits per sample after decompression */ - st_readw(ft, (unsigned short *)&trash16); + st_readw(ft, (unsigned short *)(void*)&trash16); st_readdw(ft, &nom); /* clock source frequency */ st_readw(ft, &denom); /* clock devide */ --- src/smp.c +++ src/smp.c @@ -78,7 +78,7 @@ int i; int16_t trash16; - st_readw(ft, (unsigned short *)&trash16); /* read reserved word */ + st_readw(ft, (unsigned short *)(void*)&trash16); /* read reserved word */ for(i = 0; i < 8; i++) { /* read the 8 loops */ st_readdw(ft, &(trailer->loops[i].start)); ft->loops[i].start = trailer->loops[i].start; --- src/wve.c +++ src/wve.c @@ -85,9 +85,9 @@ st_readw(ft, (unsigned short *)&(p->repeats)); - st_readw(ft, (unsigned short *)&trash16); - st_readw(ft, (unsigned short *)&trash16); - st_readw(ft, (unsigned short *)&trash16); + st_readw(ft, (unsigned short *)(void *)&trash16); + st_readw(ft, (unsigned short *)(void *)&trash16); + st_readw(ft, (unsigned short *)(void *)&trash16); ft->signal.encoding = ST_ENCODING_ALAW; ft->signal.size = ST_SIZE_BYTE; ++++++ sox-13.0.0-vorbis.patch ++++++ --- src/vorbis.c +++ src/vorbis.c @@ -360,7 +360,13 @@ } quality = ft->signal.compression; } - vorbis_encode_init_vbr(&ve->vi, ft->signal.channels, ft->signal.rate, quality / 10); + + if(vorbis_encode_init_vbr(&ve->vi, ft->signal.channels, ft->signal.rate, quality / 10)) + { + st_fail_errno(ft,ST_ERATE, + "libVorbis does not support this mode (eg, too low a bitrate, etc.)"); + return (ST_EOF); + } vorbis_analysis_init(&ve->vd, &ve->vi); vorbis_block_init(&ve->vd, &ve->vb); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org