[packages/rtaudio] - updated to 4.1.2 - updated libdir patch - added pulse patch (linking requires also -lpulse, use pk

qboosh qboosh at pld-linux.org
Sat Feb 27 22:59:50 CET 2016


commit 6dcc44fb19a2533bdf94a380083ab62e85b3b668
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 27 23:02:51 2016 +0100

    - updated to 4.1.2
    - updated libdir patch
    - added pulse patch (linking requires also -lpulse, use pkg-config to get all libs)

 rtaudio-libdir.patch | 13 +++----------
 rtaudio-pulse.patch  | 11 +++++++++++
 rtaudio.spec         | 32 +++++++++++++++++---------------
 3 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/rtaudio.spec b/rtaudio.spec
index 3b53e4c..ecd3cd4 100644
--- a/rtaudio.spec
+++ b/rtaudio.spec
@@ -1,19 +1,21 @@
 Summary:	RtAudio - set of C++ classes providing common API for realtime audio I/O
 Summary(pl.UTF-8):	RtAudio - zbiór klas C++ udostępniających wspólne API do we/wy dźwięku
 Name:		rtaudio
-Version:	4.1.1
+Version:	4.1.2
 Release:	1
 License:	MIT-like
 Group:		Libraries
 Source0:	http://www.music.mcgill.ca/~gary/rtaudio/release/%{name}-%{version}.tar.gz
-# Source0-md5:	99763d3187fbe24ca959a1b711c17984
+# Source0-md5:	28a8fe13052e47af0aeb55d50d0637d1
 Patch0:		%{name}-libdir.patch
+Patch1:		%{name}-pulse.patch
 URL:		http://www.music.mcgill.ca/~gary/rtaudio/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.14
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,10 +63,13 @@ Statyczna biblioteka RtAudio.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__automake}
 %configure \
 	--with-alsa \
 	--with-jack \
@@ -75,14 +80,12 @@ Statyczna biblioteka RtAudio.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_pkgconfigdir}}
 
-install rtaudio-config $RPM_BUILD_ROOT%{_bindir}
-cp -dp librtaudio.so* $RPM_BUILD_ROOT%{_libdir}
-cp -dp librtaudio.a $RPM_BUILD_ROOT%{_libdir}
-cp -p RtAudio.h $RPM_BUILD_ROOT%{_includedir}
-cp -p librtaudio.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librtaudio.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,15 +97,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc readme doc/release.txt
 %attr(755,root,root) %{_libdir}/librtaudio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librtaudio.so.4
+%attr(755,root,root) %ghost %{_libdir}/librtaudio.so.5
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/html/*
-%attr(755,root,root) %{_bindir}/rtaudio-config
 %attr(755,root,root) %{_libdir}/librtaudio.so
-%{_includedir}/RtAudio.h
-%{_pkgconfigdir}/librtaudio.pc
+%{_includedir}/rtaudio
+%{_pkgconfigdir}/rtaudio.pc
 
 %files static
 %defattr(644,root,root,755)
diff --git a/rtaudio-libdir.patch b/rtaudio-libdir.patch
index a395a67..30d3462 100644
--- a/rtaudio-libdir.patch
+++ b/rtaudio-libdir.patch
@@ -1,17 +1,10 @@
---- rtaudio-4.1.1/librtaudio.pc.in.orig	2014-04-26 20:39:15.000000000 +0200
-+++ rtaudio-4.1.1/librtaudio.pc.in	2014-07-13 21:58:25.532711879 +0200
+--- rtaudio-4.1.2/rtaudio.pc.in.orig	2016-02-27 16:54:39.535489214 +0100
++++ rtaudio-4.1.2/rtaudio.pc.in	2016-02-27 17:06:31.722125993 +0100
 @@ -1,6 +1,6 @@
  prefix=@prefix@
  exec_prefix=${prefix}
 -libdir=${exec_prefix}/lib
 +libdir=@libdir@
- includedir=${prefix}/include        
+ includedir=${prefix}/include/rtaudio        
  
  Name: librtaudio
-@@ -9,4 +9,4 @@
- Requires: @req@ 
- Libs: -L${libdir} -lrtaudio
- Libs.private: -lpthread
--Cflags: -pthread -I${includedir} @CPPFLAGS@
-\ Brak znaku nowej linii na ko�cu pliku
-+Cflags: -pthread -I${includedir} @CPPFLAGS@
diff --git a/rtaudio-pulse.patch b/rtaudio-pulse.patch
new file mode 100644
index 0000000..27ad084
--- /dev/null
+++ b/rtaudio-pulse.patch
@@ -0,0 +1,11 @@
+--- rtaudio-4.1.2/configure.ac.orig	2016-02-22 22:15:52.000000000 +0100
++++ rtaudio-4.1.2/configure.ac	2016-02-27 20:10:10.924996893 +0100
+@@ -149,7 +149,7 @@
+     api="$api -D__LINUX_PULSE__"
+     req="$req libpulse-simple"
+     AC_MSG_RESULT(using PulseAudio)
+-    AC_CHECK_LIB(pulse-simple, pa_simple_flush, , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))], )
++    AC_CHECK_LIB(pulse-simple, pa_simple_flush, [LIBS="$LIBS $(pkg-config --libs libpulse-simple)"], AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))], )
+ 
+   # Look for OSS flag
+   AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rtaudio.git/commitdiff/6dcc44fb19a2533bdf94a380083ab62e85b3b668



More information about the pld-cvs-commit mailing list