rpms/sox/devel sox-14.2.0-cvs20081105.patch, NONE, 1.1 sox.spec, 1.37, 1.38
Tom Callaway
spot at fedoraproject.org
Wed Nov 5 13:19:23 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/sox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20222
Modified Files:
sox.spec
Added Files:
sox-14.2.0-cvs20081105.patch
Log Message:
fix many bugs, including 468567
sox-14.2.0-cvs20081105.patch:
--- NEW FILE sox-14.2.0-cvs20081105.patch ---
Only in sox-14.1.0: aclocal.m4
diff -urP sox-14.1.0/AUTHORS sox/AUTHORS
--- sox-14.1.0/AUTHORS 2008-06-26 14:24:37.000000000 -0400
+++ sox/AUTHORS 2008-11-02 07:58:56.000000000 -0500
@@ -8,22 +8,23 @@
Mantainers:
Chris Bagwell cbagwell at users.sourceforge.net
- OSS and Sun players, bugfixes, ADPCM support,
- patch collection and maintenance.
+ ALSA/OSS/Sun/MacOS X play/record support, initial ADPCM,
+ bugfixes, patch collection and general maintenance.
Rob Sykes robs at users.sourceforge.net
- FORMATS: M3U, PLS, FLAC, AMR, HTK, WavPack, VOX/IMA/VOC ADPCM
- support, 24bit support for popular formats, MP3 tags & duration
- support.
- EFFECTS: key, tempo, pad, bass, treble, delay, new reverb, new
+ FORMATS: M3U, PLS, FLAC, AMR, HTK, WavPack, VOX/IMA/VOC ADPCM
+ support, 24bit support for popular formats, MP3 tags & duration
+ support, .sox native format.
+ EFFECTS: tempo, pad, bass, bend, treble, delay, new reverb, new
flanger, soft-knee companding, speed via resampling, filters
makeover inc. gnuplot & octave plotting, splice, remix, norm,
- contrast, new rate, spectrogram;
- new effects chain with buffering and any # channels.
- OTHERS: open input files via URL, file merge, play
- multiple files with mixed format types, play with replay-gain,
- building with cmake, much manual improvement and expansion,
+ contrast, new rate, spectrogram, new pitch, riaa, loudness, new
+ dither, new effects chain with buffering and any # channels.
+ OTHERS: open input files via URL, file merge, play
+ multiple files with mixed format types, play with replay-gain,
+ building with cmake, much manual improvement and expansion,
soxi, improved displays with -S & -V including VU and clips,
- libSoX examples, various fixes, enhancements and clean-ups.
+ libSoX examples, various fixes, enhancements and clean-ups,
+ multiple input pipes.
Contributors:
Reuben Thomas rrt at sc3d.org
@@ -71,8 +72,8 @@
Raw textual data
Boisy G. Pitre boisy at microware.com
OS9 port.
- Sun Microsystems, Guido Van Rossum
- CCITT G.711, G.721, G.723 implementation
+ Sun Microsystems, Guido Van Rossum
+ CCITT G.711, G.721, G.723 implementation
Graeme Gill graeme at labtam.labtam.oz.au
A-LAW format, Good .WAV handling, avg channel
expansion.
diff -urP sox-14.1.0/ChangeLog sox/ChangeLog
--- sox-14.1.0/ChangeLog 2008-07-28 16:04:22.000000000 -0400
+++ sox/ChangeLog 2008-11-02 15:43:34.000000000 -0500
@@ -4,6 +4,118 @@
This file contains a list of all changes starting after the release of
sox-11gamma.
+sox-14.2.0 2008-TBD
+----------
+
+Previously deprecated features that have been removed in this release:
+
+ Deprec- Feature [O(ption)]
+ ated in [F(ormat)] [E(ffect)] Replacement
+ ------- ---------------------- ----------------------
+ 14.0.0 E pitch new pitch = old key
+
+Previously deprecated features (to be removed in future):
+
+ Deprec- Feature [O(ption)] Removal
+ ated in [F(ormat)] [E(ffect)] Replacement due after
+ ------- ---------------------- ---------------------- -------
+ 14.1.0 E resample ~= rate 2009-01-29
+ 14.1.0 E polyphase ~= rate 2009-01-29
+ 14.1.0 E rabbit ~= rate 2009-01-29
+ 14.1.0 F flac: libFLAC 1.1.1 libFLAC > 1.1.1 2009-01-29
+ 14.1.0 F wve (native) wve (libsndfile) 2009-07-29
+ 14.1.0 Behaviour whereby soxi 2009-07-29
+ sox -V file(s) -n
+ doesn't read to EOF.
+
+Newly deprecated features (to be removed in future):
+
+ Deprec- Feature [O(ption)] Removal
+ ated in [F(ormat)] [E(ffect)] Replacement due after
+ ------- ---------------------- ---------------------- -------
+ 14.2.0 E key renamed to pitch 14.2.0 + 6 months
+ 14.2.0 E pan ~= mixer/remix 14.2.0 + 6 months
+
+File formats:
+
+ o New `.cvu' unfiltered CVSD; supports any bit-rate. (robs)
+ o New `.sox' native format intended for intermediate files. (robs)
+ o Fix WAV write on 64-bit arch. (robs)
+ o Fix writing PRC ADPCM files. (Silas Brown)
+ o Fix problems reading short mp3 files. (robs)
+
+Effects:
+
+ o N.B. Changed to different default settings for `rate' effect;
+ add -s -L options to be compatible with SoX v14.1.0. (robs)
+ o New options for `rate' effect to configure phase response,
+ band-width and aliasing. (robs)
+ o New options for 'dither' effect: RPDF, TPDF, noise-shaping. (robs)
+ o New `riaa' effect: RIAA vinyl playback EQ. (robs)
+ o New `loudness' effect: gain control with ISO 226 loudness
+ compensation. (robs)
+ o New `bend' effect; pitch bending. (robs)
+ o New -b option for the norm effect; can be used to fix stereo
+ imbalance. (robs)
+ o Wider tempo range for `tempo' effect. (robs)
+ o New --effects-file option to read effects and arguments from
+ a file instead of command line. (cbagwell)
+ o `filter' effect now supports --plot. (robs)
+ o Improved documentation for the `stat' effect. (robs)
+ o Fix broken audio pass-through with noiseprof effect. (robs)
+ o Fix graph legend display when using --plot octave. (robs)
+ o Fix rare crash with `rate' effect. (robs)
+ o Fix [2190767] `norm' under-amplifying in some cases. (George Yohng)
+ o Fix [2007062] Earwax effect can overflow; should clip. (robs)
+ o Fix `phaser' clicks and overflows. (robs)
+ o Trim will now skip past 2G point correctly. (cbagwell)
+ o Improved handling of speed changes in the effects chain. (robs)
+
+Other new features:
+
+ o New psuedo-effects "newfile" and ":" to allow running
+ multiple effect chains on a single file. newfile will
+ create a new output file when an effect chain terminates.
+ Of most use with trim and silence effects. (cbagwell)
+ o Can now use multiple pipes as inputs to the combiner;
+ see `Special Filenames' in sox(1). (robs)
+ o Display SoX build environment information with -V -V. (robs)
+ o Display (with -V) the detected file-type if it differs from the
+ file extension. (robs)
+ o New -t option for soxi; to display the detected file type. (robs)
+ o New -b/--bits, -e/--encoding alternative options for specifying
+ audio encoding parameters. (robs)
+ o [FR 1958680] Support more than 32 input files. (robs)
+ o New native Mac OSX audio handler for playing/recording. (cbagwell)
+
+Other bug fixes:
+
+ o Bump library version because it was not binary compatible with
+ SoX 14.0.1 (Pascal Giard)
+ o Turn off versioning of special libsox_fmt* libraries since thats
+ not really needed. (kwizart)
+ o Fixed crash when running play with no arguments. (Dan Nelson)
+ o Allow libpng to be found with -static option. (cbagwell)
+ o Allow libsamplerate to be found if pkg-config is installed but
+ no samplerate.pc exists. (cbagwell)
+ o [2038855] external lpc10 lib patch. (Oden Eriksson, Mandriva)
+ o Fix memory leaks in effects chain when restarting effects. (cbagwell)
+ o Fixed pkg-config CFLAGS. (evilynux)
+ o Fix sndfile inclusion in build in some circumstances. (robs)
+ o Fix [2026912] Fails on URL-like filenames. (robs)
+ o Always add _LARGEFILE_SUPPORT when off_t is 64bits to work around
+ buggy platforms. Fixes not able to read WAV files. (cbagwell)
+
+Internal improvements:
+
+ o Fixed all compiler warnings (with gcc 4.3.1, 64-bit arch.). (robs)
+ o Updates to internal effects chain API. (cbagwell)
+ o Retire old FFT routines (speeds up `noisered' effect). (robs)
+ o Allow effects to use getopt. (robs)
+ o Use libmagic for mp3. (robs)
+ o Change sox_seek() offset to 64-bit to work with > 2G files (cbagwell)
+ o Merged libsfx back into libsox to align with sox.h API. (cbagwell)
+
sox-14.1.0 2008-7-29
----------
@@ -132,7 +244,7 @@
Internal improvements:
o Use FORTIFY_SOURCE with gcc. (robs)
- o Fixed all compiler warnings (with gcc 4.2.3). (robs)
+ o Fixed all compiler warnings (with gcc 4.2.3, 32-bit arch). (robs)
o Reimplement (separately) SoundTool & Sounder format handlers. (robs)
o Allow formats & effects to have any size of private data. (robs)
@@ -399,7 +511,7 @@
samples to be written out instead of an approximate amount.
o Fix hangup when attempting to write stereo MP3 files.
(1512218) Kendrick Shaw
- o Deemp effect would lose stereo separation. (1479249)
+ o Fix deemph effect would lose stereo separation. (1479249) robs
o Adding cross-platform support for getopt_long
o Make help screens print much more information and add
new --help-effect option. (Originally from Dirk).
diff -urP sox-14.1.0/CMakeLists.txt sox/CMakeLists.txt
--- sox-14.1.0/CMakeLists.txt 2008-07-29 13:10:04.000000000 -0400
+++ sox/CMakeLists.txt 2008-10-01 03:49:09.000000000 -0400
@@ -47,6 +47,7 @@
check_include_files("sys/time.h" HAVE_SYS_TIME_H)
check_include_files("sys/timeb.h" HAVE_SYS_TIMEB_H)
check_include_files("sys/types.h" HAVE_SYS_TYPES_H)
+check_include_files("sys/utsname.h" HAVE_SYS_UTSNAME_H)
[...26462 lines suppressed...]
+ the squared samples is found. This is the time offset which should
+ correspond to the center of the filtered/resampled tone-pulse.
+
+step 2: let N = 16000*(rate1/rate0) be the number of samples at output rate
+ which would correspond to the 16000 sample duration at max volume.
+ We focus on the samples between
+ (center - 0.3*N) and (center + 0.9*N)
+ where the transient effects of attack/release envelope should be
+ small.
+ We do a least-squares fit of a sinusoid at the adjusted frequency
+ to this segment of 0.6*N samples, and print out the component
+ s2max which can be explained, and also the rms level of the 'error'
+ or unexplained part.
+
+That's pretty much it... the ltest perl-script glues it together and outputs
+adjusted data which the gnuplot will like.
+
+Modify the perl and gnuplot scripts to suit your needs.
diff -urP sox-14.1.0/test/responseAB sox/test/responseAB
--- sox-14.1.0/test/responseAB 1969-12-31 19:00:00.000000000 -0500
+++ sox/test/responseAB 2007-11-04 04:39:54.000000000 -0500
@@ -0,0 +1,16 @@
+#
+set autoscale
+#set logscale x
+set mxtics 5
+set mytics 2
+set grid xtics ytics
+set grid mxtics mytics
+show grid
+plot [0:22050] 'A' using (22050*$1):2 title "A response" with lines,\
+ 'B' using (22050*$1):2 title "B response" with lines
+pause -1 "Hit return to continue"
+quit
+
+#set key outside below
+#set key left box
+#reset
diff -urP sox-14.1.0/test/wtest.pl sox/test/wtest.pl
--- sox-14.1.0/test/wtest.pl 1969-12-31 19:00:00.000000000 -0500
+++ sox/test/wtest.pl 1999-12-07 11:57:50.000000000 -0500
@@ -0,0 +1,104 @@
+#!/usr/bin/perl -w
+
+# wtest.pl -- program to help generate response/error graphs for adpcm/gsm code.
+#
+# Copyright (C) 1999 Stanley J. Brooks <stabro at megsinet.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+$|=1;
+
+# set default values
+my $toast='/usr/bin/toast';
+my $sox='../sox';
+my $fmt='';
+
+my $rate=8000; # sample rates
+my $p=200; # silence before/after tonepulse
+my $env="400:800:400"; # attack, duration, drop
+
+my ($ding,$model,$t,$rms,$lim)=("./ding","./model","sw",11585.2, 0.5);
+
+my $effect=''; # you may want to try a filter
+
+# parse commandline arguments
+while ($_ = shift @ARGV) {
+ if (m{^-[tgai]$}) {
+ $fmt=$_;
+ } else {
+ unshift @ARGV,$_;
+ last;
+ }
+}
+if ($#ARGV >= 0) {
+ $effect="@ARGV";
+}
+
+# output a nice header explaining the data
+print("# Testing gsm compress/decompress ");
+if ($fmt eq '-t') {
+ print("by $toast\n");
+}else{
+ print("by $sox -r$rate in.sw $fmt out.wav $effect\n");
+}
+print("# with tone pulses from 0.00 to 0.99 percent of Nyquist\n");
+print("# produced by $ding -f0.xx -v0.5 -e$p:$env:$p d/i0.xx.$t\n");
+print("# col 1 is frequency/Nyquist\n");
+print("# col 2 is (power) dB gain\n");
+print("# col 3 is (power) dB level of error signal\n");
+print("#\n#freq dB-gain dB-error\n");
+
+# generate the test data
+mkdir("d",0775);
+my $f;
+my %q;
+my $nyq = 1.0;
+for ($f=0.00; $f<1.001; $f+=0.01) {
+ my @mod;
+
+ #if ($f>0.995) { $f=0.999; }
+ my $s=sprintf("%4.2f",$f);
+ #print "$ding -f$s -v0.5 -e$p:$env:$p -d1.0 d/i$s.$t\n";
+ qx{$ding -f$s -v0.5 -e$p:$env:$p -d1.0 d/i$s.$t &>/dev/null};
+
+ if ($fmt eq '-t') {
+ qx{$toast -l d/i$s.$t};
+ qx{$toast -dl d/i$s.$t.gsm};
+ }else{
+ qx{cp d/i$s.$t d/a$s.$t 2>/dev/null};
+ qx{$sox -r$rate d/i$s.$t -g d/g$s.wav $effect 2>/dev/null};
+ unlink "d/i$s.$t";
+ qx{$sox d/g$s.wav d/i$s.$t 2>/dev/null};
+ qx{cp d/i$s.$t d/b$s.$t 2>/dev/null};
+ unlink "d/g$s.wav";
+ }
+
+ @mod = grep {/v2max/} qx{$model -f$s -e$env $rate d/i$s.$t 2>&1};
+ print STDERR "$s: ", at mod;
+ $_=shift(@mod);
+ if (m{s2max *([0-9.]+), *v2max *([0-9.]+), *rmserr *(-?[0-9.]+)}) {
+ #print("$s $1\n");
+ #print("$s $1 $3\n");
+ my $v = ($1 > $lim)? $1 : $lim;
+ my $r = ($3 > $lim)? $3 : $lim;
+ my $dbv = 20*log($v/$rms)/log(10);
+ my $dbr = 20*log($r/$rms)/log(10);
+ printf("%s %.3f %.3f\n",$s,$dbv,$dbr);
+ }
+ unlink "d/i$s.$t";
+}
+print("#freq dB-gain dB-error\n");
+exit 0;
diff -urP sox-14.1.0/update_debian_version.pl sox/update_debian_version.pl
--- sox-14.1.0/update_debian_version.pl 1969-12-31 19:00:00.000000000 -0500
+++ sox/update_debian_version.pl 2008-03-15 16:41:16.000000000 -0400
@@ -0,0 +1,50 @@
+#!/usr/bin/perl -w
+# This script is meant to live in SoX CVS.
+# Its sole purpose is to update the versions in the debian directory
+# so users can always build a binary package after a CVS checkout.
+#
+# Written by Pascal Giard <evilynux at gmail.com>.
+use strict;
+
+my $file = "configure.ac";
+my $changelog = "debian/changelog";
+my $rules = "debian/rules";
+my $version;
+my @content;
+
+die "$file doesn't exist.\n" unless( -e $file );
+die "$changelog doesn't exist.\n" unless( -e $changelog );
+die "$rules exist.\n" unless( -e $rules );
+
+# Get current version
+open( FH, $file );
+while( <FH> ) {
+ if( $_ =~ m/AC_INIT\(SoX, (\d+\.\d+\.\d+),/ ) {
+ $version = $1;
+ last;
+ }
+}
+close( FH );
+
+die "Can't determine version number.\n" unless( $version );
+
+# Update debian/changelog
+open( FH, $changelog );
+ at content = <FH>;
+close( FH );
+die "Can't modify $changelog!\n"
+ unless $content[0] =~ s/^(sox \()\d+\.\d+\.\d+(\+cvs-1\).*)$/$1$version$2/;
+
+open( FH, "> $changelog" );
+print FH @content;
+close( FH );
+
+# Update debian/rules
+open( FH, $rules );
+ at content = <FH>;
+close( FH );
+$_ =~ s/^(DEB_TAR_SRCDIR := sox-)\d+\.\d+\.\d+(.*)$/$1$version$2/
+ foreach(@content);
+open( FH, ">" . $rules );
+print FH @content;
+close( FH );
Index: sox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/sox.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sox.spec 4 Sep 2008 22:27:10 -0000 1.37
+++ sox.spec 5 Nov 2008 13:18:53 -0000 1.38
@@ -1,10 +1,11 @@
Summary: A general purpose sound file conversion tool
Name: sox
Version: 14.1.0
-Release: 3%{?dist}
+Release: 4.20081105cvs%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
+Patch0: sox-14.2.0-cvs20081105.patch
URL: http://sox.sourceforge.net/
BuildRequires: libvorbis-devel
BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel
@@ -29,6 +30,7 @@
%prep
%setup -q
+%patch0 -p1
%build
CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --enable-flac --with-gsm --includedir=%{_includedir}/sox --disable-static
@@ -38,7 +40,6 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libsox.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libsfx.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
@@ -58,9 +59,8 @@
%{_bindir}/sox
%{_bindir}/soxi
%{_libdir}/libsox.so.*
-%{_libdir}/libsfx.so.*
%dir %{_libdir}/sox/
-%{_libdir}/sox/libsox_fmt_*.so.*
+%{_libdir}/sox/libsox_fmt_*.so
%{_mandir}/man1/*
%{_mandir}/man7/*
@@ -68,13 +68,15 @@
%defattr(-,root,root,-)
%{_includedir}/sox
%{_libdir}/libsox.so
-%{_libdir}/libsfx.so
-%{_libdir}/sox/libsox_fmt_*.so
%{_libdir}/pkgconfig/sox.pc
%{_mandir}/man3/*
%changelog
+* Wed Nov 5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-4.20081105cvs
+- update to 20081105 cvs checkout (fixes many bugs, no longer creates _fmt_*.so.*)
+- move _fmt_*.so to main package so support for file formats no longer requires devel
+
* Thu Sep 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-3
- missed a few BR, this should be all of them
More information about the scm-commits
mailing list