Hello community, here is the log from the commit of package sox checked in at Mon Sep 1 15:29:50 CEST 2008. -------- --- sox/sox.changes 2008-06-27 17:11:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/sox/sox.changes 2008-09-01 14:47:41.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Sep 1 14:46:27 CEST 2008 - prusnak@suse.cz + +- updated to 14.1.0 + * New WavPack format. + * New htk format. + * New .f4 & .f8 raw file extensions. + * New `splice' effect; splice together audio sections. + * New `remix' effect; mixes any number of channels. + * New `norm' (normalise) effect. + * New `delay' effect; delay one or more channels. + * New `contrast' enhancement effect. + * New `rate' high quality resampling effect. + * New `spectrogram' effect; creates a PNG (if built with PNG lib). + * New `gain' alias for the vol effect. + * New option --help-format shows info about supported format(s). + * New --combine=mix-power option to mix combine using 1/sqrt(n) scaling instead of 1/n. + * New --input-buffer option to specify (only) input buffer size. + * New `soxi' utility to extract/display file header fields. + * New VU meter. + * Can now write .amb (.wav variant) files. + * Can now read 2,3(2.6),4 bit ADPCM .voc files. + * Can now read some MP3 ID3 tags. + * Fix rec shortcut should apply bit depth (8-bit, 16-bit, etc.) to input handler. + * Fix endian selection (-B, -L, -x) in some circumstances. + * Various other small fixes/improvements. + +------------------------------------------------------------------- Old: ---- sox-14.0.1-module-avoid-version.patch sox-14.0.1.tar.bz2 sox-14.0.1-vorbis.patch New: ---- sox-14.1.0-module-avoid-version.patch sox-14.1.0.tar.bz2 sox-14.1.0-vorbis.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sox.spec ++++++ --- /var/tmp/diff_new_pack.A20781/_old 2008-09-01 15:29:37.000000000 +0200 +++ /var/tmp/diff_new_pack.A20781/_new 2008-09-01 15:29:37.000000000 +0200 @@ -1,22 +1,29 @@ # -# spec file for package sox (Version 14.0.1) +# spec file for package sox (Version 14.1.0) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: sox -BuildRequires: alsa-devel flac-devel libgsm-devel libvorbis-devel pkg-config +BuildRequires: alsa-devel flac-devel ladspa-devel libao-devel libgsm-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel pkg-config wavpack-devel License: BSD 3-Clause; GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors AutoReqProv: on -Version: 14.0.1 -Release: 21 +Version: 14.1.0 +Release: 1 Summary: Sound Conversion Tools and Library Url: http://sox.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -39,10 +46,10 @@ %package devel License: BSD 3-Clause; GPL v2 or later -Group: Productivity/Multimedia/Sound/Editors and Convertors +Group: Development/Libraries/C and C++ Summary: Sound Conversion Tools and Library Requires: %{name} = %{version} -Requires: alsa-devel flac-devel libgsm-devel libvorbis-devel +Requires: pkg-config alsa-devel flac-devel libgsm-devel libvorbis-devel libsndfile-devel wavpack-devel ladspa-devel libpng-devel libao-devel libsamplerate-devel %description devel SOX is intended to be the Swiss Army knife of sound processing tools. @@ -70,6 +77,7 @@ fi export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -DEXTERNAL_GSM -DHAVE_SYS_SOUNDCARD_H -fPIC -DPIC" export CPPFLAGS=-I$PWD/include +export LDFLAGS=-lltdl %configure --disable-static make %{?jobs:-j%jobs} @@ -100,8 +108,33 @@ %defattr(-,root,root) %{_includedir}/* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/sox.pc %changelog +* Mon Sep 01 2008 prusnak@suse.cz +- updated to 14.1.0 + * New WavPack format. + * New htk format. + * New .f4 & .f8 raw file extensions. + * New `splice' effect; splice together audio sections. + * New `remix' effect; mixes any number of channels. + * New `norm' (normalise) effect. + * New `delay' effect; delay one or more channels. + * New `contrast' enhancement effect. + * New `rate' high quality resampling effect. + * New `spectrogram' effect; creates a PNG (if built with PNG lib). + * New `gain' alias for the vol effect. + * New option --help-format shows info about supported format(s). + * New --combine=mix-power option to mix combine using 1/sqrt(n) scaling instead of 1/n. + * New --input-buffer option to specify (only) input buffer size. + * New `soxi' utility to extract/display file header fields. + * New VU meter. + * Can now write .amb (.wav variant) files. + * Can now read 2,3(2.6),4 bit ADPCM .voc files. + * Can now read some MP3 ID3 tags. + * Fix rec shortcut should apply bit depth (8-bit, 16-bit, etc.) to input handler. + * Fix endian selection (-B, -L, -x) in some circumstances. + * Various other small fixes/improvements. * Fri Jun 27 2008 schwab@suse.de - Use autoreconf. * Tue Mar 25 2008 prusnak@suse.cz ++++++ sox-14.0.1-module-avoid-version.patch -> sox-14.1.0-module-avoid-version.patch ++++++ --- sox/sox-14.0.1-module-avoid-version.patch 2008-06-27 17:39:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/sox/sox-14.1.0-module-avoid-version.patch 2008-09-01 12:07:13.000000000 +0200 @@ -1,6 +1,6 @@ --- src/Makefile.am +++ src/Makefile.am -@@ -7,6 +7,7 @@ AM_CFLAGS = #-Wconversion +@@ -7,6 +7,7 @@ # Pass flags from --enable-silent-libtool LIBTOOL = @LIBTOOL@ @LIBTOOLFLAGS@ @@ -8,16 +8,17 @@ ######################### # SoX - the application # -@@ -48,142 +49,193 @@ pkglib_LTLIBRARIES = libsox_fmt_auto.la - # File format detection - libsox_fmt_auto_la_SOURCES = auto.c - libsox_fmt_auto_la_LIBADD = libsox.la -+libsox_fmt_auto_la_LDFLAGS = $(MODULELDFLAGS) - +@@ -55,169 +56,233 @@ # File formats libsox_fmt_raw_la_SOURCES = raw-fmt.c libsox_fmt_raw_la_LIBADD = libsox.la +libsox_fmt_raw_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_f4_la_SOURCES = f4-fmt.c + libsox_fmt_f4_la_LIBADD = libsox.la ++libsox_fmt_f4_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_f8_la_SOURCES = f8-fmt.c + libsox_fmt_f8_la_LIBADD = libsox.la ++libsox_fmt_f8_la_LDFLAGS = $(MODULELDFLAGS) libsox_fmt_s1_la_SOURCES = s1-fmt.c libsox_fmt_s1_la_LIBADD = libsox.la +libsox_fmt_s1_la_LDFLAGS = $(MODULELDFLAGS) @@ -87,6 +88,9 @@ libsox_fmt_hcom_la_SOURCES = hcom.c libsox_fmt_hcom_la_LIBADD = libsox.la +libsox_fmt_hcom_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_htk_la_SOURCES = htk.c + libsox_fmt_htk_la_LIBADD = libsox.la ++libsox_fmt_htk_la_LDFLAGS = $(MODULELDFLAGS) libsox_fmt_lpc10_la_SOURCES = lpc10.c libsox_fmt_lpc10_la_LIBADD = ../lpc10/liblpc10.la libsox.la +libsox_fmt_lpc10_la_LDFLAGS = $(MODULELDFLAGS) @@ -96,15 +100,18 @@ libsox_fmt_prc_la_SOURCES = prc.c libsox_fmt_prc_la_LIBADD = libsox.la +libsox_fmt_prc_la_LDFLAGS = $(MODULELDFLAGS) - libsox_fmt_sf_la_SOURCES = sf.c sfircam.h + libsox_fmt_sf_la_SOURCES = sf.c libsox_fmt_sf_la_LIBADD = libsox.la +libsox_fmt_sf_la_LDFLAGS = $(MODULELDFLAGS) libsox_fmt_smp_la_SOURCES = smp.c libsox_fmt_smp_la_LIBADD = libsox.la +libsox_fmt_smp_la_LDFLAGS = $(MODULELDFLAGS) - libsox_fmt_sndrtool_la_SOURCES = sndrtool.c - libsox_fmt_sndrtool_la_LIBADD = libsox.la -+libsox_fmt_sndrtool_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_sounder_la_SOURCES = sounder.c + libsox_fmt_sounder_la_LIBADD = libsox.la ++libsox_fmt_sounder_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_soundtool_la_SOURCES = soundtool.c + libsox_fmt_soundtool_la_LIBADD = libsox.la ++libsox_fmt_soundtool_la_LDFLAGS = $(MODULELDFLAGS) libsox_fmt_sphere_la_SOURCES = sphere.c libsox_fmt_sphere_la_LIBADD = libsox.la +libsox_fmt_sphere_la_LDFLAGS = $(MODULELDFLAGS) @@ -120,7 +127,7 @@ libsox_fmt_ima_la_SOURCES = ima-fmt.c libsox_fmt_ima_la_LIBADD = libsox.la +libsox_fmt_ima_la_LDFLAGS = $(MODULELDFLAGS) - libsox_fmt_wav_la_SOURCES = adpcm.c adpcm.h ima_rw.c ima_rw.h wav.c wav.h + libsox_fmt_wav_la_SOURCES = adpcm.c adpcm.h ima_rw.c ima_rw.h wav.c libsox_fmt_wav_la_LIBADD = libsox.la @GSM_LIBS@ @LIBGSM_LIBADD@ +libsox_fmt_wav_la_LDFLAGS = $(MODULELDFLAGS) libsox_fmt_wve_la_SOURCES = wve.c @@ -146,20 +153,53 @@ libsox_fmt_sndfile_la_CFLAGS = @SNDFILE_CFLAGS@ libsox_fmt_sndfile_la_LIBADD = libsox.la @SNDFILE_LIBS@ +libsox_fmt_sndfile_la_LDFLAGS = $(MODULELDFLAGS) - pkglib_LTLIBRARIES += libsox_fmt_sndfile.la + libsox_fmt_caf_la_SOURCES = caf.c + libsox_fmt_caf_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_caf_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_mat4_la_SOURCES = mat4.c + libsox_fmt_mat4_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_mat4_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_mat5_la_SOURCES = mat5.c + libsox_fmt_mat5_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_mat5_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_paf_la_SOURCES = paf.c + libsox_fmt_paf_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_paf_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_fap_la_SOURCES = fap.c + libsox_fmt_fap_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_fap_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_w64_la_SOURCES = w64.c + libsox_fmt_w64_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_w64_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_xi_la_SOURCES = xi.c + libsox_fmt_xi_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_xi_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_pvf_la_SOURCES = pvf.c + libsox_fmt_pvf_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_pvf_la_LDFLAGS = $(MODULELDFLAGS) + libsox_fmt_sd2_la_SOURCES = sd2.c + libsox_fmt_sd2_la_LIBADD = libsox.la libsox_fmt_sndfile.la ++libsox_fmt_sd2_la_LDFLAGS = $(MODULELDFLAGS) + pkglib_LTLIBRARIES += libsox_fmt_sndfile.la libsox_fmt_caf.la libsox_fmt_mat4.la libsox_fmt_mat5.la libsox_fmt_paf.la libsox_fmt_fap.la libsox_fmt_w64.la libsox_fmt_xi.la libsox_fmt_pvf.la libsox_fmt_sd2.la endif if HAVE_AMRWB - libsox_fmt_amr_wb_la_SOURCES = amr-wb.c amr.h + libsox_fmt_amr_wb_la_SOURCES = amr-wb.c amr.h amr1.h amr2.h libsox_fmt_amr_wb_la_LIBADD = libsox.la @AMR_WB_LIBS@ +libsox_fmt_amr_wb_la_LDFLAGS = $(MODULELDFLAGS) pkglib_LTLIBRARIES += libsox_fmt_amr_wb.la endif if HAVE_AMRNB - libsox_fmt_amr_nb_la_SOURCES = amr-nb.c amr.h + libsox_fmt_amr_nb_la_SOURCES = amr-nb.c amr.h amr1.h amr2.h libsox_fmt_amr_nb_la_LIBADD = libsox.la @AMR_NB_LIBS@ +libsox_fmt_amr_nb_la_LDFLAGS = $(MODULELDFLAGS) pkglib_LTLIBRARIES += libsox_fmt_amr_nb.la endif + if HAVE_WAVPACK + libsox_fmt_wavpack_la_SOURCES = wavpack.c + libsox_fmt_wavpack_la_LIBADD = libsox.la @WAVPACK_LIBS@ ++libsox_fmt_wavpack_la_LDFLAGS = $(MODULELDFLAGS) + pkglib_LTLIBRARIES += libsox_fmt_wavpack.la + endif if HAVE_MP3 libsox_fmt_mp3_la_SOURCES = mp3.c mp3-duration.h libsox_fmt_mp3_la_LIBADD = libsox.la @MP3_LIBS@ @@ -167,7 +207,7 @@ pkglib_LTLIBRARIES += libsox_fmt_mp3.la endif if HAVE_OGG_VORBIS - libsox_fmt_vorbis_la_SOURCES = vorbis.c + libsox_fmt_vorbis_la_SOURCES = vorbis.c vorbis1.h libsox_fmt_vorbis_la_LIBADD = libsox.la @OGG_LIBS@ +libsox_fmt_vorbis_la_LDFLAGS = $(MODULELDFLAGS) pkglib_LTLIBRARIES += libsox_fmt_vorbis.la ++++++ sox-14.0.1.tar.bz2 -> sox-14.1.0.tar.bz2 ++++++ ++++ 56938 lines of diff (skipped) ++++++ sox-14.0.1-vorbis.patch -> sox-14.1.0-vorbis.patch ++++++ --- sox/sox-14.0.1-vorbis.patch 2007-10-04 10:45:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/sox/sox-14.1.0-vorbis.patch 2008-07-31 12:33:25.000000000 +0200 @@ -1,17 +1,16 @@ ---- src/vorbis.c -+++ src/vorbis.c -@@ -360,7 +360,13 @@ - } - quality = ft->signal.compression; - } -- vorbis_encode_init_vbr(&ve->vi, (int)ft->signal.channels, (int)ft->signal.rate, (float)(quality / 10)); -+ -+ if(vorbis_encode_init_vbr(&ve->vi, (int)ft->signal.channels, (int)ft->signal.rate, (float)(quality / 10))) -+ { -+ sox_fail_errno(ft,SOX_ERATE, -+ "libVorbis does not support this mode (eg, too low a bitrate, etc.)"); -+ return (SOX_EOF); -+ } +--- src/vorbis1.h ++++ src/vorbis1.h +@@ -21,8 +21,11 @@ + #pragma warning(push, 1) + #endif - vorbis_analysis_init(&ve->vd, &ve->vi); - vorbis_block_init(&ve->vd, &ve->vb); +- vorbis_encode_init_vbr( +- &ve->vi, ft->signal.channels, ft->signal.rate + .5, quality / 10); ++ if (vorbis_encode_init_vbr(&ve->vi, ft->signal.channels, ft->signal.rate + .5, quality / 10)) ++ { ++ lsx_fail_errno(ft, SOX_ERATE, "libVorbis does not support this mode (eg, too low a bitrate, etc.)"); ++ return (SOX_EOF); ++ } + + #if defined __SUNPRO_CC + #pragma enable_warn ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org