portaudio: Fix a floating point exception preventing Audacity from

starting on NetBSD under some circumstances.

4 files changed, 19 insertions, 8 deletions

diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index cc6c0b698cc..21d7106e9d8 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2022/03/28 10:43:38 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2022/06/14 14:18:45 nia Exp $
 
 DISTNAME=	pa_stable_v190600_20161030
 PKGNAME=	${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://www.portaudio.com/archives/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 014664383fb..ee1700713f8 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 09:59:23 nia Exp $
+$NetBSD: distinfo,v 1.29 2022/06/14 14:18:45 nia Exp $
 
 BLAKE2s (pa_stable_v190600_20161030.tgz) = 19c45436985da2c2ff7a4f016c7ae9dcb0772b43ffa3356961a2a98cacdb24d9
 SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
@@ -12,6 +12,6 @@ SHA1 (patch-src_common_pa__front.c) = cdddb6f537f803b55873ad6bfa936a6bff47556d
 SHA1 (patch-src_common_pa__stream.c) = 58e6ab2a61957208973a59be2f1140abc922f360
 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) = bab9b21d35d76afafa06c929bb35954d3870bc0d
+SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 785b6ba7fc89cf973c992541ee79a045a5c40707
+SHA1 (patch-src_hostapi_sun_pa__unix__sun.c) = 1e54e4fb75f15e74d931a11ee157beaae9a5f917
 SHA1 (patch-src_os_unix_pa__unix__hostapis.c) = 8cfc7d7aac8f9803e204711ded3d64842913f4fd
diff --git a/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c b/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
index 6992022bbbc..691cb21b7d3 100644
--- a/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
+++ b/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.4 2020/04/15 17:12:14 nia Exp $
+$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.5 2022/06/14 14:18:45 nia Exp $
 
 - Add 24-bit and 32-bit sample formats.
 - NetBSD-specific changes to make this map better to the emulation layer:
@@ -30,6 +30,15 @@ $NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.4 2020/04/15 17:12:14 nia Exp
          ENSURE_( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ), paUnanticipatedHostError );
  
          *defaultSampleRate = sr;
+@@ -756,7 +761,7 @@ static PaError PaOssStreamComponent_Init
+     component->devName = deviceName;
+     component->userChannelCount = parameters->channelCount;
+     component->userFormat = parameters->sampleFormat;
+-    component->latency = parameters->suggestedLatency;
++    component->latency = parameters->suggestedLatency > 0 ? parameters->suggestedLatency : 1;
+     component->userInterleaved = !(parameters->sampleFormat & paNonInterleaved);
+ 
+     if( !callbackMode && !component->userInterleaved )
 @@ -938,6 +943,16 @@ static PaError Pa2OssFormat( PaSampleFor
          case paInt16:
              *ossFormat = AFMT_S16_NE;
diff --git a/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c b/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c
index 277a55c1a10..01214044a53 100644
--- a/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c
+++ b/audio/portaudio/patches/patch-src_hostapi_sun_pa__unix__sun.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_hostapi_sun_pa__unix__sun.c,v 1.4 2021/09/09 21:42:00 nia Exp $
+$NetBSD: patch-src_hostapi_sun_pa__unix__sun.c,v 1.5 2022/06/14 14:18:45 nia Exp $
 
 Sun/NetBSD audio support.
 
---- src/hostapi/sun/pa_unix_sun.c.orig	2021-09-09 21:10:47.132269006 +0000
+This is upstreamed to GitHub.
+
+--- src/hostapi/sun/pa_unix_sun.c.orig	2022-06-14 14:03:33.619499935 +0000
 +++ src/hostapi/sun/pa_unix_sun.c
 @@ -0,0 +1,1123 @@
 +/*