virtualbox-ose-4.3.10 doesn't compile with following options set GUESTADDITIONS UDPTUNNEL VNC WEBSERVICE PYTHON kBuild: Compiling VBoxDD - /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Storage/UsbMsd.cpp /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp: In function 'int vboxVDMAWorkerThread(RTTHREADINT*, void*)': /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:1764: error: 'vboxVDMACrCmdProcess' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:1769: error: 'vboxVDMACrHostCtlProcess' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:1773: error: 'vboxVDMACrGuestCtlProcess' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp: In function 'void vdmaVBVACtlSubmitSyncCompletion(VBVAEXHOSTCONTEXT*, VBVAEXHOSTCTL*, int, void*)': /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2248: error: 'VDMA_VBVA_CTL_CYNC_COMPLETION' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2248: error: 'pData' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2248: error: expected primary-expression before ')' token /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2248: error: expected `;' before 'pvContext' /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp: In function 'int vdmaVBVACtlSubmitSync(VBOXVDMAHOST*, VBVAEXHOSTCTL*, VBVAEXHOSTCTL_SOURCE)': /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2257: error: 'VDMA_VBVA_CTL_CYNC_COMPLETION' was not declared in this scope /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2257: error: expected `;' before 'Data' /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp:2258: error: 'Data' was not declared in this scope kmk: *** [/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/release/obj/VBoxDD/Graphics/DevVGA_VDMA.o] Error 1 The failing command: @c++ -c -O2 -g -pipe -Wshadow -Wno-long-long -Wno-variadic-macros -O2 -mtune=generic -fno-omit-frame-pointer -fno-strict-aliasing -fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -fPIC -m64 -I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/build -I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Network/slirp -I/usr/include -I/usr/X11R6/include -I/usr/local/include -I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/release/obj/VBoxDD/dtrace -I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/include -I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_DEBUGGER -DRT_OS_FREEBSD -D__FREEBSD__ -DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/usr/local/share/virtualbox-ose\" -DRTPATH_APP_PRIVATE_ARCH=\"/usr/local/lib/virtualbox \" -DRTPATH_SHARED_LIBS=\"/usr/local/lib/virtualbox\" -DRTPATH_APP_DOCS=\"/usr/local/share/doc/virtualbox-ose\" -DIN_RING3 -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DPIC -DVBOX_ACPI -DVBOX_HGCM_HOST_CODE -DVBOX_WITH_HGCM -DVBOX_WITH_DMI_CHASSIS -DVBOX_WITH_DMI_OEMSTRINGS -DVBOX_WITH_SMC_NEW -DVBOXWDDM_WITH_VBVA -DVBOX_WITH_VIDEOHWACCEL -DVBOX_WITH_HGSMI -DVBOX_WITH_WDDM -DVBOX_WITH_VMSVGA -DVBOX_WITH_VDMA -DVBOX_WITH_PXE_ROM -DVBOX_WITH_USB -DVBOX_WITH_VUSB -DVBOX_WITH_INIP -DVBOX_WITH_E1000 -DVBOX_WITH_VIRTIO -DVBOX_WITH_UDPTUNNEL -DVBOX_WITH_VDE -DVBOX_WITH_NETSHAPER -DVBOX_WITH_AHCI -DIN_AHCI_R3 -DVBOX_WITH_BUSLOGIC -DVBOX_WITH_LSILOGIC -DVBOX_WITH_PDM_ASYNC_COMPLETION -DVBOX_WITH_SCSI -DVBOX_WITH_EFI -DVBOX_WITH_MSI_DEVICES -DVBOX_WITH_NETFLT -DVUSB_HAVE_USBPROXY_DEVICE -Wp,-MD,/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/release/obj/VBoxDD/Graphics/DevVGA_VDMA.o.dep -Wp,-MT,/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/r elease/obj/VBoxDD/Graphics/DevVGA_VDMA.o -Wp! ,-MP -o /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/out/freebsd.amd64/release/obj/VBoxDD/Graphics/DevVGA_VDMA.o /usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.3.10/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp kmk: *** Waiting for unfinished jobs.... How-To-Repeat: set following options and recompile emulation/virtualbox-ose: GUESTADDITIONS UDPTUNNEL VNC WEBSERVICE PYTHON
Responsible Changed From-To: freebsd-ports-bugs->vbox Over to maintainer (via the GNATS Auto Assign Tool)
Running into this too, with options DBUS GUEST_ADDITIONS PYTHON UDPTUNNEL VNC WEBSERVICE set. Seems to be due to a bug in recent upstream commits relating to #ifdefs. The offending functions are defined within an #ifdef (starting at line 778 of DevVGA_VDMA.cpp), but are referenced from without it. Obviously, this leads to problems when the #ifdef guard isn't actually defined (VBOX_WITH_CRHGSMI). Solution? This is fairly technical code so I'm not entirely sure. Whatever references all that stuff should probably also be between #ifdefs.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 It seems '--build-headless' is horribly broken by WDDM. Here is my attempt to fix the build (not run-time tested). This patch is also available from here: http://people.freebsd.org/~jkim/vbox-headless.diff Cheers, Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQEbBAEBAgAGBQJTPJFaAAoJEHyflib82/FGzHUH+I77weYJW+5gDySU+qlnZ7BF YqHDLeCTUCPn1z6UqF9XJFmG/iVmMmDxGZsWGeFeLti2vowZ59P8W++D+7YHgcy+ gPYgwF/M6CLP0qKLAa3Fkp1/Zt5KtUXXamSdLWRGv2Q8xaTtoZI6EQKzut6Ce7NG Ey3BH/9IG/hWyFu1MBlTdmlQwtM28KHXWI5cT2gbhf2u1TdaxqepwJqXTIJUGgqk z+HLn3oDzntglfnj+dzPG0QUTFksNC0sJJNoJ/F2lkwwMr2kkcPPOe2tvr9cFSP7 vdPEKcKQwzsJnRLLD9oRq37nFqDC6kWJRkeSQ+Tur6l+v/qT4cg06dlZJ7m+0Q== =sUS0 -----END PGP SIGNATURE-----
03.04.2014 01:38, Jung-uk Kim пиÑеÑ: > It seems '--build-headless' is horribly broken by WDDM. Here is my > attempt to fix the build (not run-time tested). This patch is also > available from here: > > http://people.freebsd.org/~jkim/vbox-headless.diff > Port build succeeded, but now I cannot start VM with error Unable to load R3 module /usr/local/lib/virtualbox/VBoxDD.so (VBoxDD): /usr/local/lib/virtualbox/VBoxDD.so: Undefined symbol "_Z17vboxCmdVBVACmdCtlP8VGAStateP15VBOXCMDVBVA_CTLj" (VERR_FILE_NOT_FOUND)
On 2014-04-03 02:42:23 -0400, Alexandr Krivulya wrote: > 03.04.2014 01:38, Jung-uk Kim пиÑеÑ: >> It seems '--build-headless' is horribly broken by WDDM. Here is >> my attempt to fix the build (not run-time tested). This patch >> is also available from here: >> >> http://people.freebsd.org/~jkim/vbox-headless.diff >> > > Port build succeeded, but now I cannot start VM with error > > Unable to load R3 module /usr/local/lib/virtualbox/VBoxDD.so > (VBoxDD): /usr/local/lib/virtualbox/VBoxDD.so: Undefined symbol > "_Z17vboxCmdVBVACmdCtlP8VGAStateP15VBOXCMDVBVA_CTLj" > (VERR_FILE_NOT_FOUND) Please revert the patch and try the new one (attached and uploaded again). Thanks, Jung-uk Kim
03.04.2014 22:49, Jung-uk Kim пиÑеÑ: > On 2014-04-03 02:42:23 -0400, Alexandr Krivulya wrote: >> 03.04.2014 01:38, Jung-uk Kim пиÑеÑ: >>> It seems '--build-headless' is horribly broken by WDDM. Here is >>> my attempt to fix the build (not run-time tested). This patch >>> is also available from here: >>> >>> http://people.freebsd.org/~jkim/vbox-headless.diff >>> >> Port build succeeded, but now I cannot start VM with error >> >> Unable to load R3 module /usr/local/lib/virtualbox/VBoxDD.so >> (VBoxDD): /usr/local/lib/virtualbox/VBoxDD.so: Undefined symbol >> "_Z17vboxCmdVBVACmdCtlP8VGAStateP15VBOXCMDVBVA_CTLj" >> (VERR_FILE_NOT_FOUND) > Please revert the patch and try the new one (attached and uploaded again). > > Now it works. Thank you.
Author: jkim Date: Tue Apr 8 17:59:45 2014 New Revision: 350637 URL: http://svnweb.freebsd.org/changeset/ports/350637 QAT: https://qat.redports.org/buildarchive/r350637/ Log: Fix build without X11. PR: ports/188053 Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp (contents, props changed) Modified: head/emulators/virtualbox-ose/Makefile Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Tue Apr 8 17:08:51 2014 (r350636) +++ head/emulators/virtualbox-ose/Makefile Tue Apr 8 17:59:45 2014 (r350637) @@ -191,21 +191,18 @@ post-patch: @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_VBOXDRV = ' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_VIDEOHWACCEL = 1' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_NETADP = ' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk -.if ${PORT_OPTIONS:MVNC} - @${ECHO} 'VBOX_WITH_EXTPACK_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk -.endif + @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk .if ${PORT_OPTIONS:MUDPTUNNEL} @${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk .endif +.if ${PORT_OPTIONS:MVNC} + @${ECHO} 'VBOX_WITH_EXTPACK_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk +.endif .if ${PORT_OPTIONS:MWEBSERVICE} @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk @@ -214,6 +211,11 @@ post-patch: @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk .endif +.if empty(PORT_OPTIONS:MX11) + @${ECHO} 'VBOX_WITH_VDMA =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_WDDM =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_WDDM_W8 =' >> ${WRKSRC}/LocalConfig.kmk +.endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp Tue Apr 8 17:59:45 2014 (r350637) @@ -0,0 +1,86 @@ +--- src/VBox/Devices/Graphics/DevVGA.cpp.orig 2014-03-26 15:17:10.000000000 -0400 ++++ src/VBox/Devices/Graphics/DevVGA.cpp 2014-04-02 16:41:47.000000000 -0400 +@@ -5196,10 +5196,12 @@ + PVGASTATE pThis = (PVGASTATE)pvUser; + NOREF(pDevIns); + ++#ifdef VBOX_WITH_WDDM + if (pThis->fScanLineCfg & VBVASCANLINECFG_ENABLE_VSYNC_IRQ) + { + VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_VSYNC); + } ++#endif + + if (pThis->pDrv) + pThis->pDrv->pfnRefresh(pThis->pDrv); +@@ -5211,7 +5213,9 @@ + vbvaTimerCb(pThis); + #endif + ++#ifdef VBOX_WITH_VDMA + vboxCmdVBVACmdTimer(pThis); ++#endif + } + + #ifdef VBOX_WITH_VMSVGA +@@ -5365,26 +5369,30 @@ + static DECLCALLBACK(int) vgaR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM) + { + PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE); ++ + #ifdef VBOX_WITH_VDMA + vboxVDMASaveStateExecPrep(pThis->pVdma, pSSM); + #endif ++ + vgaR3SaveConfig(pThis, pSSM); + vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE)); ++ + #ifdef VBOX_WITH_HGSMI + SSMR3PutBool(pSSM, true); + int rc = vboxVBVASaveStateExec(pDevIns, pSSM); + # ifdef VBOX_WITH_VDMA + vboxVDMASaveStateExecDone(pThis->pVdma, pSSM); + # endif +- return rc; + #else +- SSMR3PutBool(pSSM, false); ++ int rc = SSMR3PutBool(pSSM, false); + #endif ++ + #ifdef VBOX_WITH_VMSVGA + if ( rc == VINF_SUCCESS + && pThis->fVMSVGAEnabled) + rc = vmsvgaSaveExec(pDevIns, pSSM); + #endif ++ + return rc; + } + +@@ -5476,8 +5484,10 @@ + char *pchEnd; + LogFlow(("vgaReset\n")); + ++#ifdef VBOX_WITH_VDMA + if (pThis->pVdma) + vboxVDMAReset(pThis->pVdma); ++#endif + + #ifdef VBOX_WITH_HGSMI + VBVAReset(pThis); +@@ -5924,12 +5934,14 @@ + # if defined(VBOX_WITH_VIDEOHWACCEL) + pThis->IVBVACallbacks.pfnVHWACommandCompleteAsynch = vbvaVHWACommandCompleteAsynch; + # endif +-#if defined(VBOX_WITH_CRHGSMI) ++# if defined(VBOX_WITH_CRHGSMI) + pThis->IVBVACallbacks.pfnCrHgsmiCommandCompleteAsync = vboxVDMACrHgsmiCommandCompleteAsync; + pThis->IVBVACallbacks.pfnCrHgsmiControlCompleteAsync = vboxVDMACrHgsmiControlCompleteAsync; + # endif +-#endif ++# if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI) + pThis->IVBVACallbacks.pfnCrCtlSubmit = vboxCmdVBVACmdHostCtl; ++# endif ++#endif + + /* + * We use our own critical section to avoid unncessary pointer indirections Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp Tue Apr 8 17:59:45 2014 (r350637) @@ -0,0 +1,34 @@ +--- src/VBox/Devices/Graphics/DevVGA_VBVA.cpp.orig 2014-03-26 15:17:10.000000000 -0400 ++++ src/VBox/Devices/Graphics/DevVGA_VBVA.cpp 2014-04-03 14:58:41.000000000 -0400 +@@ -1939,6 +1939,7 @@ + + switch (u16ChannelInfo) + { ++#ifdef VBOX_WITH_VDMA + case VBVA_CMDVBVA_SUBMIT: + { + rc = vboxCmdVBVACmdSubmit(pVGAState); +@@ -1965,7 +1966,6 @@ + rc = vboxCmdVBVACmdCtl(pVGAState, pCtl, cbBuffer - VBoxSHGSMIBufferHeaderSize()); + break; + } +-#ifdef VBOX_WITH_VDMA + case VBVA_VDMA_CMD: + { + if (cbBuffer < VBoxSHGSMIBufferHeaderSize() + sizeof (VBOXVDMACBUF_DR)) +@@ -2277,7 +2277,6 @@ + pVGAState->fGuestCaps = pCaps->fCaps; + pCaps->rc = VINF_SUCCESS; + } break; +-#endif + case VBVA_SCANLINE_CFG: + { + if (cbBuffer < sizeof (VBVASCANLINECFG)) +@@ -2290,6 +2289,7 @@ + pVGAState->fScanLineCfg = pCfg->fFlags; + pCfg->rc = VINF_SUCCESS; + } break; ++#endif + default: + Log(("Unsupported VBVA guest command %d!!!\n", + u16ChannelInfo)); Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp Tue Apr 8 17:59:45 2014 (r350637) @@ -0,0 +1,38 @@ +--- src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp.orig 2014-03-26 15:17:10.000000000 -0400 ++++ src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp 2014-04-02 16:26:50.000000000 -0400 +@@ -1185,6 +1185,8 @@ + return rc; + } + ++#ifdef VBOX_WITH_WDDM ++ + static int hgsmiHostSaveGuestCmdCompletedFifoEntryLocked (HGSMIGUESTCOMPLENTRY *pEntry, PSSMHANDLE pSSM) + { + return SSMR3PutU32 (pSSM, pEntry->offBuffer); +@@ -1211,6 +1213,8 @@ + return rc; + } + ++#endif ++ + static int hgsmiHostLoadFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIHOSTFIFOENTRY **ppEntry, PSSMHANDLE pSSM) + { + HGSMIHOSTFIFOENTRY *pEntry; +@@ -1253,6 +1257,8 @@ + return rc; + } + ++#ifdef VBOX_WITH_WDDM ++ + static int hgsmiHostLoadGuestCmdCompletedFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIGUESTCOMPLENTRY **ppEntry, PSSMHANDLE pSSM) + { + HGSMIGUESTCOMPLENTRY *pEntry; +@@ -1306,6 +1312,8 @@ + return rc; + } + ++#endif ++ + int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM) + { + VBOXHGSMI_SAVE_START(pSSM); Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp Tue Apr 8 17:59:45 2014 (r350637) @@ -0,0 +1,28 @@ +--- src/VBox/Main/src-client/DisplayImpl.cpp.orig 2014-03-26 15:19:05.000000000 -0400 ++++ src/VBox/Main/src-client/DisplayImpl.cpp 2014-04-02 17:42:48.000000000 -0400 +@@ -4382,6 +4382,7 @@ + } + #endif + ++#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) + DECLCALLBACK(void) Display::displayCrHgcmCtlSubmitCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext) + { + VBOXCRCMDCTL *pCmd = (VBOXCRCMDCTL*)pParam->u.pointer.addr; +@@ -4424,7 +4425,6 @@ + return pThis->handleCrHgcmCtlSubmit(pCmd, cbCmd, pfnCompletion, pvCompletion); + } + +-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) + DECLCALLBACK(void) Display::displayCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext) + { + Display *pDisplay = (Display *)pvContext; +@@ -5050,7 +5050,9 @@ + pThis->IConnector.pfnCrHgsmiCommandProcess = Display::displayCrHgsmiCommandProcess; + pThis->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess; + #endif ++#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) + pThis->IConnector.pfnCrHgcmCtlSubmit = Display::displayCrHgcmCtlSubmit; ++#endif + #ifdef VBOX_WITH_HGSMI + pThis->IConnector.pfnVBVAEnable = Display::displayVBVAEnable; + pThis->IConnector.pfnVBVADisable = Display::displayVBVADisable; _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed (r350637), thanks!
----- Forwarded message from "Lawrence K. Chen, P.Eng." <lkchen@ksu.edu> ----- Date: Wed, 16 Apr 2014 16:33:05 -0500 From: "Lawrence K. Chen, P.Eng." <lkchen@ksu.edu> To: freebsd-emulation@freebsd.org Subject: Re: ports/188053: emulators/virtualbox-ose 4.3.10 doesn't build on 9.2 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 Presumably this patch was doesn't break virtualbox-ose building on 9.2 with X11, correct? Since, at first glance there are changes that aren't conditioned on whether X11 is set or not. -- Who: Lawrence K. Chen, P.Eng. - W0LKC - Sr. Unix Systems Administrator For: Enterprise Server Technologies (EST) -- & SafeZone Ally ----- End forwarded message -----
----- Forwarded message from Jung-uk Kim <jkim@FreeBSD.org> ----- Date: Wed, 16 Apr 2014 17:45:59 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: "Lawrence K. Chen, P.Eng." <lkchen@ksu.edu>, freebsd-emulation@freebsd.org Subject: Re: ports/188053: emulators/virtualbox-ose 4.3.10 doesn't build on 9.2 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2014-04-16 17:33:05 -0400, P.Eng. Lawrence K. Chen wrote: > Presumably this patch was doesn't break virtualbox-ose building on > 9.2 with X11, correct? > > Since, at first glance there are changes that aren't conditioned on > whether X11 is set or not. Correct. Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQEcBAEBAgAGBQJTTvoWAAoJEHyflib82/FGTKUH/0at7ey+7tmKYOt10TQsvrXe d/yClvjA/soEOOohU3WPMOvgTtuAuydC7HxaH3kSXuHOsEuG/wjj5LyGYrMCr6G5 4RCdtmmfOIVBkPl2Rx5DCPAaPpBK/7Z9MYxWUd5s1o/9KBEQdvusfn0dNaF76nGa z2tUK3Eu75qVD3yrdMgK0VC84BpROsPmMhmU7nQZuTq7o9vIFRn2HdDSpV8yWHat MvEEQxOBaZw2/GQ9BLzn1zNZM4xQLrx/bDlJviGVa92RAQgKyDUypATmtDDCL25h 1JiLaw5ot7ILOL0VbndCIXuhrBjBaQ9GD3OCo8hpgzfgSUcfeZFo1EiqQvLeXYY= =qQ5J -----END PGP SIGNATURE----- ----- End forwarded message -----