commit 48b5d1e2b632e2f5d3a0ee3ed3f4dc611f32102a
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Oct 17 11:27:00 2015 +0200
- updated to 2.0.2
- updated opts,gcc,link patches
- removed obsolete am patch
- libsmsx and sbsms tool have been removed from sources
libsbsms-am.patch | 11 -----------
libsbsms-gcc.patch | 29 ++++-------------------------
libsbsms-link.patch | 20 ++++++--------------
libsbsms-opts.patch | 32 ++------------------------------
libsbsms2.spec | 32 +++-----------------------------
5 files changed, 15 insertions(+), 109 deletions(-)
---
diff --git a/libsbsms2.spec b/libsbsms2.spec
index 0bb2a35..49f1f9a 100644
--- a/libsbsms2.spec
+++ b/libsbsms2.spec
@@ -8,26 +8,23 @@
Summary: C++ library for high quality time stretching and pitch scaling
Summary(pl.UTF-8): Biblioteka C++ do wysokiej jakości zmiany szybkości i
wysokości dźwięku
Name: libsbsms2
-Version: 2.0.1
+Version: 2.0.2
Release: 1
License: GPL v2
Group: Libraries
Source0:
http://downloads.sourceforge.net/sbsms/libsbsms-%{version}.tar.gz
-# Source0-md5: 409fb6f4f64e48ff1a7bc18621b952fb
+# Source0-md5: 61e069486d58094a2350a1113d2ca10a
Patch0: libsbsms-opts.patch
Patch1: libsbsms-gcc.patch
Patch2: libsbsms-link.patch
-Patch3: libsbsms-am.patch
URL: http://sbsms.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1.5
BuildRequires: libmad-devel
BuildRequires: libsndfile-devel >= 1.0.2
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
-# because of sbsms tool
-Conflicts: libsbsms < 2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -70,7 +67,6 @@ Statyczna biblioteka libsbsms 2.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
%{__libtoolize}
@@ -84,28 +80,12 @@ Statyczna biblioteka libsbsms 2.
%{!?with-sse:--disable-sse}
%{__make}
-cd test
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- SBSMS_CFLAGS="-I$(pwd)/../include" \
- SBSMS_LIBS="-L$(pwd)/../src/.libs -lsbsms" \
- --enable-shared
-
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__make} -C test install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__sed} -i -e 's,-L[^ "]*/\.libs *,,g' $RPM_BUILD_ROOT%{_libdir}/libsbsmsx.la
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -115,22 +95,16 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS README TODO
-%attr(755,root,root) %{_bindir}/sbsms
%attr(755,root,root) %{_libdir}/libsbsms.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsbsms.so.0
-%attr(755,root,root) %{_libdir}/libsbsmsx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsbsmsx.so.0
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsbsms.so
-%attr(755,root,root) %{_libdir}/libsbsmsx.so
%{_libdir}/libsbsms.la
-%{_libdir}/libsbsmsx.la
%{_includedir}/sbsms.h
%{_pkgconfigdir}/sbsms.pc
%files static
%defattr(644,root,root,755)
%{_libdir}/libsbsms.a
-%{_libdir}/libsbsmsx.a
diff --git a/libsbsms-am.patch b/libsbsms-am.patch
deleted file mode 100644
index 45847d5..0000000
--- a/libsbsms-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsbsms-2.0.1/configure.in.orig 2013-06-22 08:23:08.697411171 +0200
-+++ libsbsms-2.0.1/configure.in 2013-06-22 08:30:40.487392120 +0200
-@@ -13,7 +13,7 @@
- LIBSBSMS_RELEASE_BUILD=1
- AC_CONFIG_SRCDIR([src/sbsms.cpp])
- AC_CANONICAL_TARGET([])
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS([src/config.h])
-
- AC_DISABLE_SHARED dnl allows for optimizations
-
diff --git a/libsbsms-gcc.patch b/libsbsms-gcc.patch
index d9cb6c0..9b3db05 100644
--- a/libsbsms-gcc.patch
+++ b/libsbsms-gcc.patch
@@ -1,31 +1,10 @@
---- libsbsms-1.7.0/src/buffer.h.orig 2008-11-02 02:58:45.000000000 +0100
-+++ libsbsms-1.7.0/src/buffer.h 2011-05-06 21:36:16.969710909 +0200
-@@ -6,6 +6,8 @@
+--- libsbsms-2.0.2/src/buffer.h.orig 2014-06-11 23:20:40.000000000 +0200
++++ libsbsms-2.0.2/src/buffer.h 2015-10-17 10:29:11.717774265 +0200
+@@ -6,6 +6,7 @@
#include "grain.h"
- #include "trackpoint.h"
+ #include <stdlib.h>
#include <list>
-+#include <cstdlib>
+#include <cstring>
using namespace std;
namespace _sbsms_ {
---- libsbsms-2.0.1/test/src/mp3.cpp.orig 2012-07-06 08:17:37.000000000
+0200
-+++ libsbsms-2.0.1/test/src/mp3.cpp 2013-06-22 09:36:26.733893269 +0200
-@@ -6,6 +6,7 @@
- #include <sys/stat.h>
- #include <iostream>
- #include <fstream>
-+#include <cstring>
- #include <assert.h>
-
- enum {
---- libsbsms-2.0.1/test/src/convert.cpp.orig 2012-07-06 08:17:37.000000000
+0200
-+++ libsbsms-2.0.1/test/src/convert.cpp 2013-06-22 10:10:28.343807591
+0200
-@@ -5,6 +5,7 @@
- #include "mp3.h"
- #include "real.h"
- #include <stdlib.h>
-+#include <string.h>
- #include <algorithm>
- #include "import.h"
- using namespace std;
diff --git a/libsbsms-link.patch b/libsbsms-link.patch
index f38f0f0..47c5fd6 100644
--- a/libsbsms-link.patch
+++ b/libsbsms-link.patch
@@ -1,18 +1,10 @@
---- libsbsms-2.0.1/src/Makefile.am.orig 2013-06-09 06:47:10.148461222
+0200
-+++ libsbsms-2.0.1/src/Makefile.am 2013-06-09 06:53:36.198453175 +0200
-@@ -4,4 +4,5 @@
+--- libsbsms-2.0.2/src/Makefile.am.orig 2015-10-17 11:02:58.514398687
+0200
++++ libsbsms-2.0.2/src/Makefile.am 2015-10-17 11:03:59.017730759 +0200
+@@ -4,6 +4,7 @@
libsbsmsinclude_HEADERS = ../include/sbsms.h
lib_LTLIBRARIES = libsbsms.la
+libsbsms_la_LIBADD = -lpthread
- libsbsms_la_SOURCES = sms.cpp track.cpp trackpoint.cpp resample.cpp sbsms.cpp
fft.cpp grain.cpp buffer.cpp subband.cpp dBTable.cpp buffer.h fft.h sse.h
utils.h trackpoint.h grain.h real.h synthTable.h dBTable.h sincCoeffs.h
../include/sbsms.h sms.h subband.h track.h slide.cpp
---- libsbsms-2.0.1/test/src/Makefile.am.orig 2012-07-06 08:17:37.000000000
+0200
-+++ libsbsms-2.0.1/test/src/Makefile.am 2013-06-22 10:31:03.160422438
+0200
-@@ -3,6 +3,7 @@
- lib_LTLIBRARIES = libsbsmsx.la
-
- libsbsmsx_la_SOURCES = mp3.cpp mp3.h mp3tech.cpp mp3tech.h import.cpp
import.h pcm.cpp pcm.h convert.cpp convert.h audiobuffer.cpp audiobuffer.h
-+libsbsmsx_la_LIBADD = $(SBSMS_LIBS) $(SNDFILE_LIBS) $(MAD_LIBS)
-
- bin_PROGRAMS = sbsms
-
+ libsbsms_la_SOURCES = \
+ sms.cpp \
+ track.cpp \
diff --git a/libsbsms-opts.patch b/libsbsms-opts.patch
index 1d3fdfb..00e6bce 100644
--- a/libsbsms-opts.patch
+++ b/libsbsms-opts.patch
@@ -1,5 +1,5 @@
---- libsbsms-2.0.0/configure.in.orig 2011-07-02 08:01:36.000000000 +0200
-+++ libsbsms-2.0.0/configure.in 2011-07-10 14:54:00.955720515 +0200
+--- libsbsms-2.0.2/configure.ac.orig 2011-07-02 08:01:36.000000000 +0200
++++ libsbsms-2.0.2/configure.ac 2011-07-10 14:54:00.955720515 +0200
@@ -82,9 +82,9 @@
fi
@@ -12,31 +12,3 @@
fi
if test x$enable_multithreaded = xyes; then
---- libsbsms-2.0.1/test/configure.in.orig 2012-07-06 08:17:37.000000000
+0200
-+++ libsbsms-2.0.1/test/configure.in 2013-06-22 09:29:18.797244562 +0200
-@@ -59,22 +59,12 @@
-
- AC_ARG_ENABLE(universal_binary,[ --enable-universal_binary enable universal
binary build: (default:
disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
-
--SBSMS_CFLAGS="-ffast-math"
-+CFLAGS="$CFLAGS -ffast-math"
-
- if test x$enable_debug = xyes; then
-- SBSMS_CFLAGS="$SBSMS_CFLAGS -g -O3"
-+ CFLAGS="$CFLAGS -g"
- else
-- SBSMS_CFLAGS="$SBSMS_CFLAGS -O3 -fomit-frame-pointer"
--fi
--
--if test x$enable_universal_binary = xyes; then
-- case "$target_os" in
-- darwin*)
-- SBSMS_CFLAGS="$SBSMS_CFLAGS -mmacosx-version-min=10.4 -arch i386
-arch ppc -Xarch_i386 -DARCHI386 -Xarch_ppc -DARCHPPC -isysroot
/Developer/SDKs/MacOSX10.4u.sdk"
-- ;;
-- *)
-- ;;
-- esac
-+ CFLAGS="$CFLAGS -fomit-frame-pointer"
- fi
-
- PKG_CHECK_MODULES(SBSMS, sbsms >= 2.0.0, ac_cv_sbsms=1, ac_cv_sbsms=0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsbsms2.git/commitdiff/48b5d1e2b632e2f5d3a0ee3ed3f4dc611f32102a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
