Compare commits

...

No commits in common. 'i8ce' and 'epel9' have entirely different histories.
i8ce ... epel9

5
.gitignore vendored

@ -1 +1,4 @@
SOURCES/pa_stable_v19_20140130.tgz pa_stable_v19_20071207.tar.gz
/pa_snapshot.tgz
/pa_stable_v19_20140130.tgz
/pa_stable_v190700_20210406.tgz

@ -1 +0,0 @@
526a7955de59016a06680ac24209ecb6ce05527d SOURCES/pa_stable_v19_20140130.tgz

@ -1,21 +0,0 @@
# Makefile for source rpm: portaudio
# $Id$
NAME := portaudio
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

@ -1,6 +1,36 @@
diff -wruN portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h From 42dc9c90a703b8dd251d71389a7e6220a50a43a9 Mon Sep 17 00:00:00 2001
--- portaudio/include/pa_unix_oss.h 1969-12-31 18:00:00.000000000 -0600 From: Uwe Klotz <uwe.klotz@gmail.com>
+++ portaudio-v19/include/pa_unix_oss.h 2012-12-14 22:34:14.290247100 -0600 Date: Fri, 26 Mar 2021 10:43:46 +0100
Subject: [PATCH] portaudio-audacity.patch
---
configure.in | 1 +
include/pa_unix_oss.h | 52 +++++++++++++++++++++++++++++++++++
include/portaudio.h | 9 ++++++
src/common/pa_front.c | 32 ++++++++++++++++++++-
src/common/pa_stream.c | 2 ++
src/common/pa_stream.h | 1 +
src/hostapi/oss/pa_unix_oss.c | 26 ++++++++++++++++++
7 files changed, 122 insertions(+), 1 deletion(-)
create mode 100644 include/pa_unix_oss.h
diff --git a/configure.in b/configure.in
index bb4ae96..fe0e112 100644
--- a/configure.in
+++ b/configure.in
@@ -415,6 +415,7 @@ case "${host_os}" in
DLL_LIBS="$DLL_LIBS -lossaudio"
LIBS="$LIBS -lossaudio"
fi
+ INCLUDES="$INCLUDES pa_unix_oss.h"
AC_DEFINE(PA_USE_OSS,1)
fi
diff --git a/include/pa_unix_oss.h b/include/pa_unix_oss.h
new file mode 100644
index 0000000..2351e64
--- /dev/null
+++ b/include/pa_unix_oss.h
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+#ifndef PA_UNIX_OSS_H +#ifndef PA_UNIX_OSS_H
+#define PA_UNIX_OSS_H +#define PA_UNIX_OSS_H
@ -54,13 +84,14 @@ diff -wruN portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h
+#endif +#endif
+ +
+#endif +#endif
diff -wruN portaudio/include/portaudio.h portaudio-v19/include/portaudio.h diff --git a/include/portaudio.h b/include/portaudio.h
--- portaudio/include/portaudio.h 2012-08-31 19:10:13.000000000 -0500 index 5d84731..7660c8a 100644
+++ portaudio-v19/include/portaudio.h 2012-12-14 22:34:14.368247200 -0600 --- a/include/portaudio.h
@@ -1146,6 +1146,15 @@ +++ b/include/portaudio.h
@@ -1200,6 +1200,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* stream );
signed long Pa_GetStreamWriteAvailable( PaStream* stream ); signed long Pa_GetStreamWriteAvailable( PaStream* stream );
+/** Retrieve the host type handling an open stream. +/** Retrieve the host type handling an open stream.
+ +
+ @return Returns a non-negative value representing the host API type + @return Returns a non-negative value representing the host API type
@ -71,27 +102,28 @@ diff -wruN portaudio/include/portaudio.h portaudio-v19/include/portaudio.h
+ +
+ +
/* Miscellaneous utilities */ /* Miscellaneous utilities */
diff -wruN portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c diff --git a/src/common/pa_front.c b/src/common/pa_front.c
--- portaudio/src/common/pa_front.c 2012-12-04 12:39:48.000000000 -0600 index 65a656f..02a67a8 100644
+++ portaudio-v19/src/common/pa_front.c 2012-12-14 09:44:34.604344800 -0600 --- a/src/common/pa_front.c
@@ -1216,8 +1216,10 @@ +++ b/src/common/pa_front.c
@@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream,
hostApiInputParametersPtr, hostApiOutputParametersPtr, hostApiInputParametersPtr, hostApiOutputParametersPtr,
sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
- if( result == paNoError ) - if( result == paNoError )
+ if( result == paNoError ) { + if( result == paNoError ) {
AddOpenStream( *stream ); AddOpenStream( *stream );
+ PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type; + PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type;
+ } + }
PA_LOGAPI(("Pa_OpenStream returned:\n" )); PA_LOGAPI(("Pa_OpenStream returned:\n" ));
@@ -1729,6 +1731,32 @@ @@ -1771,6 +1773,34 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stream )
return result;
} }
+PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream ) +PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream )
+{ +{
+ PaError error = PaUtil_ValidateStreamPointer( stream ); + PaError error = PaUtil_ValidateStreamPointer( stream );
@ -118,39 +150,46 @@ diff -wruN portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c
+ +
+ return result; + return result;
+} +}
+
+
PaError Pa_GetSampleSize( PaSampleFormat format ) PaError Pa_GetSampleSize( PaSampleFormat format )
{ {
diff -wruN portaudio/src/common/pa_stream.c portaudio-v19/src/common/pa_stream.c int result;
--- portaudio/src/common/pa_stream.c 2008-02-15 01:50:33.000000000 -0600 diff --git a/src/common/pa_stream.c b/src/common/pa_stream.c
+++ portaudio-v19/src/common/pa_stream.c 2012-12-14 09:44:34.607345000 -0600 index ffbf530..305f7c8 100644
@@ -93,6 +93,8 @@ --- a/src/common/pa_stream.c
+++ b/src/common/pa_stream.c
@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentation( PaUtilStreamRepresentation *streamRe
streamRepresentation->streamInfo.inputLatency = 0.; streamRepresentation->streamInfo.inputLatency = 0.;
streamRepresentation->streamInfo.outputLatency = 0.; streamRepresentation->streamInfo.outputLatency = 0.;
streamRepresentation->streamInfo.sampleRate = 0.; streamRepresentation->streamInfo.sampleRate = 0.;
+ +
+ streamRepresentation->hostApiType = 0; + streamRepresentation->hostApiType = 0;
} }
diff -wruN portaudio/src/common/pa_stream.h portaudio-v19/src/common/pa_stream.h diff --git a/src/common/pa_stream.h b/src/common/pa_stream.h
--- portaudio/src/common/pa_stream.h 2008-02-15 01:50:33.000000000 -0600 index 4afda39..0a5cd1e 100644
+++ portaudio-v19/src/common/pa_stream.h 2012-12-14 09:44:34.610345200 -0600 --- a/src/common/pa_stream.h
@@ -152,6 +152,7 @@ +++ b/src/common/pa_stream.h
@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentation {
PaStreamFinishedCallback *streamFinishedCallback; PaStreamFinishedCallback *streamFinishedCallback;
void *userData; void *userData;
PaStreamInfo streamInfo; PaStreamInfo streamInfo;
+ PaHostApiTypeId hostApiType; + PaHostApiTypeId hostApiType;
} PaUtilStreamRepresentation; } PaUtilStreamRepresentation;
diff -wruN portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss/pa_unix_oss.c diff --git a/src/hostapi/oss/pa_unix_oss.c b/src/hostapi/oss/pa_unix_oss.c
--- portaudio/src/hostapi/oss/pa_unix_oss.c 2011-05-02 12:07:11.000000000 -0500 index 20113e2..9dedc3f 100644
+++ portaudio-v19/src/hostapi/oss/pa_unix_oss.c 2012-12-14 09:44:34.625346000 -0600 --- a/src/hostapi/oss/pa_unix_oss.c
@@ -2028,3 +2028,26 @@ +++ b/src/hostapi/oss/pa_unix_oss.c
@@ -2050,3 +2050,29 @@ error:
return result;
#endif #endif
} }
+
+
+const char *PaOSS_GetStreamInputDevice( PaStream* s ) +const char *PaOSS_GetStreamInputDevice( PaStream* s )
+{ +{
+ PaOssStream *stream = (PaOssStream*)s; + PaOssStream *stream = (PaOssStream*)s;
@ -163,6 +202,7 @@ diff -wruN portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss
+ return NULL; + return NULL;
+} +}
+ +
+
+const char *PaOSS_GetStreamOutputDevice( PaStream* s ) +const char *PaOSS_GetStreamOutputDevice( PaStream* s )
+{ +{
+ PaOssStream *stream = (PaOssStream*)s; + PaOssStream *stream = (PaOssStream*)s;
@ -174,15 +214,6 @@ diff -wruN portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss
+ +
+ return NULL; + return NULL;
+} +}
diff -up portaudio/configure.in~ portaudio/configure.in --
--- portaudio/configure.in~ 2013-04-07 12:20:18.000000000 +0200 2.30.2
+++ portaudio/configure.in 2013-05-04 15:14:14.356191153 +0200
@@ -387,7 +387,7 @@ case "${host_os}" in
DLL_LIBS="$DLL_LIBS -lasound"
LIBS="$LIBS -lasound"
OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
- INCLUDES="$INCLUDES pa_linux_alsa.h"
+ INCLUDES="$INCLUDES pa_linux_alsa.h pa_unix_oss.h"
AC_DEFINE(PA_USE_ALSA,1)
fi

@ -1,23 +1,22 @@
Name: portaudio Name: portaudio
Version: 19 Version: 19
Release: 30%{?dist} Release: 38%{?dist}
Summary: Free, cross platform, open-source, audio I/O library Summary: Free, cross platform, open-source, audio I/O library
License: MIT License: MIT
URL: http://www.portaudio.com/ URL: http://www.portaudio.com/
Source0: http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz Source0: http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz
Patch1: portaudio-doxynodate.patch Patch1: portaudio-doxynodate.patch
Patch2: portaudio-pkgconfig-alsa.patch Patch2: portaudio-pkgconfig-alsa.patch
# Add some extra API needed by audacity # Add some extra API needed by audacity
# http://audacity.googlecode.com/svn/audacity-src/trunk/lib-src/portmixer/portaudio.patch # http://audacity.googlecode.com/svn/audacity-src/trunk/lib-src/portmixer/portaudio.patch
Patch3: portaudio-audacity.patch Patch3: portaudio-audacity.patch
BuildRequires: make
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
%if ! 0%{?rhel} > 7
BuildRequires: jack-audio-connection-kit-devel BuildRequires: jack-audio-connection-kit-devel
%endif
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
%description %description
@ -42,12 +41,11 @@ portaudio library.
%prep %prep
%setup -q -n %{name} %autosetup -p1 -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Needed for patch3 # Needed for patch3
autoreconf -i -f autoreconf -i -f
# With autoconf-2.71 we need to run this twice for things to work ?? (rhbz#1943118)
autoreconf -i -f
%build %build
@ -69,21 +67,46 @@ doxygen
%files %files
%license LICENSE.txt %license LICENSE.txt
%doc README.txt %doc README.md
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel
%doc doc/html/* %doc doc/html/*
%{_includedir}/portaudiocpp/ %{_includedir}/portaudiocpp/
%{_includedir}/*.h %{_includedir}/portaudio.h
%{_includedir}/pa_jack.h
%{_includedir}/pa_linux_alsa.h
%{_includedir}/pa_unix_oss.h
%exclude %{_libdir}/*.la %exclude %{_libdir}/*.la
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Tue Feb 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 19-30 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 19-38
- Rebuilt for MSVSphere 8.9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 19-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue May 04 2021 Hans de Goede <hdegoede@redhat.com> - 19-36
- Fix FTBFS with upcoming autoconf-2.71 (rhbz#1943118)
* Tue Apr 06 2021 Uwe Klotz <uwe.klotz@gmail.com> - 19-35
- Upgrade to pa_stable_v190700_20210406
* Mon Mar 22 2021 Hans de Goede <hdegoede@redhat.com> - 19-34
- Deal with pipewire jack identifiers containing chars which have special meanings in regexes
Resolves rhbz#1939749
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 19-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19-30 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

@ -0,0 +1 @@
SHA512 (pa_stable_v190700_20210406.tgz) = 77393bf0628ad9c9d5fb1b0d9b1732d403e23513b1332553964bdafcc80878b2798141011d2615688150d753a594285e718cf716e990b2396f1d8dea7babd02d
Loading…
Cancel
Save