From 8a9ede842461de85fc2b9e040e004c6776ccb492722e5addfa703391f0762f8e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 15 May 2009 21:30:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/soundtouch?expand=0&rev=6 --- soundtouch-1.3.1.tar.bz2 | 3 -- soundtouch-1.4.0.tar.bz2 | 3 ++ soundtouch-autoreconf-fix.diff | 8 ---- soundtouch-gcc43-fix.diff | 10 ---- soundtouch-keep-flags.patch | 32 ------------- soundtouch-no-sse.diff | 17 ------- soundtouch-sse-automake-add.diff | 14 ------ soundtouch.changes | 13 ++++++ soundtouch.spec | 80 ++++++++++++++++++++++---------- 9 files changed, 71 insertions(+), 109 deletions(-) delete mode 100644 soundtouch-1.3.1.tar.bz2 create mode 100644 soundtouch-1.4.0.tar.bz2 delete mode 100644 soundtouch-autoreconf-fix.diff delete mode 100644 soundtouch-gcc43-fix.diff delete mode 100644 soundtouch-keep-flags.patch delete mode 100644 soundtouch-no-sse.diff delete mode 100644 soundtouch-sse-automake-add.diff diff --git a/soundtouch-1.3.1.tar.bz2 b/soundtouch-1.3.1.tar.bz2 deleted file mode 100644 index 8a672be..0000000 --- a/soundtouch-1.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c8163c94de9b32cc0e7056bfe54f6855461e08fda715873c077ea136afa76ee -size 217162 diff --git a/soundtouch-1.4.0.tar.bz2 b/soundtouch-1.4.0.tar.bz2 new file mode 100644 index 0000000..d7816e1 --- /dev/null +++ b/soundtouch-1.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d136a8a3365812b55d8ebdd05cccdded0b0fa2e13326b514b93c8adfdf9d505 +size 320930 diff --git a/soundtouch-autoreconf-fix.diff b/soundtouch-autoreconf-fix.diff deleted file mode 100644 index 1c7f051..0000000 --- a/soundtouch-autoreconf-fix.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.am-dist 2007-07-04 14:27:09.000000000 +0200 -+++ Makefile.am 2007-07-04 14:27:40.000000000 +0200 -@@ -67,4 +67,5 @@ - - # flag to aclocal where to find m4 macros for tests - ACLOCAL_AMFLAGS = -I config/m4 -+AUTOMAKE_OPTIONS = foreign - diff --git a/soundtouch-gcc43-fix.diff b/soundtouch-gcc43-fix.diff deleted file mode 100644 index 880583f..0000000 --- a/soundtouch-gcc43-fix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- source/example/SoundStretch/WavFile.cpp-dist 2007-11-22 13:08:06.000000000 +0100 -+++ source/example/SoundStretch/WavFile.cpp 2007-11-22 13:08:17.000000000 +0100 -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - - #include "WavFile.h" - diff --git a/soundtouch-keep-flags.patch b/soundtouch-keep-flags.patch deleted file mode 100644 index f97ab41..0000000 --- a/soundtouch-keep-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- config/am_include.mk -+++ config/am_include.mk -@@ -32,19 +32,6 @@ - INCLUDES=-I$(top_srcdir)/include - - --## CXXFLAGS is also automatically added to the $(CXX) macro at compile time, and --## is passed down to the children as well --## I list these here in case there needs to always be some flags passed to the compiler --CXXFLAGS=@CXXFLAGS@ -- -- --## LDFLAGS will be added at link time --## note that the -l flags are set by the LIBS macro that is set by configure --## This line doesn't need to be here, configure will add LDFLAGS on it's own, --## but I'm leaving here as a place to add LDFLAGS if so desired --LDFLAGS=@LDFLAGS@ -- -- - # doc directory - pkgdocdir=$(prefix)/doc/@PACKAGE@ - ---- configure.ac -+++ configure.ac -@@ -35,7 +35,6 @@ - dnl ############################################################################ - dnl # Checks for programs # - dnl ############################################################################ --CXXFLAGS= dnl AC_PROG_CXX automatically sets CXXFLAGS to -g -O2 if g++ is the C++ compiler and CXXFLAGS hasn't been set, so by setting CXXFLAGS, we can avoid this. - AC_PROG_CXX - #AC_PROG_AWK - AC_PROG_CC diff --git a/soundtouch-no-sse.diff b/soundtouch-no-sse.diff deleted file mode 100644 index 3544c30..0000000 --- a/soundtouch-no-sse.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- source/SoundTouch/Makefile.am-dist 2007-07-04 13:14:09.000000000 +0200 -+++ source/SoundTouch/Makefile.am 2007-07-04 14:15:55.000000000 +0200 -@@ -30,12 +30,12 @@ - - lib_LTLIBRARIES=libSoundTouch.la - # the mmx_gcc.cpp and cpu_detect_x86_gcc.cpp may need to be conditionally included here from things discovered in configure.ac --libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp -+libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp - - - # ??? test for -fcheck-new in configure.ac - # other compiler flags to add --AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include -+AM_CXXFLAGS=-O3 -fcheck-new -I../../include - - # other linking flags to add - #libSoundTouch_la_LIBADD= diff --git a/soundtouch-sse-automake-add.diff b/soundtouch-sse-automake-add.diff deleted file mode 100644 index 2e6fe18..0000000 --- a/soundtouch-sse-automake-add.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- source/SoundTouch/Makefile.am-dist 2007-07-04 14:25:01.000000000 +0200 -+++ source/SoundTouch/Makefile.am 2007-07-04 14:23:43.000000000 +0200 -@@ -37,6 +37,11 @@ - # other compiler flags to add - AM_CXXFLAGS=-O3 -fcheck-new -I../../include - -+noinst_LTLIBRARIES = libSoundTouchOpt.la -+libSoundTouch_la_LIBADD = libSoundTouchOpt.la -+libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp -+libSoundTouchOpt_la_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include -+ - # other linking flags to add - #libSoundTouch_la_LIBADD= - diff --git a/soundtouch.changes b/soundtouch.changes index 1533fe7..fc31b37 100644 --- a/soundtouch.changes +++ b/soundtouch.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu May 7 18:36:09 CEST 2009 - sbrabec@suse.cz + +- Updated to version 1.4.0: + * Improved sound quality by automatic calculation of time stretch + algorithm processing parameters according to tempo setting + * Moved BPM detection routines from SoundStretch application into + SoundTouch library + * Bugfixes: Usage of uninitialied variables, GNU build scripts, + compiler errors due to 'const' keyword mismatch. + * Source code cleanup +- Split according to shared library packaging policy. + ------------------------------------------------------------------- Sat Apr 4 16:43:50 CEST 2009 - crrodriguez@suse.de diff --git a/soundtouch.spec b/soundtouch.spec index d83922b..5778f18 100644 --- a/soundtouch.spec +++ b/soundtouch.spec @@ -1,5 +1,5 @@ # -# spec file for package soundtouch (Version 1.3.1) +# spec file for package soundtouch (Version 1.4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,15 +23,10 @@ License: LGPL v2.1 or later Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://www.surina.net/soundtouch Summary: Audio Processing Library -Version: 1.3.1 -Release: 81 +Version: 1.4.0 +Release: 1 BuildRequires: gcc-c++ libstdc++ Source: %{name}-%{version}.tar.bz2 -Patch: soundtouch-keep-flags.patch -Patch1: soundtouch-no-sse.diff -Patch2: soundtouch-sse-automake-add.diff -Patch3: soundtouch-autoreconf-fix.diff -Patch4: soundtouch-gcc43-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,6 +36,23 @@ independently from each other. +Authors: +-------- + Olli Parviainen + +%package -n libSoundTouch0 +License: LGPL v2.1 or later +Summary: Audio Processing Library +Group: Productivity/Multimedia/Sound/Editors and Convertors +Requires: %{name} = %{version} glibc-devel + +%description -n libSoundTouch0 +SoundTouch is an open source audio processing library that allows +changing the sound tempo, pitch and playback rate parameters +independently from each other. + + + Authors: -------- Olli Parviainen @@ -49,7 +61,7 @@ Authors: License: LGPL v2.1 or later Summary: Audio Processing Library Group: Productivity/Multimedia/Sound/Editors and Convertors -Requires: %{name} = %{version} glibc-devel +Requires: libSoundTouch0 = %{version} glibc-devel %description devel SoundTouch is an open-source audio processing library that allows @@ -63,23 +75,28 @@ Authors: Olli Parviainen %prep -%setup -q -%patch -%patch1 -%ifarch %ix86 x86_64 -%patch2 +%setup -q -n %{name} +tr -d '\r' README.html~ +touch -r README.html README.html~ +mv README.html~ README.html +%ifarch x86_64 +# cpu_detect_x86_gcc.cpp: Assembler messages: +# cpu_detect_x86_gcc.cpp:140: Error: suffix or operands invalid for `pop' +# cpu_detect_x86_gcc.cpp:143: Error: suffix or operands invalid for `push' +sed -i s/__x86_64__/__INVALID__/ include/STTypes.h +%endif +%ifnarch %ix86 x86_64 +# cc1plus: error: unrecognized command line option "-msse2" +sed -i s/-msse2// source/SoundTouch/Makefile.am %endif -%patch3 -%patch4 -chmod -x README.html -for FILE in COPYING.TXT README.html ; do - tr -d $'\r\z' <$FILE >$FILE~ - mv $FILE~ $FILE -done %build +%if %suse_version >= 1110 autoreconf -f -i -%configure --enable-shared --disable-static --with-pic +%endif +%configure\ + --enable-shared\ + --disable-static make %{?jobs:-j%jobs} pkgdocdir=%{_docdir}/%{name} %install @@ -89,15 +106,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libSoundTouch0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSoundTouch0 -p /sbin/ldconfig %files %defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/* -%{_libdir}/*.so.* + +%files -n libSoundTouch0 +%defattr(-,root,root) +%{_libdir}/libSoundTouch.so.0* %files devel %defattr(-,root,root) @@ -107,6 +127,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Thu May 07 2009 sbrabec@suse.cz +- Updated to version 1.4.0: + * Improved sound quality by automatic calculation of time stretch + algorithm processing parameters according to tempo setting + * Moved BPM detection routines from SoundStretch application into + SoundTouch library + * Bugfixes: Usage of uninitialied variables, GNU build scripts, + compiler errors due to 'const' keyword mismatch. + * Source code cleanup +- Split according to shared library packaging policy. * Sat Apr 04 2009 crrodriguez@suse.de - use --enable-shared and disable static libraries * Thu Nov 22 2007 tiwai@suse.de