CVS commit: pkgsrc/audio/portaudio

["Reinoud Zandijk" <reinoud%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   reinoud
Date:           Sat Jan 16 21:06:53 UTC 2021

Modified Files:
        pkgsrc/audio/portaudio: Makefile distinfo
        pkgsrc/audio/portaudio/patches: patch-src_hostapi_sun_pa__unix__sun.c

Log Message:
Fix Sun/NetBSD audio support. uaudio(4) record-only audio devices would not
allow to be opened write-only and the logic would then skip to the next
device.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/audio/portaudio/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/portaudio/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c

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

Modified files:

Index: pkgsrc/audio/portaudio/Makefile
diff -u pkgsrc/audio/portaudio/Makefile:1.31 pkgsrc/audio/portaudio/Makefile:1.32
--- pkgsrc/audio/portaudio/Makefile:1.31        Tue Aug 18 17:57:25 2020
+++ pkgsrc/audio/portaudio/Makefile     Sat Jan 16 21:06:52 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: Makefile,v 1.32 2021/01/16 21:06:52 reinoud Exp $
 
 DISTNAME=      pa_stable_v190600_20161030
 PKGNAME=       ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    audio
 MASTER_SITES=  http://www.portaudio.com/archives/
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/audio/portaudio/distinfo
diff -u pkgsrc/audio/portaudio/distinfo:1.24 pkgsrc/audio/portaudio/distinfo:1.25
--- pkgsrc/audio/portaudio/distinfo:1.24        Sat Apr 25 10:18:09 2020
+++ pkgsrc/audio/portaudio/distinfo     Sat Jan 16 21:06:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2020/04/25 10:18:09 nia Exp $
+$NetBSD: distinfo,v 1.25 2021/01/16 21:06:52 reinoud Exp $
 
 SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8
 RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13
@@ -14,5 +14,5 @@ SHA1 (patch-src_common_pa__stream.c) = 5
 SHA1 (patch-src_common_pa__stream.h) = 94781a9ae79ea1340eea8caadc106416c019cf74
 SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = 71daf913422f72aa379ae8cc302186800cff7717
 SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 572c48f64104e22e7ae49acc54a26e549e381b5b
-SHA1 (patch-src_hostapi_sun_pa__unix__sun.c) = 0bb6657adc268872c9e4c1b05b103ec8df357788
+SHA1 (patch-src_hostapi_sun_pa__unix__sun.c) = 0a2d26e477bb4c45d56b8d70db5a939911f4cf64
 SHA1 (patch-src_os_unix_pa__unix__hostapis.c) = 8cfc7d7aac8f9803e204711ded3d64842913f4fd

Index: pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c
diff -u pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c:1.2 pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c:1.3
--- pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c:1.2    Sat Apr 25 10:18:09 2020
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c        Sat Jan 16 21:06:52 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_hostapi_sun_pa__unix__sun.c,v 1.2 2020/04/25 10:18:09 nia Exp $
+$NetBSD: patch-src_hostapi_sun_pa__unix__sun.c,v 1.3 2021/01/16 21:06:52 reinoud Exp $
 
 Sun/NetBSD audio support.
 
---- src/hostapi/sun/pa_unix_sun.c.orig 2020-04-25 09:39:40.448044879 +0000
+--- src/hostapi/sun/pa_unix_sun.c.orig 2021-01-16 19:57:35.080979704 +0000
 +++ src/hostapi/sun/pa_unix_sun.c
-@@ -0,0 +1,1138 @@
+@@ -0,0 +1,1140 @@
 +/*
 + * $Id"
 + * PortAudio Portable Real-Time Audio Library
@@ -201,9 +201,11 @@ Sun/NetBSD audio support.
 +        else
 +            (void)snprintf(path, sizeof(path), SUN_DEV_DEFAULT);
 +
-+        if( (fd = open(path, O_WRONLY | O_NONBLOCK)) < 0 ||
-+            (fd = open(path, O_RDONLY | O_NONBLOCK)) < 0 )
-+            continue;
++        fd = open(path, O_WRONLY | O_NONBLOCK);
++      if (fd < 0)
++              fd = open(path, O_RDONLY | O_NONBLOCK);
++      if (fd < 0)
++              continue;
 +
 +        PA_UNLESS(dev = PaUtil_GroupAllocateMemory(sunHostApi->allocations, sizeof(PaDeviceInfo)), paInsufficientMemory);
 +