- updated to 4.1.1

- removed obsolete link patch
- added libdir patch (fix libdir and few other properties in .pc file)

diff --git a/rtaudio-libdir.patch b/rtaudio-libdir.patch
new file mode 100644 (file)
index 0000000..a395a67
--- /dev/null
+++ b/rtaudio-libdir.patch
@@ -0,0 +1,17 @@
+--- 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
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include        
+ 
+ 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-link.patch b/rtaudio-link.patch
deleted file mode 100644 (file)
index 7820caa..0000000
--- a/rtaudio-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtaudio-4.0.11/configure.ac.orig   2012-06-13 22:27:59.000000000 +0200
-+++ rtaudio-4.0.11/configure.ac        2012-06-18 17:04:11.471406165 +0200
-@@ -84,7 +84,7 @@
-   AC_ARG_WITH(pulse, [  --with-pulse = choose PulseAudio API support (linux only)], [
-     api="$api -D__LINUX_PULSE__"
-     AC_MSG_RESULT(using PulseAudio)
--    AC_CHECK_LIB(pulse-simple, pa_simple_new, , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))], )
-+    AC_CHECK_LIB(pulse-simple, pa_simple_new, [LIBS="$LIBS -lpulse-simple -lpulse"], [AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!)], -lpulse)], )
- 
-   # Look for OSS flag
-   AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [

diff --git a/rtaudio.spec b/rtaudio.spec
index 39b7e117c66825cb6d3cc853465913f16b6429a5..3b53e4c6b49dc8e4050b33fe0667fd3493897a17 100644 (file)
--- a/rtaudio.spec
+++ b/rtaudio.spec
@@ -1,19 +1,20 @@
 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.0.11
+Version:       4.1.1
 Release:       1
 License:       MIT-like
 Group:         Libraries
 Source0:       http://www.music.mcgill.ca/~gary/rtaudio/release/%{name}-%{version}.tar.gz
-# Source0-md5: f383584987fa43affb848dc171d74fcd
-Patch0:                %{name}-link.patch
+# Source0-md5: 99763d3187fbe24ca959a1b711c17984
+Patch0:                %{name}-libdir.patch
 URL:           http://www.music.mcgill.ca/~gary/rtaudio/
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,6 +38,7 @@ Requires:     %{name} = %{version}-%{release}
 Requires:      alsa-lib-devel
 Requires:      jack-audio-connection-kit-devel
 Requires:      libstdc++-devel
+Requires:      pulseaudio-devel
 
 %description devel
 Header files for RtAudio library.
@@ -61,6 +63,7 @@ Statyczna biblioteka RtAudio.
 %patch0 -p1
 
 %build
+%{__aclocal}
 %{__autoconf}
 %configure \
        --with-alsa \
@@ -72,10 +75,13 @@ Statyczna biblioteka RtAudio.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_pkgconfigdir}}
 
-cp -dp librtaudio.* $RPM_BUILD_ROOT%{_libdir}
-cp -p RtAudio.h RtError.h $RPM_BUILD_ROOT%{_includedir}
+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}
 
 %clean
@@ -93,9 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%{_includedir}/RtError.h
+%{_pkgconfigdir}/librtaudio.pc
 
 %files static
 %defattr(644,root,root,755)