CVS commit: pkgsrc/audio/portaudio/patches

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/portaudio/patches
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 26 Oct 2019 17:22:39 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Oct 26 17:22:39 UTC 2019

Added Files:
        pkgsrc/audio/portaudio/patches: patch-include_pa__unix__oss.h
            patch-include_portaudio.h patch-src_common_pa__front.c
            patch-src_common_pa__stream.c patch-src_common_pa__stream.h

Log Message:
portaudio: Missing patches intended for last commit


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/portaudio/patches/patch-include_pa__unix__oss.h \
    pkgsrc/audio/portaudio/patches/patch-include_portaudio.h \
    pkgsrc/audio/portaudio/patches/patch-src_common_pa__front.c \
    pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.c \
    pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/audio/portaudio/patches/patch-include_pa__unix__oss.h
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-include_pa__unix__oss.h:1.1
--- /dev/null   Sat Oct 26 17:22:39 2019
+++ pkgsrc/audio/portaudio/patches/patch-include_pa__unix__oss.h        Sat Oct 26 17:22:39 2019
@@ -0,0 +1,111 @@
+$NetBSD: patch-include_pa__unix__oss.h,v 1.1 2019/10/26 17:22:39 nia Exp $
+
+Add features needed to make portmixer work in audacity.
+
+--- /dev/null
++++ include/pa_unix_oss.h
+@@ -0,0 +1,104 @@
++#ifndef PA_UNIX_OSS_H
++#define PA_UNIX_OSS_H
++
++/*
++ *
++ * PortAudio Portable Real-Time Audio Library
++ * OSS-specific extensions
++ *
++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files
++ * (the "Software"), to deal in the Software without restriction,
++ * including without limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * Any person wishing to distribute modifications to the Software is
++ * requested to send the modifications to the original developer so that
++ * they can be incorporated into the canonical version.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++/** @file
++ * OSS-specific PortAudio API extension header file.
++ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++const char *PaOSS_GetStreamInputDevice( PaStream *s );
++
++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++#ifndef PA_UNIX_OSS_H
++#define PA_UNIX_OSS_H
++
++/*
++ *
++ * PortAudio Portable Real-Time Audio Library
++ * OSS-specific extensions
++ *
++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files
++ * (the "Software"), to deal in the Software without restriction,
++ * including without limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * Any person wishing to distribute modifications to the Software is
++ * requested to send the modifications to the original developer so that
++ * they can be incorporated into the canonical version.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++/** @file
++ * OSS-specific PortAudio API extension header file.
++ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++const char *PaOSS_GetStreamInputDevice( PaStream *s );
++
++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
Index: pkgsrc/audio/portaudio/patches/patch-include_portaudio.h
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-include_portaudio.h:1.1
--- /dev/null   Sat Oct 26 17:22:39 2019
+++ pkgsrc/audio/portaudio/patches/patch-include_portaudio.h    Sat Oct 26 17:22:39 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-include_portaudio.h,v 1.1 2019/10/26 17:22:39 nia Exp $
+
+Add features needed to make portmixer work in audacity.
+
+--- include/portaudio.h.orig   2016-10-30 01:23:04.000000000 +0000
++++ include/portaudio.h
+@@ -1197,6 +1197,15 @@ signed long Pa_GetStreamReadAvailable( P
+ signed long Pa_GetStreamWriteAvailable( PaStream* stream );
+ 
+ 
++/** Retrieve the host type handling an open stream.
++
++ @return Returns a non-negative value representing the host API type
++ handling an open stream or, a PaErrorCode (which are always negative)
++ if PortAudio is not initialized or an error is encountered.
++*/
++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream );
++
++
+ /* Miscellaneous utilities */
+ 
+ 
Index: pkgsrc/audio/portaudio/patches/patch-src_common_pa__front.c
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-src_common_pa__front.c:1.1
--- /dev/null   Sat Oct 26 17:22:39 2019
+++ pkgsrc/audio/portaudio/patches/patch-src_common_pa__front.c Sat Oct 26 17:22:39 2019
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_common_pa__front.c,v 1.1 2019/10/26 17:22:39 nia Exp $
+
+Add features needed to make portmixer work in audacity.
+
+--- src/common/pa_front.c.orig 2016-10-30 01:23:04.000000000 +0000
++++ src/common/pa_front.c
+@@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream
+                                   hostApiInputParametersPtr, hostApiOutputParametersPtr,
+                                   sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
+ 
+-    if( result == paNoError )
++    if( result == paNoError ) {
+         AddOpenStream( *stream );
++        PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type;
++    }
+ 
+ 
+     PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+@@ -1770,6 +1772,32 @@ signed long Pa_GetStreamWriteAvailable( 
+     return result;
+ }
+ 
++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream )
++{
++    PaError error = PaUtil_ValidateStreamPointer( stream );
++    PaHostApiTypeId result;
++
++#ifdef PA_LOG_API_CALLS
++    PaUtil_DebugPrint("Pa_GetStreamHostApiType called:\n" );
++    PaUtil_DebugPrint("\tPaStream* stream: 0x%p\n", stream );
++#endif
++
++    if( error == paNoError )
++    {
++        result = PA_STREAM_REP(stream)->hostApiType;
++    }
++    else
++    {
++        result = (PaHostApiTypeId) error;
++    }
++
++#ifdef PA_LOG_API_CALLS
++    PaUtil_DebugPrint("Pa_GetStreamHostApiType returned:\n" );
++    PaUtil_DebugPrint("\tPaError: %d ( %s )\n\n", result, Pa_GetErrorText( result ) );
++#endif
++
++    return result;
++}
+ 
+ PaError Pa_GetSampleSize( PaSampleFormat format )
+ {
Index: pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.c
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.c:1.1
--- /dev/null   Sat Oct 26 17:22:39 2019
+++ pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.c        Sat Oct 26 17:22:39 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_pa__stream.c,v 1.1 2019/10/26 17:22:39 nia Exp $
+
+Add features needed to make portmixer work in audacity.
+
+--- src/common/pa_stream.c.orig        2016-10-30 01:23:04.000000000 +0000
++++ src/common/pa_stream.c
+@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentati
+     streamRepresentation->streamInfo.inputLatency = 0.;
+     streamRepresentation->streamInfo.outputLatency = 0.;
+     streamRepresentation->streamInfo.sampleRate = 0.;
++
++    streamRepresentation->hostApiType = 0;
+ }
+ 
+ 
Index: pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.h
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.h:1.1
--- /dev/null   Sat Oct 26 17:22:39 2019
+++ pkgsrc/audio/portaudio/patches/patch-src_common_pa__stream.h        Sat Oct 26 17:22:39 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_pa__stream.h,v 1.1 2019/10/26 17:22:39 nia Exp $
+
+Add features needed to make portmixer work in audacity.
+
+--- src/common/pa_stream.h.orig        2016-10-30 01:23:04.000000000 +0000
++++ src/common/pa_stream.h
+@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentatio
+     PaStreamFinishedCallback *streamFinishedCallback;
+     void *userData;
+     PaStreamInfo streamInfo;
++    PaHostApiTypeId hostApiType;
+ } PaUtilStreamRepresentation;
+ 
+

Prev by Date: CVS commit: pkgsrc/audio
Next by Date: CVS commit: pkgsrc/www/libmicrohttpd
Previous by Thread: CVS commit: pkgsrc/audio
Next by Thread: CVS commit: pkgsrc/www/libmicrohttpd
Indexes:

Home | Main Index | Thread Index | Old Index