Author: hobbes1069 Update of /cvs/nonfree/rpms/sox-plugins-nonfree/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28688 Modified Files: sources sox-plugins-nonfree.spec Added Files: sox-mcompand_clipping.patch Removed Files: 01-making-autoreconf-possible.patch 02-reconfigured-using-autoreconf.patch 03-adding-support-for-without-lpc.patch 04-nuking-libgsm-from-build-system.patch 06-fix-compile-error.patch 07-ignore-internal-libgsm.patch Log Message: * Tue Apr 02 2013 Frantisek Kluknavsky <fkluknav(a)redhat.com&gt; - 14.4.1-3 - added autoreconf to replace old scropts => support aarch64 sox-mcompand_clipping.patch: mcompand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE sox-mcompand_clipping.patch --- diff -up wrk/src/mcompand.c.wrk wrk/src/mcompand.c --- wrk/src/mcompand.c.wrk 2013-02-15 10:15:03.426639189 +0100 +++ wrk/src/mcompand.c 2013-02-15 10:18:42.408008144 +0100 @@ -395,7 +395,7 @@ static int flow(sox_effect_t * effp, con (void)sox_mcompand_flow_1(effp, c,l,bbuf,abuf,len, (size_t)effp->out_signal.channels); for (i=0;i<len;++i) { - out = obuf[i] + abuf[i]; + out = (double)obuf[i] + (double)abuf[i]; SOX_SAMPLE_CLIP_COUNT(out, effp->clips); obuf[i] = out; } Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/F-18/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2012 16:20:27 -0000 1.2 +++ sources 3 May 2013 19:08:37 -0000 1.3 @@ -1 +1 @@ -e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz +b0c15cff7a4ba0ec17fdc74e6a1f9cf1 sox-14.4.0.tar.gz Index: sox-plugins-nonfree.spec =================================================================== RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/F-18/sox-plugins-nonfree.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sox-plugins-nonfree.spec 23 Apr 2012 16:20:27 -0000 1.1 +++ sox-plugins-nonfree.spec 3 May 2013 19:08:40 -0000 1.2 @@ -1,101 +1,422 @@ +# To build plugins add --with plugins_freeworld or --with plugins_nonfree to +# your rpmbuild command. +#%global with_plugins_freeworld %{?_with_plugins_freeworld:1} %{!?_with_plugins_freeworld:0} +#%global with_plugins_nonfree %{?_with_plugins_nonfree:1} %{!?_with_plugins_nonfree:0} +%global with_plugins_nonfree 1 +%if %{with_plugins_freeworld} + %global plugins freeworld +%endif +%if %{with_plugins_nonfree} + %global plugins nonfree +%endif %global realname sox -Summary: Additional (non-free) codecs for sox -Name: sox-plugins-nonfree -Version: 14.3.2 -Release: 2%{?dist} -# sox.c is GPLv2, all other is LGPL2.1 -License: GPLv2+ and LGPLv2+ -Group: Applications/Multimedia - -URL: http://sox.sourceforge.net/ -Source0: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz -Patch0: 01-making-autoreconf-possible.patch -Patch1: 02-reconfigured-using-autoreconf.patch -Patch2: 03-adding-support-for-without-lpc.patch -Patch3: 04-nuking-libgsm-from-build-system.patch -Patch4: 06-fix-compile-error.patch -Patch5: 07-ignore-internal-libgsm.patch - -BuildRequires: libvorbis-devel -BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel -BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel -BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: libtool +Summary: A general purpose sound file conversion tool +Name: sox%{?plugins:-plugins-%{plugins}} +Version: 14.4.1 +Release: 3%{?dist} +License: GPLv2+ and LGPLv2+ +Group: Applications/Multimedia +Source: http://downloads.sourceforge.net/%{realname}/%{realname}-%{version}.tar.gz +URL: http://sox.sourceforge.net/ +Patch0: sox-mcompand_clipping.patch +BuildRequires: libvorbis-devel +BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel +BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel +BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libtool # Additional requirements for RPM Fusion +%if %{with_plugins_freeworld} +BuildRequires: lame-devel ladspa-devel +BuildRequires: libmad-devel +%endif +%if %{with_plugins_nonfree} BuildRequires: amrwb-devel amrnb-devel ladspa-devel -# Require Fedora package +%endif +%if %{with_plugins_freeworld} || %{with_plugins_nonfree} +# Need to require sox Requires: sox%{?_isa} - -# No upstream exists and it has been moified by sox. -Provides: bundled(lpc10) - +%endif %description SoX (Sound eXchange) is a sound file format converter SoX can convert between many different digitized sound formats and perform simple sound manipulation functions, including sound effects. +%if %{with_plugins_freeworld} +This package provides the plugin for MPEG-2 audio layer 3 audio (MP3) support. +%endif +%if %{with_plugins_nonfree} This package provides the plugins for Adaptive Multi-Rate Wideband and Narrowband codecs. +%endif + + +%if ! %{with_plugins_freeworld} && ! %{with_plugins_nonfree} +%package -n sox-devel +Summary: The SoX sound file format converter libraries +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description -n sox-devel +This package contains the library needed for compiling applications +which will use the SoX sound file format converter. +%endif %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -# Only appliy for ffmpeg 0.8 and above -%if %fedora >= 16 -%patch4 -p1 -%endif -%patch5 -p1 - -# Remove bundled libs -rm -rf libgsm -# lpc10 has no upstream so consider it a private lib. -# See http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2012-March/0120... -#rm -rf lpc10 - +%patch0 -p1 -b .clip +#regenerate scripts from older autoconf to support aarch64 +autoreconf -vfi %build -CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"; export CFLAGS -autoreconf -if -%configure --enable-static=no \ - --with-dyn-default \ - --with-lpc10 \ - --with-gsm=dyn \ - --includedir=%{_includedir}/sox \ - --with-distro=Fedora - +CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-dyn-default --with-gsm --includedir=%{_includedir}/sox --disable-static --with-distro=Fedora make %{?_smp_mflags} - %install -make install DESTDIR=%{buildroot} - -# Remove all static libs -find %{buildroot}%{_libdir} -name "*.la" -exec rm -f {} \; +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/%{_libdir}/libsox.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a # Remove all the plugins execept the one we want. +%if %{with_plugins_freeworld} +find %{buildroot}%{_libdir}/sox -name "*.so" \! -name "*mp3.so" -exec rm -f {} \; +%endif +%if %{with_plugins_nonfree} find %{buildroot}%{_libdir}/sox -name "*.so" \! -name "*amr*.so" -exec rm -f {} \; +%endif + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %doc AUTHORS ChangeLog COPYING README +%if %{with_plugins_freeworld} +%{_libdir}/sox/libsox_fmt_mp3.so +%endif +%if %{with_plugins_nonfree} %{_libdir}/sox/libsox_fmt_amr*.so +%endif +%if %{with_plugins_freeworld} || %{with_plugins_nonfree} %exclude %{_bindir} %exclude %{_datadir} %exclude %{_includedir} %exclude %{_libdir}/*.so* %exclude %{_libdir}/pkgconfig +%else +%{_bindir}/play +%{_bindir}/rec +%{_bindir}/sox +%{_bindir}/soxi +%{_libdir}/libsox.so.* +%dir %{_libdir}/sox/ +%{_libdir}/sox/libsox_fmt_*.so +%{_mandir}/man1/* +%{_mandir}/man7/* + +%files -n sox-devel +%{_includedir}/sox +%{_libdir}/libsox.so +%{_libdir}/pkgconfig/sox.pc +%{_mandir}/man3/* +%endif %changelog -* Thu Mar 25 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-2 -- Add patches to deal with bundled libraries. -- Strip rpath from library. +* Tue Apr 02 2013 Frantisek Kluknavsky <fkluknav(a)redhat.com&gt; - 14.4.1-3 +- added autoreconf to replace old scropts => support aarch64 + +* Fri Feb 15 2013 Frantisek Kluknavsky <fkluknav(a)redhat.com&gt; - 14.4.1-2 +- added sox-mcompand_clipping.patch to prevent integer overflow + +* Thu Feb 14 2013 Frantisek Kluknavsky <fkluknav(a)redhat.com&gt; - 14.4.1-1 +- rebase to 14.4.1 + +* Tue Sep 18 2012 Honza Horak <hhorak(a)redhat.com&gt; - 14.4.0-3 +- Minor spec file fixes + +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 14.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Mar 09 2012 Honza Horak <hhorak(a)redhat.com&gt; - 14.4.0-1 +- updated to upstream version 14.4.0 + +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 14.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 07 2011 Adam Jackson <ajax(a)redhat.com&gt; 14.3.2-2 +- Rebuild for libpng 1.5 + +* Sat Mar 19 2011 Felix Kaechele <heffer(a)fedoraproject.org&gt; - 14.3.2-1 +- 14.3.2 +- added PulseAudio support + +* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 14.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Sep 02 2010 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.3.1-2 +- rebuild + +* Mon Apr 12 2010 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.3.1-1 +- updated to upstream version + +* Fri Feb 26 2010 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.3.0-2 +- fixed license tag + +* Mon Nov 23 2009 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.3.0-1 +- 14.3.0 + +* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 14.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 14.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.2.0-1 +- 14.2.0 + +* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.1.0-7.20081105cvs +- patch for newer libtool + +* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.1.0-6.20081105cvs +- rebuild for libtool + +* Wed Nov 5 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.1.0-5.20081105cvs +- forgot to add libtool as a BR + +* Wed Nov 5 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 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(a)redhat.com&gt; 14.1.0-3 +- missed a few BR, this should be all of them + +* Thu Sep 4 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.1.0-2 +- enable the full set of functionality with missing BR + +* Thu Sep 4 2008 Tom "spot" Callaway <tcallawa(a)redhat.com&gt; 14.1.0-1 +- fix license tag +- update to 14.1.0 +- disabled static libs (if something really needs them, re-enable them + in a -static subpackage) + +* Wed Apr 16 2008 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.0.1-2 +- enabled flac support +- Resolves: #442703 + +* Mon Feb 25 2008 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.0.1-1 +- New version 14.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org&gt; - 14.0.0-2 +- Autorebuild for GCC 4.3 + +* Mon Oct 29 2007 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; - 14.0.0-1 +- New version 14.0.0 +- Thanks to Chris Bagwell <chris at cnpbagwell dot com> for initial changes to spec file + +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 13.0.0-3 +- Rebuild for selinux ppc32 issue. + +* Mon Jul 16 2007 Jiri Moskovcak <jmoskovc(a)redhat.com&gt; 13.0.0-2 +- uses external libgsm instead of local copy +- spec file update: added BuildRequires: gsm-devel +- Resolves: #239955 + +* Mon Feb 26 2007 Thomas Woerner <twoerner(a)redhat.com&gt; 13.0.0-1 +- new version 13.0.0 +- spec file cleanup (#227429) +- new ldconfig calls for post and postun + +* Mon Jul 24 2006 Thomas Woerner <twoerner(a)redhat.com&gt; 12.18.1-1 +- new version 12.18.1 +- fixed multilib devel conflict in libst-config (#192751) + +* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 12.17.9-1.2.1 +- rebuild + +* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 12.17.9-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 12.17.9-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Dec 13 2005 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.9-1 +- new version 12.17.9 + +* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com&gt; +- rebuilt + +* Thu May 12 2005 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.7-3 +- fixed bad link for man/man1/rec.1.gz (#154089) +- using /usr/include instead of kernel-devel includes + +* Tue Apr 26 2005 Warren Togami <wtogami(a)redhat.com&gt; 12.17.7-2 +- overflow patch (#155224 upstream) + +* Sun Apr 17 2005 Warren Togami <wtogami(a)redhat.com&gt; 12.17.7-1 +- 12.17.7 +- BR alsa-lib-devel (#155224 thias) + +* Sun Feb 27 2005 Florian La Roche <laroche(a)redhat.com&gt; +- Copyright: -> License: + +* Mon Nov 22 2004 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.6-1 +- new version 12.17.6 + +* Wed Sep 15 2004 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.5-3 +- moved libst-config to devel package (#132489) + +* Thu Aug 26 2004 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.5-2 +- fixed initialization bug in wav file handler (#130968) + +* Thu Aug 19 2004 Thomas Woerner <twoerner(a)redhat.com&gt; 12.17.5-1 +- new version 12.17.5 + +* Fri Jul 23 2004 Bill Nottingham <notting(a)redhat.com&gt; 12.17.4-4.fc2 +- add patch for buffer overflow in wav code (CAN-2004-0557, #128158) + +* Fri Jul 9 2004 Bill Nottingham <notting(a)redhat.com&gt; 12.17.4-4 +- add patch for 64-bit problem (#127502) + +* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com&gt; +- rebuilt + +* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com&gt; +- rebuilt + +* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com&gt; +- rebuilt + +* Tue Oct 7 2003 Bill Nottingham <notting(a)redhat.com&gt; 12.17.4-1 +- update to 12.17.4 +- ship soxmix (#102499) +- fix soxplay to handle files with spaces (#91144) +- use LFS (#79151) + +* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com&gt; +- rebuilt + +* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com&gt; +- rebuilt + +* Fri Feb 21 2003 Elliot Lee <sopwith(a)redhat.com&gt; 12.17.3-10 +- Add sox-vorberr.patch to fix segfault in #81448 +- _smp_mflags + +* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com&gt; +- rebuilt + +* Wed Nov 27 2002 Tim Powers <timp(a)redhat.com&gt; 12.17.3-8 +- remoive unpackaged files from the buildroot +- lib64'ize + +* Fri Jul 18 2002 Bill Nottingham <notting(a)redhat.com&gt; +- build against current libvorbis + +* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com&gt; +- automated rebuild + +* Thu May 23 2002 Tim Powers <timp(a)redhat.com&gt; +- automated rebuild + +* Thu Feb 21 2002 Bill Nottingham <notting(a)redhat.com&gt; +- rebuild + +* Wed Jan 09 2002 Tim Powers <timp(a)redhat.com&gt; +- automated rebuild + +* Mon Jan 07 2002 Florian La Roche <Florian.LaRoche(a)redhat.de&gt; +- do not require gsm-devel as it has been excluded from rawhide + +* Fri Jan 4 2002 Bill Nottingham <notting(a)redhat.com&gt; 12.17.3-1 +- update to 12.17.3 + +* Wed Dec 4 2001 Bill Nottingham <notting(a)redhat.com&gt; +- update to 12.17.2 + +* Thu Aug 9 2001 Bill Nottingham <notting(a)redhat.com&gt; +- add patch to fix recording (#41755) +- fix license (#50574) + +* Sun Jun 24 2001 Elliot Lee <sopwith(a)redhat.com&gt; +- Bump release + rebuild. + +* Tue Jan 9 2001 Bill Nottingham <notting(a)redhat.com&gt; +- rebuild against new gsm-devel + +* Tue Jan 2 2001 Bill Nottingham <notting(a)redhat.com&gt; +- re-enable gsm stuff +- update to 12.17.1 + +* Fri Dec 01 2000 Bill Nottingham <notting(a)redhat.com&gt; +- rebuild because of broken fileutils + +* Mon Nov 13 2000 Bill Nottingham <notting(a)redhat.com&gt; +- update to 12.17 +- yank out gsm stuff + +* Tue Aug 7 2000 Bill Nottingham <notting(a)redhat.com&gt; +- fix playing of sounds on cards that don't support mono + +* Sat Aug 5 2000 Bill Nottingham <notting(a)redhat.com&gt; +- fix playing of sounds on cards that don't support 8-bit + +* Wed Jul 12 2000 Prospector <bugzilla(a)redhat.com&gt; +- automatic rebuild + +* Thu Feb 03 2000 Bill Nottingham <notting(a)redhat.com&gt; +- fix manpage link the Right Way(tm) + +* Thu Feb 03 2000 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; +- Fix rec manpage link - now that man pages are compressed, it should point to + play.1.gz, not play.1 + +* Wed Feb 02 2000 Cristian Gafton <gafton(a)redhat.com&gt; +- fix description + +* Tue Sep 28 1999 Bill Nottingham <notting(a)redhat.com&gt; +- Grrr. Arrrrgh. Fix link. + +* Fri Sep 24 1999 Bill Nottingham <notting(a)redhat.com&gt; +- add some more files to devel + +* Fri Sep 17 1999 Bill Nottingham <notting(a)redhat.com&gt; +- fix link + +* Fri Jul 30 1999 Bill Nottingham <notting(a)redhat.com&gt; +- update to 12.16 + +* Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com&gt; +- auto rebuild in the new build environment (release 4) + +* Wed Jan 20 1999 Bill Nottingham <notting(a)redhat.com&gt; +- allow spaces in filenames for play/rec + +* Wed Dec 9 1998 Bill Nottingham <notting(a)redhat.com&gt; +- fix docs + +* Mon Nov 23 1998 Bill Nottingham <notting(a)redhat.com&gt; +- update to 12.15 + +* Sat Oct 10 1998 Michael Maher <mike(a)redhat.com&gt; +- fixed broken spec file + +* Mon Jul 13 1998 Michael Maher <mike(a)redhat.com&gt; +- updated source from Chris Bagwell. + +* Wed Jun 23 1998 Michael Maher <mike(a)redhat.com&gt; +- made patch to fix the '-e' option. BUG 580 +- added buildroot + +* Fri May 08 1998 Prospector System <bugs(a)redhat.com&gt; +- translations modified for de, fr, tr -* Sun Feb 26 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-1 -- Initial Release. +* Thu Nov 06 1997 Erik Troan <ewt(a)redhat.com&gt; +- built against glibc --- 01-making-autoreconf-possible.patch DELETED --- --- 02-reconfigured-using-autoreconf.patch DELETED --- --- 03-adding-support-for-without-lpc.patch DELETED --- --- 04-nuking-libgsm-from-build-system.patch DELETED --- --- 06-fix-compile-error.patch DELETED --- --- 07-ignore-internal-libgsm.patch DELETED ---