cdn/patch/emulators_virtualbox-ose_headless.patch

   1 Index: emulators/virtualbox-ose/Makefile
   2 ===================================================================
   3 --- emulators/virtualbox-ose/Makefile   (revision 350042)
   4 +++ emulators/virtualbox-ose/Makefile   (working copy)
   5 @@ -191,21 +191,18 @@ post-patch:
   6         @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk
   7         @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
   8         @${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
   9 -       @${ECHO} 'VBOX_WITH_VBOXDRV = ' >> ${WRKSRC}/LocalConfig.kmk
  10 -       @${ECHO} 'VBOX_WITH_VIDEOHWACCEL = 1' >> ${WRKSRC}/LocalConfig.kmk
  11 -       @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
  12 -       @${ECHO} 'VBOX_WITH_NETADP = ' >> ${WRKSRC}/LocalConfig.kmk
  13 -       @${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk
  14 +       @${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
  15 +       @${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
  16         @${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk
  17         @${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
  18 -       @${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
  19 -       @${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
  20 +       @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
  21 +       @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
  22 +.if ${PORT_OPTIONS:MUDPTUNNEL}
  23 +       @${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk
  24 +.endif
  25  .if ${PORT_OPTIONS:MVNC}
  26         @${ECHO} 'VBOX_WITH_EXTPACK_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
  27  .endif
  28 -.if ${PORT_OPTIONS:MUDPTUNNEL}
  29 -       @${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk
  30 -.endif
  31  .if ${PORT_OPTIONS:MWEBSERVICE}
  32         @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
  33         @${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
  34 @@ -214,6 +211,11 @@ post-patch:
  35         @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk
  36         @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk
  37  .endif
  38 +.if empty(PORT_OPTIONS:MX11)
  39 +       @${ECHO} 'VBOX_WITH_VDMA =' >> ${WRKSRC}/LocalConfig.kmk
  40 +       @${ECHO} 'VBOX_WITH_WDDM =' >> ${WRKSRC}/LocalConfig.kmk
  41 +       @${ECHO} 'VBOX_WITH_WDDM_W8 =' >> ${WRKSRC}/LocalConfig.kmk
  42 +.endif
  43  .if ${COMPILER_TYPE} == clang
  44         @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
  45             -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
  46 Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp
  47 ===================================================================
  48 --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp   (revision 0)
  49 +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp   (working copy)
  50 @@ -0,0 +1,86 @@
  51 +--- src/VBox/Devices/Graphics/DevVGA.cpp.orig  2014-03-26 15:17:10.000000000 -0400
  52 ++++ src/VBox/Devices/Graphics/DevVGA.cpp       2014-04-02 16:41:47.000000000 -0400
  53 +@@ -5196,10 +5196,12 @@
  54 +     PVGASTATE pThis = (PVGASTATE)pvUser;
  55 +     NOREF(pDevIns);
  56 +
  57 ++#ifdef VBOX_WITH_WDDM
  58 +     if (pThis->fScanLineCfg & VBVASCANLINECFG_ENABLE_VSYNC_IRQ)
  59 +     {
  60 +         VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_VSYNC);
  61 +     }
  62 ++#endif
  63 +
  64 +     if (pThis->pDrv)
  65 +         pThis->pDrv->pfnRefresh(pThis->pDrv);
  66 +@@ -5211,7 +5213,9 @@
  67 +     vbvaTimerCb(pThis);
  68 + #endif
  69 +
  70 ++#ifdef VBOX_WITH_VDMA
  71 +     vboxCmdVBVACmdTimer(pThis);
  72 ++#endif
  73 + }
  74 +
  75 + #ifdef VBOX_WITH_VMSVGA
  76 +@@ -5365,26 +5369,30 @@
  77 + static DECLCALLBACK(int) vgaR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
  78 + {
  79 +     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
  80 ++
  81 + #ifdef VBOX_WITH_VDMA
  82 +     vboxVDMASaveStateExecPrep(pThis->pVdma, pSSM);
  83 + #endif
  84 ++
  85 +     vgaR3SaveConfig(pThis, pSSM);
  86 +     vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE));
  87 ++
  88 + #ifdef VBOX_WITH_HGSMI
  89 +     SSMR3PutBool(pSSM, true);
  90 +     int rc = vboxVBVASaveStateExec(pDevIns, pSSM);
  91 + # ifdef VBOX_WITH_VDMA
  92 +     vboxVDMASaveStateExecDone(pThis->pVdma, pSSM);
  93 + # endif
  94 +-    return rc;
  95 + #else
  96 +-    SSMR3PutBool(pSSM, false);
  97 ++    int rc = SSMR3PutBool(pSSM, false);
  98 + #endif
  99 ++
 100 + #ifdef VBOX_WITH_VMSVGA
 101 +     if (    rc == VINF_SUCCESS
 102 +         &&  pThis->fVMSVGAEnabled)
 103 +         rc = vmsvgaSaveExec(pDevIns, pSSM);
 104 + #endif
 105 ++
 106 +     return rc;
 107 + }
 108 +
 109 +@@ -5476,8 +5484,10 @@
 110 +     char           *pchEnd;
 111 +     LogFlow(("vgaReset\n"));
 112 +
 113 ++#ifdef VBOX_WITH_VDMA
 114 +     if (pThis->pVdma)
 115 +         vboxVDMAReset(pThis->pVdma);
 116 ++#endif
 117 +
 118 + #ifdef VBOX_WITH_HGSMI
 119 +     VBVAReset(pThis);
 120 +@@ -5924,12 +5934,14 @@
 121 + # if defined(VBOX_WITH_VIDEOHWACCEL)
 122 +     pThis->IVBVACallbacks.pfnVHWACommandCompleteAsynch = vbvaVHWACommandCompleteAsynch;
 123 + # endif
 124 +-#if defined(VBOX_WITH_CRHGSMI)
 125 ++# if defined(VBOX_WITH_CRHGSMI)
 126 +     pThis->IVBVACallbacks.pfnCrHgsmiCommandCompleteAsync = vboxVDMACrHgsmiCommandCompleteAsync;
 127 +     pThis->IVBVACallbacks.pfnCrHgsmiControlCompleteAsync = vboxVDMACrHgsmiControlCompleteAsync;
 128 + # endif
 129 +-#endif
 130 ++# if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
 131 +     pThis->IVBVACallbacks.pfnCrCtlSubmit = vboxCmdVBVACmdHostCtl;
 132 ++# endif
 133 ++#endif
 134 +
 135 +     /*
 136 +      * We use our own critical section to avoid unncessary pointer indirections
 137
 138 Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp
 139 ___________________________________________________________________
 140 Added: fbsd:nokeywords
 141 ## -0,0 +1 ##
 142 +yes
 143 \ No newline at end of property
 144 Added: svn:eol-style
 145 ## -0,0 +1 ##
 146 +native
 147 \ No newline at end of property
 148 Added: svn:mime-type
 149 ## -0,0 +1 ##
 150 +text/plain
 151 \ No newline at end of property
 152 Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp
 153 ===================================================================
 154 --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp      (revision 0)
 155 +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp      (working copy)
 156 @@ -0,0 +1,34 @@
 157 +--- src/VBox/Devices/Graphics/DevVGA_VBVA.cpp.orig     2014-03-26 15:17:10.000000000 -0400
 158 ++++ src/VBox/Devices/Graphics/DevVGA_VBVA.cpp  2014-04-03 14:58:41.000000000 -0400
 159 +@@ -1939,6 +1939,7 @@
 160 +
 161 +     switch (u16ChannelInfo)
 162 +     {
 163 ++#ifdef VBOX_WITH_VDMA
 164 +         case VBVA_CMDVBVA_SUBMIT:
 165 +         {
 166 +             rc = vboxCmdVBVACmdSubmit(pVGAState);
 167 +@@ -1965,7 +1966,6 @@
 168 +             rc = vboxCmdVBVACmdCtl(pVGAState, pCtl, cbBuffer - VBoxSHGSMIBufferHeaderSize());
 169 +             break;
 170 +         }
 171 +-#ifdef VBOX_WITH_VDMA
 172 +         case VBVA_VDMA_CMD:
 173 +         {
 174 +             if (cbBuffer < VBoxSHGSMIBufferHeaderSize() + sizeof (VBOXVDMACBUF_DR))
 175 +@@ -2277,7 +2277,6 @@
 176 +             pVGAState->fGuestCaps = pCaps->fCaps;
 177 +             pCaps->rc = VINF_SUCCESS;
 178 +         } break;
 179 +-#endif
 180 +         case VBVA_SCANLINE_CFG:
 181 +         {
 182 +             if (cbBuffer < sizeof (VBVASCANLINECFG))
 183 +@@ -2290,6 +2289,7 @@
 184 +             pVGAState->fScanLineCfg = pCfg->fFlags;
 185 +             pCfg->rc = VINF_SUCCESS;
 186 +         } break;
 187 ++#endif
 188 +         default:
 189 +             Log(("Unsupported VBVA guest command %d!!!\n",
 190 +                  u16ChannelInfo));
 191
 192 Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp
 193 ___________________________________________________________________
 194 Added: fbsd:nokeywords
 195 ## -0,0 +1 ##
 196 +yes
 197 \ No newline at end of property
 198 Added: svn:eol-style
 199 ## -0,0 +1 ##
 200 +native
 201 \ No newline at end of property
 202 Added: svn:mime-type
 203 ## -0,0 +1 ##
 204 +text/plain
 205 \ No newline at end of property
 206 Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp
 207 ===================================================================
 208 --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp  (revision 0)
 209 +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp  (working copy)
 210 @@ -0,0 +1,38 @@
 211 +--- src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp.orig 2014-03-26 15:17:10.000000000 -0400
 212 ++++ src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp      2014-04-02 16:26:50.000000000 -0400
 213 +@@ -1185,6 +1185,8 @@
 214 +     return rc;
 215 + }
 216 +
 217 ++#ifdef VBOX_WITH_WDDM
 218 ++
 219 + static int hgsmiHostSaveGuestCmdCompletedFifoEntryLocked (HGSMIGUESTCOMPLENTRY *pEntry, PSSMHANDLE pSSM)
 220 + {
 221 +     return SSMR3PutU32 (pSSM, pEntry->offBuffer);
 222 +@@ -1211,6 +1213,8 @@
 223 +     return rc;
 224 + }
 225 +
 226 ++#endif
 227 ++
 228 + static int hgsmiHostLoadFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIHOSTFIFOENTRY **ppEntry, PSSMHANDLE pSSM)
 229 + {
 230 +     HGSMIHOSTFIFOENTRY *pEntry;
 231 +@@ -1253,6 +1257,8 @@
 232 +     return rc;
 233 + }
 234 +
 235 ++#ifdef VBOX_WITH_WDDM
 236 ++
 237 + static int hgsmiHostLoadGuestCmdCompletedFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIGUESTCOMPLENTRY **ppEntry, PSSMHANDLE pSSM)
 238 + {
 239 +     HGSMIGUESTCOMPLENTRY *pEntry;
 240 +@@ -1306,6 +1312,8 @@
 241 +     return rc;
 242 + }
 243 +
 244 ++#endif
 245 ++
 246 + int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM)
 247 + {
 248 +     VBOXHGSMI_SAVE_START(pSSM);
 249
 250 Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp
 251 ___________________________________________________________________
 252 Added: svn:mime-type
 253 ## -0,0 +1 ##
 254 +text/plain
 255 \ No newline at end of property
 256 Added: fbsd:nokeywords
 257 ## -0,0 +1 ##
 258 +yes
 259 \ No newline at end of property
 260 Added: svn:eol-style
 261 ## -0,0 +1 ##
 262 +native
 263 \ No newline at end of property
 264 Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp
 265 ===================================================================
 266 --- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp       (revision 0)
 267 +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp       (working copy)
 268 @@ -0,0 +1,28 @@
 269 +--- src/VBox/Main/src-client/DisplayImpl.cpp.orig      2014-03-26 15:19:05.000000000 -0400
 270 ++++ src/VBox/Main/src-client/DisplayImpl.cpp   2014-04-02 17:42:48.000000000 -0400
 271 +@@ -4382,6 +4382,7 @@
 272 + }
 273 + #endif
 274 +
 275 ++#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 276 + DECLCALLBACK(void)  Display::displayCrHgcmCtlSubmitCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
 277 + {
 278 +     VBOXCRCMDCTL *pCmd = (VBOXCRCMDCTL*)pParam->u.pointer.addr;
 279 +@@ -4424,7 +4425,6 @@
 280 +     return pThis->handleCrHgcmCtlSubmit(pCmd, cbCmd, pfnCompletion, pvCompletion);
 281 + }
 282 +
 283 +-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 284 + DECLCALLBACK(void)  Display::displayCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
 285 + {
 286 +     Display *pDisplay = (Display *)pvContext;
 287 +@@ -5050,7 +5050,9 @@
 288 +     pThis->IConnector.pfnCrHgsmiCommandProcess = Display::displayCrHgsmiCommandProcess;
 289 +     pThis->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess;
 290 + #endif
 291 ++#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 292 +     pThis->IConnector.pfnCrHgcmCtlSubmit       = Display::displayCrHgcmCtlSubmit;
 293 ++#endif
 294 + #ifdef VBOX_WITH_HGSMI
 295 +     pThis->IConnector.pfnVBVAEnable            = Display::displayVBVAEnable;
 296 +     pThis->IConnector.pfnVBVADisable           = Display::displayVBVADisable;
 297
 298 Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp
 299 ___________________________________________________________________
 300 Added: svn:mime-type
 301 ## -0,0 +1 ##
 302 +text/plain
 303 \ No newline at end of property
 304 Added: fbsd:nokeywords
 305 ## -0,0 +1 ##
 306 +yes
 307 \ No newline at end of property
 308 Added: svn:eol-style
 309 ## -0,0 +1 ##
 310 +native
 311 \ No newline at end of property