diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash index 156ce2a0a..676deb147 100644 --- a/repos/ports/ports/virtualbox5.hash +++ b/repos/ports/ports/virtualbox5.hash @@ -1 +1 @@ -b133c6dd40d51e4cbd0d8906f3f7ff5a57f8a7bf +04da35ec0708e54160bf4f045f82ce22b3be72a8 diff --git a/repos/ports/ports/virtualbox5.port b/repos/ports/ports/virtualbox5.port index b789d31ee..8c510795d 100644 --- a/repos/ports/ports/virtualbox5.port +++ b/repos/ports/ports/virtualbox5.port @@ -1,17 +1,17 @@ LICENSE := GPLv2 -VERSION := 5.1.34 +VERSION := 5.1.38 DOWNLOADS := virtualbox.archive virtualbox_sdk.archive VIRTUALBOX_TBZ2 := VirtualBox-$(VERSION).tar.bz2 -VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-121010.zip +VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-122592.zip URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2) DIR(virtualbox) := src/app/virtualbox -SHA(virtualbox) := b8a16bcc4267cad9cb92c7211d4081267c890efad16e89949f7449b8ae32f28c +SHA(virtualbox) := 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP) DIR(virtualbox_sdk) := src/app/virtualbox_sdk -SHA(virtualbox_sdk) := d9058973bb420382a583384f53f4a600215e6f4b16bdf333ebe7d5c13a3026f8 +SHA(virtualbox_sdk) := 038c1d069ecf2886a2a7ca1ad5483bde4169b7bee39d77fbb16943a28ce64341 PATCHES_DIR := src/virtualbox5/patches PATCHES_DIR_VBOX4 := src/virtualbox/patches @@ -96,7 +96,7 @@ VBOX_INC += VBoxVideo.h Hardware bioslogo.h scsi.h shflsvc.h VBoxGuest2.h vd.h VBOX_INC += vd-plugin.h vd-ifs.h vd-ifs-internal.h vd-image-backend.h VBOX_INC += vd-cache-backend.h vd-filter-backend.h msi.h asmdefs.mac err.mac VBOX_INC += VBoxVideoHost3D.h VBoxVideo3D.h settings.h VBoxAuth.h -VBOX_INC += usb.h usbfilter.h vrdpusb.h +VBOX_INC += usb.h usbfilter.h vrdpusb.h AssertGuest.h VBOX_INC += RemoteDesktop ExtPack/ExtPack.h VBOX_INC_COM := array.h assert.h AutoLock.h ErrorInfo.h EventQueue.h Guid.h diff --git a/repos/ports/src/virtualbox5/frontend/fb.h b/repos/ports/src/virtualbox5/frontend/fb.h index 01be1a613..81df159af 100644 --- a/repos/ports/src/virtualbox5/frontend/fb.h +++ b/repos/ports/src/virtualbox5/frontend/fb.h @@ -211,7 +211,7 @@ class Genodefb : Assert(!"FixMe"); return E_NOTIMPL; } - STDMETHODIMP ProcessVHWACommand(BYTE *pCommand) override { + STDMETHODIMP ProcessVHWACommand(BYTE *, LONG, BOOL) override { Assert(!"FixMe"); return E_NOTIMPL; } diff --git a/repos/ports/src/virtualbox5/patches/vbox_main.patch b/repos/ports/src/virtualbox5/patches/vbox_main.patch index 3eba87fd7..f1566696a 100644 --- a/repos/ports/src/virtualbox5/patches/vbox_main.patch +++ b/repos/ports/src/virtualbox5/patches/vbox_main.patch @@ -977,7 +977,7 @@ index a717aff..3d52b9f 100644 --- a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp +++ b/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp -@@ -956,7 +956,9 @@ +@@ -998,7 +998,9 @@ /* Inform the VRDP server about the change of display parameters. */ LogRelFlowFunc(("Calling VRDP\n")); @@ -987,7 +987,18 @@ index a717aff..3d52b9f 100644 /* And re-send the seamless rectangles if necessary. */ if (mfSeamlessEnabled) -@@ -1076,7 +1078,9 @@ +@@ -1121,8 +1123,10 @@ + xOrigin, yOrigin, 0, 0); + + /* Inform the VRDP server about the change of display parameters. */ ++#if 0 + LogRelFlowFunc(("Calling VRDP\n")); + mParent->i_consoleVRDPServer()->SendResize(); ++#endif + + /* And re-send the seamless rectangles if necessary. */ + if (mfSeamlessEnabled) +@@ -1353,7 +1357,9 @@ * either in VideoAccelFlush or displayVBVAUpdateProcess. * Inform the server here only if VBVA is disabled. */ @@ -997,7 +1008,7 @@ index a717aff..3d52b9f 100644 } } -@@ -2452,8 +2456,10 @@ +@@ -2811,8 +2817,10 @@ rc = VERR_INVALID_PARAMETER; } @@ -1008,15 +1019,13 @@ index a717aff..3d52b9f 100644 return rc; } -@@ -3023,6 +3029,7 @@ +@@ -3442,11 +3450,13 @@ * The server can now process redraw requests from clients or initial * fullscreen updates for new clients. */ +#if 0 for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++) { - DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId]; -@@ -3030,6 +3037,7 @@ Assert(pDisplay->mParent && pDisplay->mParent->i_consoleVRDPServer()); pDisplay->mParent->i_consoleVRDPServer()->SendUpdate(uScreenId, NULL, 0); } @@ -1024,17 +1033,17 @@ index a717aff..3d52b9f 100644 } #ifdef VBOX_WITH_VPX -@@ -3830,7 +3838,9 @@ +@@ -4292,7 +4302,9 @@ + pHdrUnconst->x -= (int16_t)pFBInfo->xOrigin; pHdrUnconst->y -= (int16_t)pFBInfo->yOrigin; - /** @todo new SendUpdate entry which can get a separate cmd header or coords. */ +#if 0 pThis->mParent->i_consoleVRDPServer()->SendUpdate(uScreenId, pHdrUnconst, (uint32_t)cbCmd); +#endif *pHdrUnconst = hdrSaved; } -@@ -4031,7 +4041,9 @@ +@@ -4519,7 +4531,9 @@ { /* VRDP server still need this notification. */ LogRelFlowFunc(("Calling VRDP\n"));