Attachment 202467 Details for Bug 236118 – portaudio.diff

[patch] portaudio.diff

portaudio.diff (text/plain), 2.40 KB, created by Tobias Kortkamp on 2019-03-01 03:40:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-03-01 03:40:28 UTC

Size: 2.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 494133)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	portaudio
> PORTVERSION=	19.6.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	audio
> MASTER_SITES=	http://www.portaudio.com/archives/
>Index: files/patch-src_hostapi_oss_pa__unix__oss.c
>===================================================================
>--- files/patch-src_hostapi_oss_pa__unix__oss.c	(revision 494133)
>+++ files/patch-src_hostapi_oss_pa__unix__oss.c	(working copy)
>@@ -1,40 +1,22 @@
>---- src/hostapi/oss/pa_unix_oss.c.orig	2018-07-17 07:24:21 UTC
>+--- src/hostapi/oss/pa_unix_oss.c.orig	2019-03-01 03:09:23 UTC
> +++ src/hostapi/oss/pa_unix_oss.c
>-@@ -62,6 +62,9 @@
>- #include <sys/poll.h>
>- #include <limits.h>
>- #include <semaphore.h>
>-+#ifdef __FreeBSD__
>-+#include <sys/sysctl.h>
>-+#endif
>+@@ -535,13 +535,13 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta
>+      * add it to a linked list.
>+      * A: Set an arbitrary of 100 devices, should probably be a smarter way. */
>  
>- #ifdef HAVE_SYS_SOUNDCARD_H
>- # include <sys/soundcard.h>
>-@@ -525,7 +528,14 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta
>-     int i;
>-     int numDevices = 0, maxDeviceInfos = 1;
>-     PaDeviceInfo **deviceInfos = NULL;
>-+    int defaultDevice = 0;
>- 
>-+#ifdef __FreeBSD__
>-+    size_t len = sizeof(defaultDevice);
>-+    if (sysctlbyname("hw.snd.default_unit", &defaultDevice, &len, NULL, 0) == -1 || len != 4)
>-+       defaultDevice = 0;
>-+#endif
>-+
>-     /* These two will be set to the first working input and output device, respectively */
>-     commonApi->info.defaultInputDevice = paNoDevice;
>-     commonApi->info.defaultOutputDevice = paNoDevice;
>-@@ -541,7 +551,7 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta
>+-    for( i = 0; i < 100; i++ )
>++    for( i = -1; i < 100; i++ )
>+     {
>+        char deviceName[32];
>         PaDeviceInfo *deviceInfo;
>         int testResult;
>  
> -       if( i == 0 )
>-+       if( i == defaultDevice )
>++       if( i == -1 )
>            snprintf(deviceName, sizeof (deviceName), "%s", DEVICE_NAME_BASE);
>         else
>            snprintf(deviceName, sizeof (deviceName), "%s%d", DEVICE_NAME_BASE, i);
>-@@ -2041,5 +2051,29 @@ static signed long GetStreamWriteAvailable( PaStream* 
>+@@ -2041,5 +2041,29 @@ static signed long GetStreamWriteAvailable( PaStream* 
>  error:
>      return result;
>  #endif

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 236118: 202465 | 202466 | 202467