From 37d05b971d9f572aa6028d2c6372ee7e832ac235 Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Nov 06 2012 05:43:38 +0000 Subject: Initial import of unorphaned package --- diff --git a/.gitignore b/.gitignore index b91cbd5..ee500f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ rtaudio-4.0.7-fe.tar.gz +/rtaudio-4.0.11-fe.tar.gz diff --git a/rtaudio-fix-soname.patch b/rtaudio-fix-soname.patch deleted file mode 100644 index 0bd1aef..0000000 --- a/rtaudio-fix-soname.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN rtaudio-4.0.7.old/Makefile.in rtaudio-4.0.7/Makefile.in ---- rtaudio-4.0.7.old/Makefile.in 2010-02-04 13:55:39.000000000 -0500 -+++ rtaudio-4.0.7/Makefile.in 2010-02-05 23:46:32.000000000 -0500 -@@ -24,7 +24,9 @@ tests: - $(LIBRARIES): $(OBJECTS) - $(AR) ruv $(STATIC) $(OBJECTS) - ranlib $(STATIC) -- $(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@ -+ $(CC) -shared -Wl,-soname,$(SHARED).0 $(OBJECTS) -o $(SHARED).0.0 @LIBS@ -+ ln -sf $(SHARED).0.0 $(SHARED).0 -+ ln -sf $(SHARED).0.0 $(SHARED) - - %.o : %.cpp - $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $@ diff --git a/rtaudio.spec b/rtaudio.spec index 639c68e..1a3faa6 100644 --- a/rtaudio.spec +++ b/rtaudio.spec @@ -1,6 +1,6 @@ Summary: Real-time Audio I/O Library Name: rtaudio -Version: 4.0.7 +Version: 4.0.11 Release: 2%{?dist} License: MIT Group: System Environment/Libraries @@ -12,13 +12,10 @@ URL: http://www.music.mcgill.ca/~gary/rtaudio/ # rm -fr rtaudio-$VERSION/include/ rtaudio-$VERSION/tests/Windows # tar zcf rtaudio-$VERSION-fe.tar.gz rtaudio-$VERSION Source0: %{name}-%{version}-fe.tar.gz -# Upstream supports shared libraries, but they don't put proper sonames. Fix: -Patch0: %{name}-fix-soname.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel -# No longer providing static library only -Obsoletes: rtaudio-devel < 4.0.7 +BuildRequires: pulseaudio-libs-devel + %description RtAudio is a set of C++ classes that provide a common API for realtime audio @@ -39,7 +36,7 @@ designed with the following objectives: %package devel Summary: Real-time Audio I/O Library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel RtAudio is a set of C++ classes that provide a common API for realtime audio @@ -58,7 +55,13 @@ designed with the following objectives: %prep %setup -q -%patch0 -p1 -b .soname +# Fix encoding issues +for file in tests/teststops.cpp; do + sed 's|\r||' $file > $file.tmp + iconv -f ISO-8859-1 -t UTF8 $file.tmp > $file.tmp2 + touch -r $file $file.tmp2 + mv -f $file.tmp2 $file +done # Remove empty directory rm -fr tests/Debug @@ -71,34 +74,37 @@ cp -p /usr/lib/rpm/config.{sub,guess} config/ %build export CFLAGS="%optflags -fPIC" -%configure --with-jack --with-alsa -make %{?_smp_mflags} +%configure --with-jack --with-alsa --with-pulse +# parallel make fails here +make %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_includedir} %{buildroot}%{_libdir} cp -a RtAudio.h RtError.h %{buildroot}%{_includedir} -cp -a lib%{name}.so* %{buildroot}%{_libdir} - -%clean -rm -rf %{buildroot} +cp -p lib%{name}.so.%{version} %{buildroot}%{_libdir}/ +ln -s %{_libdir}/lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so +ldconfig -v -n %{buildroot}%{_libdir} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc readme doc/release.txt %{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root,-) %doc doc/html doc/images tests %{_includedir}/*.h %{_libdir}/lib%{name}.so %changelog +* Sun Oct 28 2012 Brendan Jones 4.0.11-2 +- Add pulse dependancies + +* Sun Oct 14 2012 Brendan Jones 4.0.11-1 +- Update to 4.011 + * Wed Feb 09 2011 Fedora Release Engineering - 4.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 98a0412..878f7b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dbfa6b3f5ce714febdb91a5ef53f234 rtaudio-4.0.7-fe.tar.gz +9086b0a8802bda87437d95fecc7d3e01 rtaudio-4.0.11-fe.tar.gz