From 8a3429ef1634202523e3fb9691135c99cb22c406 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Mon, 11 Jan 2016 13:39:04 +0100
Subject: [PATCH] vbox: update to 4.3.20

Issue #2090
---
 repos/ports/lib/mk/virtualbox-common.inc      |  9 ++++++-
 repos/ports/lib/mk/virtualbox-devices.mk      |  5 +---
 repos/ports/ports/virtualbox.hash             |  2 +-
 repos/ports/ports/virtualbox.port             |  8 +++----
 .../src/virtualbox/patches/vbox_main.patch    | 24 ++-----------------
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/repos/ports/lib/mk/virtualbox-common.inc b/repos/ports/lib/mk/virtualbox-common.inc
index e1faba2f6..a3c1d134a 100644
--- a/repos/ports/lib/mk/virtualbox-common.inc
+++ b/repos/ports/lib/mk/virtualbox-common.inc
@@ -62,7 +62,14 @@ VBOX_CC_OPT += -DVBOX_VERSION_MAJOR=$(VIRTUALBOX_VERSION_MAJOR) \
                -DVBOX_VERSION_STRING=\"$(VIRTUALBOX_VERSION_MAJOR).$(VIRTUALBOX_VERSION_MINOR).$(VIRTUALBOX_VERSION_BUILD)_OSE\" \
                -DVBOX_PACKAGE_STRING=\"$(VIRTUALBOX_PACKAGE_STRING)\" \
                -DVBOX_API_VERSION_STRING=\"$(VIRTUALBOX_VERSION_MAJOR)_$(VIRTUALBOX_VERSION_MINOR)\" \
-               -DIPRT_BLDCFG_VERSION_STRING=\"$(VIRTUALBOX_VERSION_MAJOR).$(VIRTUALBOX_VERSION_MINOR).$(VIRTUALBOX_VERSION_BUILD)_OSE\"
+               -DIPRT_BLDCFG_VERSION_STRING=\"$(VIRTUALBOX_VERSION_MAJOR).$(VIRTUALBOX_VERSION_MINOR).$(VIRTUALBOX_VERSION_BUILD)_OSE\" \
+               -DIPRT_BLDCFG_TARGET=\"genode\" \
+               -DIPRT_BLDCFG_TARGET_ARCH=\"$(VBOX_MACH)\"
+
+VBOX_CC_OPT += -DVBOX_WITH_WDDM -DVBOX_WITH_WDDM_W8 -DVBOXWDDM_WITH_VBVA
+VBOX_CC_OPT += -DVBOX_WITH_VDMA
+VBOX_CC_OPT += -DVBOX_WITH_VMSVGA
+
 
 VBOX_CC_OPT += -DVBOX_HDD_NO_DYNAMIC_BACKENDS
 
diff --git a/repos/ports/lib/mk/virtualbox-devices.mk b/repos/ports/lib/mk/virtualbox-devices.mk
index 82c37a5db..331d669c6 100644
--- a/repos/ports/lib/mk/virtualbox-devices.mk
+++ b/repos/ports/lib/mk/virtualbox-devices.mk
@@ -47,6 +47,7 @@ SRC_CC += Devices/USB/DevOHCI.cpp
 SRC_CC += Devices/USB/USBProxyDevice.cpp
 SRC_CC += Devices/USB/VUSBDevice.cpp
 SRC_CC += Devices/USB/VUSBReadAhead.cpp
+SRC_CC += Devices/USB/VUSBSniffer.cpp
 SRC_CC += Devices/USB/VUSBUrb.cpp
 SRC_CC += Devices/Input/UsbMouse.cpp
 SRC_CC += Devices/Input/UsbKbd.cpp
@@ -60,10 +61,6 @@ INC_DIR += $(VBOX_DIR)/Devices/Bus
 
 CC_WARN += -Wno-unused-but-set-variable
 
-CC_OPT += -DVBOX_WITH_WDDM -DVBOX_WITH_WDDM_W8 -DVBOXWDDM_WITH_VBVA
-CC_OPT += -DVBOX_WITH_VDMA
-CC_OPT += -DVBOX_WITH_VMSVGA
-
 # found in src/VBox/Devices/Makefile.kmk
 CC_OPT += -DVBOX_HGCM_HOST_CODE
 
diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash
index d116158e8..d6f057314 100644
--- a/repos/ports/ports/virtualbox.hash
+++ b/repos/ports/ports/virtualbox.hash
@@ -1 +1 @@
-0610ebbc0265099255fa7864c512421c243a82ad
+fecdae2a67e96fa272b45ce6d40cdb15bda76e1d
diff --git a/repos/ports/ports/virtualbox.port b/repos/ports/ports/virtualbox.port
index 20b328cb9..0adfe6e9d 100644
--- a/repos/ports/ports/virtualbox.port
+++ b/repos/ports/ports/virtualbox.port
@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 4.3.18
+VERSION         := 4.3.20
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-96516.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-96996.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/app/virtualbox
-SHA(virtualbox) := 81b65d31c9d1fa131d2aebaea7ea2597113a045c
+SHA(virtualbox) := 42e725cda23955303b8bd4b9e2840767c7d943c5
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/app/virtualbox_sdk
-SHA(virtualbox_sdk) := 86d8734ec0d06b40a498993a28e370885998a965
+SHA(virtualbox_sdk) := 2c61edee345577570f0599e383e43957b2fca5fc
 
 PATCHES_DIR       := src/virtualbox/patches
 PATCHES_DIR_VBOX4 := src/virtualbox/patches
diff --git a/repos/ports/src/virtualbox/patches/vbox_main.patch b/repos/ports/src/virtualbox/patches/vbox_main.patch
index 5db688545..9c3a84906 100644
--- a/repos/ports/src/virtualbox/patches/vbox_main.patch
+++ b/repos/ports/src/virtualbox/patches/vbox_main.patch
@@ -956,28 +956,8 @@ index caed4be..19c3dc0 100644
  /**
   * Translate IDE StorageControllerType_T to string representation.
   */
-@@ -522,12 +525,12 @@ static LONG GetNextUsedPort(LONG aPortUsed[30], LONG lBaseVal, uint32_t u32Size)
- 
- #define MAX_BIOS_LUN_COUNT   4
- 
--static int SetBiosDiskInfo(ComPtr<IMachine> pMachine, PCFGMNODE pCfg, PCFGMNODE pBiosCfg,
-+static HRESULT SetBiosDiskInfo(ComPtr<IMachine> pMachine, PCFGMNODE pCfg, PCFGMNODE pBiosCfg,
-                            Bstr controllerName, const char * const s_apszBiosConfig[4])
- {
-     HRESULT             hrc;
- #define MAX_DEVICES     30
--#define H()     AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
-+#define H()     AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), E_FAIL)
- 
-     LONG lPortLUN[MAX_BIOS_LUN_COUNT];
-     LONG lPortUsed[MAX_DEVICES];
-@@ -599,9 +602,11 @@ static int SetBiosDiskInfo(ComPtr<IMachine> pMachine, PCFGMNODE pCfg, PCFGMNODE
-             LogFlowFunc(("Top %d HBA ports = %s, %d\n", j, s_apszBiosConfig[j], lPortLUN[j]));
-         }
-     }
--    return VINF_SUCCESS;
-+#undef H
-+    return S_OK;
+@@ -602,6 +602,7 @@ static int SetBiosDiskInfo(ComPtr<IMachine> pMachine, PCFGMNODE pCfg, PCFGMNODE
+     return S_OK;
  }
  
 +#if 0