vbox5: update to 5.1.32

Issue #2658

repos/ports/ports/virtualbox5.hash

@@ -1 +1 @@
-435eb7c1cce5eeb10d29a4ba2a780a1c76b53553
+9034a3ad9af7c4aa33b1c70f8d629ae2196dd334

repos/ports/ports/virtualbox5.port

@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 5.1.30
+VERSION         := 5.1.32
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-118389.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-120294.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/app/virtualbox
-SHA(virtualbox) := 85fbf2471887dbb275aece68dde117802e0d0ef0
+SHA(virtualbox) := f6363053cb6050db1a16ffffcd99b00d761c3007
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/app/virtualbox_sdk
-SHA(virtualbox_sdk) := 96e4834c5f8feaf307d6c590fea1b925aee2826d
+SHA(virtualbox_sdk) := 567927545f1790d56282e2532b0dafaaa7d67e14
 
 PATCHES_DIR       := src/virtualbox5/patches
 PATCHES_DIR_VBOX4 := src/virtualbox/patches

repos/ports/src/virtualbox5/patches/audio.patch

@@ -1,6 +1,6 @@
 --- a/src/app/virtualbox/src/VBox/Devices/Audio/HDAStreamPeriod.cpp
 +++ b/src/app/virtualbox/src/VBox/Devices/Audio/HDAStreamPeriod.cpp
-@@ -167,7 +167,9 @@
+@@ -176,7 +176,9 @@
   */
  void hdaStreamPeriodEnd(PHDASTREAMPERIOD pPeriod)
  {
@@ -12,7 +12,7 @@
          return;
 --- a/src/app/virtualbox/src/VBox/Devices/Audio/DrvAudio.cpp
 +++ b/src/app/virtualbox/src/VBox/Devices/Audio/DrvAudio.cpp
-@@ -1584,8 +1584,10 @@
+@@ -1638,8 +1638,10 @@
  #endif
          uint32_t cbAvail             = AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, AudioMixBufUsed(&pHstStrmOut->MixBuf));
  
@@ -25,24 +25,68 @@
              continue;
 --- a/src/app/virtualbox/src/VBox/Devices/Audio/DevHDA.cpp
 +++ b/src/app/virtualbox/src/VBox/Devices/Audio/DevHDA.cpp
-@@ -1273,9 +1273,9 @@
-                           pszSource, tsAssertedElapsedNs / 1000,
-                           avgAssertedUs,
-                           (pThis->Dbg.IRQ.tsDeassertedNs - pThis->Dbg.IRQ.tsAssertedNs) / 1000));
--#endif
-             Log3Func(("Asserted (%s): %RU64us between alternation (WALCLK=%RU64)\n",
-                       pszSource, tsLastElapsedNs / 1000, pThis->u64WalClk));
-+#endif
- 
-             PDMDevHlpPCISetIrq(pThis->CTX_SUFF(pDevIns), 0, 1 /* Assert */);
-             pThis->u8IRQL = 1;
-@@ -4021,7 +4021,9 @@
-     uint32_t csPerPeriod = (int)((strmProps.cChannels * cTicksElapsed * 48000 /* Hz */ + cTicksPerSec) / cTicksPerSec / 2);
-     uint32_t cbPerPeriod = csPerPeriod << strmProps.cShift;
- 
+@@ -1392,7 +1392,9 @@
+     if (   HDA_REG_FLAG_VALUE(pThis, INTCTL, GIE)
+         && ((HDA_REG(pThis, INTSTS) & ~HDA_INTSTS_FLAG_GIS) & HDA_REG(pThis, INTCTL)))
+     {
 +#ifdef DEBUG
-     Log3Func(("[SD%RU8] %RU64ms (%zu samples, %zu bytes) elapsed\n", pStream->u8SD, cMsElapsed, csPerPeriod, cbPerPeriod));
+         Log3Func(("Asserted (%s)\n", pszSource));
 +#endif
  
-     return cbPerPeriod;
+         PDMDevHlpPCISetIrq(pThis->CTX_SUFF(pDevIns), 0, 1 /* Assert */);
+         pThis->u8IRQL = 1;
+@@ -1404,7 +1406,9 @@
+     }
+     else
+     {
++#ifdef DEBUG
+         Log3Func(("Deasserted (%s)\n", pszSource));
++#endif
+ 
+         PDMDevHlpPCISetIrq(pThis->CTX_SUFF(pDevIns), 0, 0 /* Deassert */);
+         pThis->u8IRQL = 0;
+@@ -1867,7 +1871,7 @@
+                  pStream->u8SD, pThis->u16TimerHz, cTicksPerHz, pStream->State.cTicksPerByte,
+                  pStream->State.cbTransferChunk, pStream->State.cTransferTicks, pStream->State.cbTransferSize));
+ 
+-#ifdef LOG_ENABLED
++#ifdef DEBUG
+         hdaBDLEDumpAll(pThis, pStream->u64BDLBase, pStream->u16LVI + 1);
+ #endif
+         /*
+@@ -3388,7 +3392,7 @@
  }
+ # endif /* HDA_USE_DMA_ACCESS_HANDLER */
+ 
+-# ifdef LOG_ENABLED
++# ifdef DEBUG
+ static void hdaBDLEDumpAll(PHDASTATE pThis, uint64_t u64BDLBase, uint16_t cBDLE)
+ {
+     LogFlowFunc(("BDLEs @ 0x%x (%RU16):\n", u64BDLBase, cBDLE));
+@@ -5074,7 +5078,7 @@
+               pStrm->u8SD,
+               HDA_STREAM_REG(pThis, LPIB, pStrm->u8SD), HDA_STREAM_REG(pThis, CBL, pStrm->u8SD), HDA_STREAM_REG(pThis, LVI, pStrm->u8SD)));
+ 
+-#ifdef LOG_ENABLED
++#ifdef DEBUG
+     hdaBDLEDumpAll(pThis, pStrm->u64BDLBase, pStrm->u16LVI + 1);
+ #endif
+ 
+@@ -5485,7 +5489,7 @@
+                     Log2Func(("[SD%RU8] LPIB=%RU32, CBL=%RU32, LVI=%RU32\n",
+                               uStreamID,
+                               HDA_STREAM_REG(pThis, LPIB, uStreamID), HDA_STREAM_REG(pThis, CBL, uStreamID), HDA_STREAM_REG(pThis, LVI, uStreamID)));
+-#ifdef LOG_ENABLED
++#ifdef DEBUG
+                     hdaBDLEDumpAll(pThis, pStrm->u64BDLBase, pStrm->u16LVI + 1);
+ #endif
+                 }
+@@ -5695,7 +5699,7 @@
+         Log2Func(("[SD%RU8] LPIB=%RU32, CBL=%RU32, LVI=%RU32\n",
+                   uStreamID,
+                   HDA_STREAM_REG(pThis, LPIB, uStreamID), HDA_STREAM_REG(pThis, CBL, uStreamID), HDA_STREAM_REG(pThis, LVI, uStreamID)));
+-#ifdef LOG_ENABLED
++#ifdef DEBUG
+         hdaBDLEDumpAll(pThis, pStrm->u64BDLBase, pStrm->u16LVI + 1);
+ #endif
+         /** @todo (Re-)initialize active periods? */