Hello community, here is the log from the commit of package sox for openSUSE:Factory checked in at 2012-04-17 07:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sox (Old) and /work/SRC/openSUSE:Factory/.sox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sox", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sox/sox.changes 2011-11-28 12:57:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sox.new/sox.changes 2012-04-17 07:49:59.000000000 +0200 @@ -1,0 +2,27 @@ +Sat Apr 14 12:59:20 UTC 2012 - reddw...@opensuse.org + +- Update to version 14.4.0 + o Add floating point encodings in AIFF-C files. + o Pad WAV data chunks to an even number of bytes. + o Made Pulse Audio driver the default driver. + o Lots of improvements to man pages. + o New upsample, hilbert, and downsample effects. + o Fix fading bugs. + o Enable --plot on biquad and fir effects. + o Now effects chain can be unlimitted length. + o Fix newfile/restart effects when merging or mixing files. + o Fix crash in compand and mcompand effect. + o Improved audio length calculations when using effects. + o New trim effect with enhanced capabilities. + o Improved large file support. + o MP2 write support. +- Split librarires to follow SLPP +- Optionally enable twolame support +- Use pkgconfig() style BuildRequires +- Update ocloexec patch to apply to the new version +- Remove audioio.h/sunaudio support +- Remove unneeded ncurses BuildRequire +- Remove patches not needed anymore (sox-14.3.2-new_ffmpeg.patch, + sox-14.3.1-undefined.patch and sox-14.3.1-aliasing.patch) + +------------------------------------------------------------------- Old: ---- audioio.h sox-14.3.1-aliasing.patch sox-14.3.1-undefined.patch sox-14.3.2-new_ffmpeg.patch sox-14.3.2.tar.bz2 sox-ocloexec.patch New: ---- sox-14.4.0-ocloexec.patch sox-14.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sox.spec ++++++ --- /var/tmp/diff_new_pack.dXMrBo/_old 2012-04-17 07:50:01.000000000 +0200 +++ /var/tmp/diff_new_pack.dXMrBo/_new 2012-04-17 07:50:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sox # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,56 +16,64 @@ # +%define soname 2 + %bcond_with ffmpeg %bcond_with mad %bcond_with lame %bcond_with amrwb %bcond_with amrnb +%bcond_with twolame Name: sox -BuildRequires: alsa-devel BuildRequires: file-devel -BuildRequires: flac-devel BuildRequires: ladspa-devel -BuildRequires: libao-devel BuildRequires: libgsm-devel BuildRequires: libid3tag-devel -BuildRequires: libpng-devel -BuildRequires: libpulse-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: wavpack-devel -BuildRequires: ncurses-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(ao) +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vorbisenc) +BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(wavpack) +BuildRequires: pkgconfig(zlib) %if %{with ffmpeg} -BuildRequires: libffmpeg-devel +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) %endif %if %{with mad} -BuildRequires: libmad-devel +BuildRequires: pkgconfig(mad) %endif %if %{with lame} BuildRequires: libmp3lame-devel %endif -%if %{with amrwb} && %{with amrnb} -BuildRequires: libopencore-amr-devel +%if %{with amrnb} +BuildRequires: pkgconfig(opencore-amrnb) +%endif +%if %{with amrwb} +BuildRequires: pkgconfig(opencore-amrwb) +%endif +%if %{with twolame} +BuildRequires: pkgconfig(twolame) %endif -Version: 14.3.2 -Release: 3 +Version: 14.4.0 +Release: 0 +Summary: Sound Conversion Tools License: LGPL-2.1+ ; GPL-2.0+ -Summary: Sound Conversion Tools and Library -Url: http://sox.sourceforge.net Group: Productivity/Multimedia/Sound/Editors and Convertors -Source: http://downloads.sourceforge.net/project/sox/sox/%{version}/%{name}-%{version}.tar.bz2 -Source1: audioio.h -# PATCH-FIX-UPSTREAM %{name}-14.3.2-new_ffmpeg.patch reddw...@opensuse.org -- make it work with new ffmpeg, from upstream GIT -Patch0: %{name}-14.3.2-new_ffmpeg.patch -# PATCH-FIX-UPSTREAM %{name}-14.3.1-undefined.patch sf#3072301 reddw...@opensuse.org -- fix undefined behavior problems as reported by post-build script -Patch2: %{name}-14.3.1-undefined.patch -# PATCH-FIX-UPSTREAM %{name}-14.3.1-aliasing.patch sf#3072320 reddw...@opensuse.org -- fix an aliasing problem as reported by post-build script -Patch3: %{name}-14.3.1-aliasing.patch +Url: http://sox.sourceforge.net +Source0: http://downloads.sourceforge.net/project/sox/sox/%{version}/%{name}-%{version}.tar.bz2 #PATCH-FIX-OPENSUSE crrodrig...@opensuse.org linux/glibc specific patch to open all fds with O_CLOEXEC (not suitable for other OS) -Patch4: sox-ocloexec.patch +Patch0: sox-14.4.0-ocloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,12 +82,20 @@ it will come in very handy. SOX is really only usable day-to-day if you hide the wacky options with one-line shell scripts. +%package -n libsox%{soname} +Summary: Sound Conversion Library +Group: System/Libraries + +%description -n libsox%{soname} +SOX is intended to be the Swiss Army knife of sound processing tools. +It does many things, it just does not do them all well. Sooner or later +it will come in very handy. SOX is really only usable day-to-day if you +hide the wacky options with one-line shell scripts. + %package devel -License: LGPL-2.1+ ; GPL-2.0+ Summary: Sound Conversion Tools and Library Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Requires: pkg-config +Requires: libsox%{soname} = %{version} %description devel SOX is intended to be the Swiss Army knife of sound processing tools. @@ -89,55 +105,42 @@ %prep %setup -q -%patch0 -p1 -%patch2 -%patch3 %if 0%{?suse_version} > 1140 -%patch4 +%patch0 %endif FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/sox.c +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/sox.h src/libsox.c FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/sox.c +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/sox.h src/libsox.c %build -# /dev/audio (OSS) support. If it ever breaks just remove it. -if [ ! -f %{_includedir}/sun/audioio.h ]; then - mkdir -p include/sun - cp %{S:1} include/sun/audioio.h -fi -export CPPFLAGS=-I$PWD/include -# -%configure --disable-static +%configure --disable-static --with-distro=openSUSE make %{?_smp_mflags} %install -%makeinstall +%make_install rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/sox/*.la -%clean -rm -rf %{buildroot} +%post -n libsox%{soname} -p /sbin/ldconfig -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%postun -n libsox%{soname} -p /sbin/ldconfig %files %defattr(0644,root,root,0755) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README src/monkey.* +%doc AUTHORS COPYING ChangeLog NEWS README src/monkey.wav %attr(0755,root,root) %{_bindir}/* -# I don't know of anything which uses libsox, but if the soname changes perhaps -# it's the time to split the package and follow SLPP -%{_libdir}/libsox.so.1 -%{_libdir}/libsox.so.1.* %{_mandir}/man1/* -%{_mandir}/man3/* %{_mandir}/man7/* +%files -n libsox%{soname} +%defattr(0644,root,root,0755) +%{_libdir}/libsox.so.%{soname}* + %files devel -%defattr(-,root,root) +%defattr(0644,root,root,0755) %{_includedir}/* -%{_libdir}/lib*.so +%{_libdir}/libsox.so %{_libdir}/pkgconfig/sox.pc +%{_mandir}/man3/libsox.3* %changelog ++++++ sox-14.4.0-ocloexec.patch ++++++ Index: src/8svx.c =================================================================== --- src/8svx.c.orig +++ src/8svx.c @@ -161,7 +161,7 @@ static int startread(sox_format_t * ft) chan1_pos = lsx_tell(ft); for (i = 1; i < channels; i++) { - if ((p->ch[i] = fopen(ft->filename, "rb")) == NULL) + if ((p->ch[i] = fopen(ft->filename, "rbe")) == NULL) { lsx_fail_errno(ft,errno,"Can't open channel file '%s'", ft->filename); Index: src/effects_i.c =================================================================== --- src/effects_i.c.orig +++ src/effects_i.c @@ -355,7 +355,7 @@ FILE * lsx_open_input_file(sox_effect_t effp->global_info->global_info->stdin_in_use_by = effp->handler.name; file = stdin; } - else if (!(file = fopen(filename, "r"))) { + else if (!(file = fopen(filename, "re"))) { lsx_fail("couldn't open file %s: %s", filename, strerror(errno)); return NULL; } Index: src/formats.c =================================================================== --- src/formats.c.orig +++ src/formats.c @@ -373,7 +373,7 @@ static FILE * xfopen(char const * identi FILE * f = NULL; #ifdef HAVE_POPEN #ifndef POPEN_MODE -#define POPEN_MODE "r" +#define POPEN_MODE "re" #endif f = popen(identifier + 1, POPEN_MODE); *io_type = lsx_io_pipe; @@ -384,6 +384,7 @@ static FILE * xfopen(char const * identi } else if (is_url(identifier)) { FILE * f = NULL; +/* XXX: really folks ? forking a wget process to get an URL.. (!!!!!) */ #ifdef HAVE_POPEN char const * const command_format = "wget --no-check-certificate -q -O- \"%s\""; char * command = lsx_malloc(strlen(command_format) + strlen(identifier)); @@ -460,7 +461,7 @@ static sox_format_t * open_read( #ifdef HAVE_FMEMOPEN buffer? fmemopen(buffer, buffer_size, "rb") : #endif - xfopen(path, "rb", &ft->io_type); + xfopen(path, "rbe", &ft->io_type); type = io_types[ft->io_type]; if (ft->fp == NULL) { lsx_fail("can't open input %s `%s': %s", type, path, strerror(errno)); @@ -858,7 +859,7 @@ static sox_format_t * open_write( buffer? fmemopen(buffer, buffer_size, "w+b") : buffer_ptr? open_memstream(buffer_ptr, buffer_size_ptr) : #endif - fopen(path, "w+b"); + fopen(path, "w+be"); if (ft->fp == NULL) { lsx_fail("can't open output file `%s': %s", path, strerror(errno)); goto error; @@ -1068,7 +1069,7 @@ int sox_parse_playlist(sox_playlist_call char * dirname = lsx_strdup(listname); char * slash_pos = LAST_SLASH(dirname); lsx_io_type io_type; - FILE * file = xfopen(listname, "r", &io_type); + FILE * file = xfopen(listname, "re", &io_type); char * filename; int c, result = SOX_SUCCESS; Index: src/libsox_i.c =================================================================== --- src/libsox_i.c.orig +++ src/libsox_i.c @@ -34,7 +34,7 @@ #else #define MKTEMP_X 0 #endif - +#include <fcntl.h> #ifndef HAVE_MKSTEMP #include <fcntl.h> #include <sys/types.h> @@ -99,7 +99,7 @@ FILE * lsx_tmpfile(void) int fildes; strcpy(name, path); strcat(name, end); - fildes = mkstemp(name); + fildes = mkostemp(name, O_CLOEXEC); #ifdef HAVE_UNISTD_H lsx_debug(FAKE_MKSTEMP "mkstemp, name=%s (unlinked)", name); unlink(name); @@ -107,7 +107,7 @@ FILE * lsx_tmpfile(void) lsx_debug(FAKE_MKSTEMP "mkstemp, name=%s (O_TEMPORARY)", name); #endif free(name); - return fildes == -1? NULL : fdopen(fildes, "w+"); + return fildes == -1? NULL : fdopen(fildes, "w+e"); } /* Use standard tmpfile (delete on close); tmp dir is undefined: */ Index: src/noiseprof.c =================================================================== --- src/noiseprof.c.orig +++ src/noiseprof.c @@ -75,7 +75,7 @@ static int sox_noiseprof_start(sox_effec effp->global_info->global_info->stdout_in_use_by = effp->handler.name; data->output_file = stdout; } - else if ((data->output_file = fopen(data->output_filename, "w")) == NULL) { + else if ((data->output_file = fopen(data->output_filename, "we")) == NULL) { lsx_fail("Couldn't open profile file %s: %s", data->output_filename, strerror(errno)); return SOX_EOF; } Index: src/sox.c =================================================================== --- src/sox.c.orig +++ src/sox.c @@ -906,7 +906,7 @@ static char * * strtoargv(char * s, int static void read_user_effects(char const *filename) { - FILE *file = fopen(filename, "rt"); + FILE *file = fopen(filename, "rte"); const size_t buffer_size_step = 1024; size_t buffer_size = buffer_size_step; char *s = lsx_malloc(buffer_size); /* buffer for one input line */ @@ -1293,7 +1293,7 @@ static int kbhit(void) static void adjust_volume(int delta) { char * from_env = getenv("MIXERDEV"); - int vol1 = 0, vol2 = 0, fd = open(from_env? from_env : "/dev/mixer", O_RDWR); + int vol1 = 0, vol2 = 0, fd = open(from_env? from_env : "/dev/mixer", O_RDWR|O_CLOEXEC); if (fd >= 0) { if (ioctl(fd, MIXER_READ(SOUND_MIXER_PCM), &vol1) != -1) { int side1 = vol1 & 0xff, side2 = (vol1 >> 8) & 0xff; @@ -2123,7 +2123,7 @@ static void read_comment_file(sox_commen int c; size_t text_length = 100; char * text = lsx_malloc(text_length + 1); - FILE * file = fopen(filename, "rt"); + FILE * file = fopen(filename, "rte"); if (file == NULL) { lsx_fail("Cannot open comment file `%s'", filename); Index: src/spectrogram.c =================================================================== --- src/spectrogram.c.orig +++ src/spectrogram.c @@ -492,7 +492,7 @@ static int axis(double to, int max_steps static int stop(sox_effect_t * effp) { priv_t * p = (priv_t *) effp->priv; - FILE * file = fopen(p->out_name, "wb"); + FILE * file = fopen(p->out_name, "wbe"); uLong font_len = 96 * font_y; int chans = effp->in_signal.channels; int c_rows = p->rows * chans + chans - 1; Index: src/util.h =================================================================== --- src/util.h.orig +++ src/util.h @@ -120,7 +120,7 @@ #define open _open #define pclose _pclose #define popen _popen -#define POPEN_MODE "rb" +#define POPEN_MODE "rbe" #define setmode _setmode #define snprintf _snprintf ++++++ sox-14.3.2.tar.bz2 -> sox-14.4.0.tar.bz2 ++++++ ++++ 36346 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org