[packages/soundtouch] - updated to 1.9.2 (note: new soname, .pc file name change) - removed obsolete nosse,x86_64 patches

qboosh qboosh at pld-linux.org
Wed Oct 14 16:55:00 CEST 2015


commit ea99ddb936f60794f17b8fd8d21e217dfc3b26e4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 14 16:55:57 2015 +0200

    - updated to 1.9.2 (note: new soname, .pc file name change)
    - removed obsolete nosse,x86_64 patches

 soundtouch-nosse.patch  | 26 --------------------------
 soundtouch-x86_64.patch | 12 ------------
 soundtouch.spec         | 36 ++++++++++++++++++++----------------
 3 files changed, 20 insertions(+), 54 deletions(-)
---
diff --git a/soundtouch.spec b/soundtouch.spec
index 55cdaec..1b667cc 100644
--- a/soundtouch.spec
+++ b/soundtouch.spec
@@ -1,18 +1,23 @@
+#
+# Conditional build:
+%bcond_without	gomp		# OpenMP support
+%bcond_without	static_libs	# static library
+#
 Summary:	SoundTouch - sound processing library
 Summary(pl.UTF-8):	SoundTouch - biblioteka do przetwarzania dźwięku
 Name:		soundtouch
-Version:	1.4.0
-Release:	5
+Version:	1.9.2
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
+#Source0Download: http://www.surina.net/soundtouch/sourcecode.html
 Source0:	http://www.surina.net/soundtouch/%{name}-%{version}.tar.gz
-# Source0-md5:	fc4bb10401624899efe4fb554d4fd3ed
-Patch0:		%{name}-nosse.patch
-Patch1:		%{name}-x86_64.patch
+# Source0-md5:	2d1ab4abb54640e8e308e36e309c94a6
 URL:		http://www.surina.net/soundtouch/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libstdc++-devel
+%{?with_gomp:BuildRequires:	libgomp-devel}
+BuildRequires:	libstdc++-devel >= 6:4.3
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
 BuildRequires:	unzip
@@ -58,7 +63,7 @@ Statyczna biblioteka SoundTouch.
 Summary:	SoundStretch - sound processing application
 Summary(pl.UTF-8):	SoundStretch - aplikacja do przetwarzania dźwięku
 Group:		Applications/Sound
-URL:		http://sky.prohosting.com/oparviai/soundtouch/soundstretch.html
+URL:		http://www.surina.net/soundtouch/soundstretch.html
 Requires:	%{name} = %{version}-%{release}
 
 %description soundstretch
@@ -75,11 +80,6 @@ SoundTouch do przetwarzania dźwięku we własnych programach.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-
-# kill DOS eols
-%{__perl} -pi -e 's/\r$//' soundtouch.m4
 
 %build
 %{__libtoolize}
@@ -88,7 +88,9 @@ SoundTouch do przetwarzania dźwięku we własnych programach.
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-shared
+	%{?with_gomp:--enable-openmp} \
+	--disable-silent-rules \
+	%{?with_static_libs:--enable-static}
 
 %{__make}
 
@@ -108,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.html
 %attr(755,root,root) %{_libdir}/libSoundTouch.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libSoundTouch.so.0
+%attr(755,root,root) %ghost %{_libdir}/libSoundTouch.so.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -116,11 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libSoundTouch.la
 %{_includedir}/soundtouch
 %{_aclocaldir}/soundtouch.m4
-%{_pkgconfigdir}/soundtouch-1.4.pc
+%{_pkgconfigdir}/soundtouch.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libSoundTouch.a
+%endif
 
 %files soundstretch
 %defattr(644,root,root,755)
diff --git a/soundtouch-nosse.patch b/soundtouch-nosse.patch
deleted file mode 100644
index 8497309..0000000
--- a/soundtouch-nosse.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- soundtouch/source/SoundTouch/Makefile.am.orig	2009-01-25 17:32:53.000000000 +0100
-+++ soundtouch/source/SoundTouch/Makefile.am	2009-04-10 18:04:37.333724702 +0200
-@@ -30,17 +30,16 @@
- 
- lib_LTLIBRARIES=libSoundTouch.la
- #
--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 BPMDetect.cpp PeakFinder.cpp
-+libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp BPMDetect.cpp PeakFinder.cpp
- 
- 
- # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
- # fix this script to automatically check for CPU architecture, please submit a patch 
- # to me.
--AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include
--
-+AM_CXXFLAGS=-fcheck-new -I../../include
- 
- # other linking flags to add
--# 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
-+noinst_LTLIBRARIES = libSoundTouchOpt.la
-+libSoundTouch_la_LIBADD = libSoundTouchOpt.la
-+libSoundTouchOpt_la_SOURCES = sse_optimized.cpp 
-+libSoundTouchOpt_la_CXXFLAGS = -msse2
diff --git a/soundtouch-x86_64.patch b/soundtouch-x86_64.patch
deleted file mode 100644
index 95368df..0000000
--- a/soundtouch-x86_64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur soundtouch.orig/include/STTypes.h soundtouch/include/STTypes.h
---- soundtouch.orig/include/STTypes.h	2009-01-25 17:32:53.000000000 +0100
-+++ soundtouch/include/STTypes.h	2009-06-21 18:23:27.352532633 +0200
-@@ -87,7 +87,7 @@
-  
-  #endif
- 
--    #if (WIN32 || __i386__ || __x86_64__)
-+    #if (WIN32 || __i386__)
-         /// Define this to allow X86-specific assembler/intrinsic optimizations. 
-         /// Notice that library contains also usual C++ versions of each of these
-         /// these routines, so if you're having difficulties getting the optimized 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/soundtouch.git/commitdiff/ea99ddb936f60794f17b8fd8d21e217dfc3b26e4



More information about the pld-cvs-commit mailing list