Attachment 216400 Details for Bug 233301 – Port patch to fix OSS audio support

[patch] Port patch to fix OSS audio support

VB-AudioOSS.diff (text/plain), 2.65 KB, created by rkoberman on 2020-07-12 01:18:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rkoberman

Created: 2020-07-12 01:18:46 UTC

Size: 2.65 KB

patch

obsolete

>Index: emulators/virtualbox-ose/Makefile
>===================================================================
>--- emulators/virtualbox-ose/Makefile	(revision 542062)
>+++ emulators/virtualbox-ose/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.34
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostOSSAudio.cpp
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostOSSAudio.cpp	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostOSSAudio.cpp	(working copy)
>@@ -0,0 +1,32 @@
>+--- emulators/virtualbox-ose/work/VirtualBox-5.2.34/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2019-10-10 11:09:31.000000000 -0700
>++++ emulators/virtualbox-ose/work/VirtualBox-5.2.34/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp	2020-07-11 17:50:06.963665000 -0700
>+@@ -248,11 +248,11 @@
>+                 break;
>+ 
>+             default:
>+-                rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
>++                iFormat = -1;
>+                 break;
>+         }
>+ 
>+-        if (RT_FAILURE(rc))
>++        if (RT_UNLIKELY(iFormat == -1))
>+             break;
>+ 
>+         if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
>+@@ -660,6 +660,7 @@
>+ 
>+                 pCfgAcq->Backend.cfPeriod     = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize);
>+                 pCfgAcq->Backend.cfBufferSize = pCfgAcq->Backend.cfPeriod * 2; /* Use "double buffering". */
>++                pCfgAcq->Backend.cfPreBuf     = pCfgAcq->Backend.cfBufferSize;
>+                 /** @todo Pre-buffering required? */
>+             }
>+         }
>+@@ -778,6 +779,7 @@
>+ #endif
>+             pCfgAcq->Backend.cfPeriod     = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, obtStream.cbFragmentSize);
>+             pCfgAcq->Backend.cfBufferSize = pCfgAcq->Backend.cfPeriod * 2; /* Use "double buffering" */
>++            pCfgAcq->Backend.cfPreBuf     = pCfgAcq->Backend.cfBufferSize;
>+         }
>+ 
>+     } while (0);
>
>Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostOSSAudio.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 233301: 203632 | 203633 | 205654 | 205683 | 205706 | 214798 | 216400