From c54473abea3fd4d0a8c4bfce3c4aab2a8bc6db4e Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Thu, 19 Aug 2021 16:42:08 +0200
Subject: [PATCH] vbox6: update to version 6.1.26

Issue #4031
---
 repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk | 3 ---
 repos/ports/lib/mk/virtualbox6-runtime.mk             | 1 +
 repos/ports/ports/virtualbox6.hash                    | 2 +-
 repos/ports/ports/virtualbox6.port                    | 8 ++++----
 repos/ports/src/virtualbox6/dummies.cc                | 7 -------
 repos/ports/src/virtualbox6/target.mk                 | 2 ++
 repos/ports/src/virtualbox6/unimpl.cc                 | 1 -
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk b/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
index a73985e592..1260d12d59 100644
--- a/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
+++ b/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
@@ -5,10 +5,7 @@ SRC_CC += Devices/Audio/AudioMixBuffer.cpp
 SRC_CC += Devices/Audio/AudioMixer.cpp
 SRC_CC += Devices/Audio/DevHda.cpp
 SRC_CC += Devices/Audio/DevHdaCodec.cpp
-SRC_CC += Devices/Audio/DevHdaCommon.cpp
 SRC_CC += Devices/Audio/DevHdaStream.cpp
-SRC_CC += Devices/Audio/DevHdaStreamChannel.cpp
-SRC_CC += Devices/Audio/DevHdaStreamMap.cpp
 SRC_CC += Devices/Audio/DevIchAc97.cpp
 SRC_CC += Devices/Audio/DrvAudio.cpp
 SRC_CC += Devices/Audio/DrvHostAudioNull.cpp
diff --git a/repos/ports/lib/mk/virtualbox6-runtime.mk b/repos/ports/lib/mk/virtualbox6-runtime.mk
index 10f2667949..c9119d5b24 100644
--- a/repos/ports/lib/mk/virtualbox6-runtime.mk
+++ b/repos/ports/lib/mk/virtualbox6-runtime.mk
@@ -49,6 +49,7 @@ SRC_CC += Runtime/common/vfs/vfschain.cpp
 SRC_CC += Runtime/common/vfs/vfsstddir.cpp
 SRC_CC += Runtime/common/vfs/vfsstdfile.cpp
 SRC_CC += Runtime/common/zip/zip.cpp
+SRC_CC += Runtime/r3/freebsd/systemmem-freebsd.cpp
 SRC_CC += Runtime/r3/generic/dirrel-r3-generic.cpp
 SRC_CC += Runtime/r3/generic/semspinmutex-r3-generic.cpp
 SRC_CC += Runtime/r3/posix/dir-posix.cpp
diff --git a/repos/ports/ports/virtualbox6.hash b/repos/ports/ports/virtualbox6.hash
index 2970b56ad2..888a55296c 100644
--- a/repos/ports/ports/virtualbox6.hash
+++ b/repos/ports/ports/virtualbox6.hash
@@ -1 +1 @@
-54c91c57163a91b6e4f991d3c25e8624899e9eac
+a8a922bf4fe0dc60f00cf3a4cf8fd93b11e146a9
diff --git a/repos/ports/ports/virtualbox6.port b/repos/ports/ports/virtualbox6.port
index a49bdd4794..88f5add9ae 100644
--- a/repos/ports/ports/virtualbox6.port
+++ b/repos/ports/ports/virtualbox6.port
@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 6.1.22
+VERSION         := 6.1.26
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-144080.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-145957.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/virtualbox6
-SHA(virtualbox) := 99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49
+SHA(virtualbox) := 0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/virtualbox6_sdk
-SHA(virtualbox_sdk) := 15e0829259e2cb2a976da1957c69fabdfaf6e1d4b2a169ec7c243a6c757332b2
+SHA(virtualbox_sdk) := c0b5fbd78d6e1ac7a4b33365eb173eb6508390e8c673241ccbbd002eb73a785c
 
 PATCHES_DIR := src/virtualbox6/patches
 PATCHES     := $(addprefix $(PATCHES_DIR)/, $(shell cat $(REP_DIR)/$(PATCHES_DIR)/series))
diff --git a/repos/ports/src/virtualbox6/dummies.cc b/repos/ports/src/virtualbox6/dummies.cc
index 97da7f09b2..f04101ead7 100644
--- a/repos/ports/src/virtualbox6/dummies.cc
+++ b/repos/ports/src/virtualbox6/dummies.cc
@@ -201,13 +201,6 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *, IHostNetworkInterface **,
                                         IProgress **, const char *) STOP
 
 
-/* systemmem-freebsd.cpp */
-
-#include "iprt/system.h"
-
-RTDECL(int) RTSystemQueryTotalRam(uint64_t *pcb) STOP
-
-
 /* HostDnsServiceResolvConf.cpp */
 
 #include <string>
diff --git a/repos/ports/src/virtualbox6/target.mk b/repos/ports/src/virtualbox6/target.mk
index 7413426b88..cc059bb2d0 100644
--- a/repos/ports/src/virtualbox6/target.mk
+++ b/repos/ports/src/virtualbox6/target.mk
@@ -2,6 +2,8 @@ REQUIRES = x86_64
 
 TARGET = virtualbox6
 
+# fake build pass for lib .inc
+called_from_lib_mk := yes
 include $(REP_DIR)/lib/mk/virtualbox6-common.inc
 
 CC_WARN += -Wall
diff --git a/repos/ports/src/virtualbox6/unimpl.cc b/repos/ports/src/virtualbox6/unimpl.cc
index 0cfdbf589c..d33c076561 100644
--- a/repos/ports/src/virtualbox6/unimpl.cc
+++ b/repos/ports/src/virtualbox6/unimpl.cc
@@ -82,7 +82,6 @@ DUMMY(RTFsIsoMakerCmdEx)
 DUMMY(RTLdrLoadAppPriv)
 DUMMY(RTLdrLoadEx)
 DUMMY(RTProcCreate)
-DUMMY(RTSystemQueryAvailableRam)
 DUMMY(RTZipXarFsStreamFromIoStream)
 DUMMY(SELMR3GetSelectorInfo)
 DUMMY(SUPGetCpuHzFromGipForAsyncMode)