diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash index 14bdf9e4c..d116158e8 100644 --- a/repos/ports/ports/virtualbox.hash +++ b/repos/ports/ports/virtualbox.hash @@ -1 +1 @@ -8163ec9421249f80de3e717555c3919a25d125fa +0610ebbc0265099255fa7864c512421c243a82ad diff --git a/repos/ports/ports/virtualbox.port b/repos/ports/ports/virtualbox.port index eb6d39344..20b328cb9 100644 --- a/repos/ports/ports/virtualbox.port +++ b/repos/ports/ports/virtualbox.port @@ -1,17 +1,17 @@ LICENSE := GPLv2 -VERSION := 4.3.16 +VERSION := 4.3.18 DOWNLOADS := virtualbox.archive virtualbox_sdk.archive VIRTUALBOX_TBZ2 := VirtualBox-$(VERSION).tar.bz2 -VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-95972.zip +VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-96516.zip URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2) DIR(virtualbox) := src/app/virtualbox -SHA(virtualbox) := e4c23b713e8715b8e0172fa066f2197756e901fe +SHA(virtualbox) := 81b65d31c9d1fa131d2aebaea7ea2597113a045c URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP) DIR(virtualbox_sdk) := src/app/virtualbox_sdk -SHA(virtualbox_sdk) := 8f95a891a6cb5f712fcb0ed34f2b8bf6b1e59f4c +SHA(virtualbox_sdk) := 86d8734ec0d06b40a498993a28e370885998a965 PATCHES_DIR := src/virtualbox/patches PATCHES_DIR_VBOX4 := src/virtualbox/patches @@ -47,7 +47,7 @@ VBOX_MAIN_SRV += USBControllerImpl USBDeviceFilterImpl USBDeviceFiltersImpl VBOX_MAIN_INC := AdditionsFacilityImpl AudioAdapterImpl AudioSnifferInterface VBOX_MAIN_INC += AutoCaller AutostartDb AutoStateDep BandwidthControlImpl VBOX_MAIN_INC += BandwidthGroupImpl BIOSSettingsImpl BusAssignmentManager Nvram -VBOX_MAIN_INC += ClientToken ConsoleEvents ConsoleImpl DHCPServerImpl DisplayImpl HostImpl +VBOX_MAIN_INC += ClientToken ConsoleImpl DHCPServerImpl DisplayImpl HostImpl VBOX_MAIN_INC += DisplayUtils EventImpl FramebufferImpl Global VBOX_MAIN_INC += GuestCtrlImplPrivate GuestDirectoryImpl GuestDnDImpl Logging VBOX_MAIN_INC += GuestFileImpl GuestFsObjInfoImpl GuestImpl GuestOSTypeImpl diff --git a/repos/ports/src/virtualbox/patches/usb.patch b/repos/ports/src/virtualbox/patches/usb.patch index f8a03f90e..ff1d0f3b4 100644 --- a/repos/ports/src/virtualbox/patches/usb.patch +++ b/repos/ports/src/virtualbox/patches/usb.patch @@ -23,32 +23,6 @@ diff --git a/src/app/virtualbox/src/VBox/Devices/USB/VUSBDevice.cpp b/src/app/vi index 4790fcb..d649ad6 100644 --- a/src/app/virtualbox/src/VBox/Devices/USB/VUSBDevice.cpp +++ b/src/app/virtualbox/src/VBox/Devices/USB/VUSBDevice.cpp -@@ -230,7 +230,14 @@ bool vusbDevDoSelectConfig(PVUSBDEV pDev, PCVUSBDESCCONFIGEX pCfgDesc) - if (i != VUSB_PIPE_DEFAULT) - { - vusbMsgFreeExtraData(pDev->aPipes[i].pCtrl); -+ -+ int rc = RTCritSectDelete(&pDev->aPipes[i].CritSectCtrl); -+ AssertRC(rc); -+ - memset(&pDev->aPipes[i], 0, sizeof(pDev->aPipes[i])); -+ -+ rc = RTCritSectInit(&pDev->aPipes[i].CritSectCtrl); -+ AssertRC(rc); - } - } - memset(pDev->paIfStates, 0, pCfgDesc->Core.bNumInterfaces * sizeof(pDev->paIfStates[0])); -@@ -1089,8 +1096,10 @@ static DECLCALLBACK(int) vusbDevCancelAllUrbsWorker(PVUSBDEV pDev, bool fDetachi - PVUSBURB pNext = pUrb->VUsb.pNext; - Assert(pUrb->VUsb.pDev == pDev); - -+#if 0 - AssertMsgFailed(("%s: Leaking left over URB! state=%d pDev=%p[%s]\n", - pUrb->pszDesc, pUrb->enmState, pDev, pDev->pUsbIns->pszName)); -+#endif - vusbUrbUnlink(pUrb); - /* Unlink isn't enough, because boundary timer and detaching will try to reap it. - * It was tested with MSD & iphone attachment to vSMP guest, if @@ -1134,7 +1143,7 @@ static DECLCALLBACK(int) vusbDevUrbIoThread(RTTHREAD hThread, void *pvUser) vusbUrbDoReapAsyncDev(pDev, RT_INDEFINITE_WAIT); diff --git a/repos/ports/src/virtualbox/patches/vbox_main.patch b/repos/ports/src/virtualbox/patches/vbox_main.patch index 19b034449..5db688545 100644 --- a/repos/ports/src/virtualbox/patches/vbox_main.patch +++ b/repos/ports/src/virtualbox/patches/vbox_main.patch @@ -138,19 +138,6 @@ index feebfcd..4136d6d 100644 }; #endif // ____H_H_FRAMEBUFFERIMPL -diff --git a/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h b/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h -index bb91290..d3c6d85 100644 ---- a/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h -+++ b/src/app/virtualbox/src/VBox/Main/include/MachineImpl.h -@@ -1213,7 +1213,7 @@ private: - HRESULT setMachineState(MachineState_T aMachineState); - HRESULT updateMachineStateOnClient(); - -- HRESULT mRemoveSavedState; -+ bool mRemoveSavedState; - - ConsoleTaskData mConsoleTaskData; - diff --git a/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h b/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h index f0ec275..78a390e 100644 --- a/src/app/virtualbox/src/VBox/Main/include/NetworkServiceRunner.h