VirtualBox

Ticket #16052: VirtualBox-4.3.10-xserver_guest.patch

File VirtualBox-4.3.10-xserver_guest.patch, 2.7 KB (added by sergiomb, 8 years ago)
  • ./src/VBox/Additions/common/crOpenGL/Makefile.kmk

    Just compile with X11 system source and we may remove bundle X11 source code.
    
    old new VBoxOGL_TEMPLATE = VBOXCROGLR3GUES  
    6868VBoxOGL_INCS           = .
    6969if1of ($(KBUILD_TARGET), linux solaris freebsd)
    7070 VBoxOGL_INCS     += \
    71         $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
    72         $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
    73         $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
    74         $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
    75         $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
    76         $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
    77         $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
    78         $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
    79         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    80         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
     71        /usr/include/x11 \
     72        /usr/include/xorg \
     73        /usr/include/pixman-1 \
    8174        $(VBOX_MESA_INCS) \
    82         $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
     75        /usr/include/drm \
     76        /usr/include/libdrm
    8377 VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
    8478endif
    8579
     
    214208
    215209if1of ($(KBUILD_TARGET), linux solaris freebsd)
    216210 VBoxOGL_LIBS += \
    217         $(PATH_STAGE_LIB)/libXcomposite.so \
    218         $(PATH_STAGE_LIB)/libXdamage.so \
    219         $(PATH_STAGE_LIB)/libXfixes.so \
    220         $(PATH_STAGE_LIB)/libXext.so
     211        Xcomposite \
     212        Xdamage \
     213        Xfixes \
     214        Xext
    221215 ifdef VBoxOGL_FAKEDRI
    222216  ifeq ($(KBUILD_TARGET), freebsd)
    223217    VBoxOGL_LIBS += \
  • ./src/VBox/Additions/x11/vboxvideo/helpers.c

     
    8283
    8384    property_name = MakeAtom(pszName, strlen(pszName), TRUE);
    8485    VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
    85     ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
     86    dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
    8687}
    8788
    8889void vbvxReprobeCursor(ScrnInfoPtr pScrn)
  • ./src/VBox/Additions/x11/vboxvideo/vboxvideo.c

    reverted:
    reverted:
     
    12221222    updateGraphicsCapability(pScrn, TRUE);
    12231223
    12241224    /* Register block and wake-up handlers for getting new screen size hints. */
    1225     RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
     1225    RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
    12261226
    12271227    /* software cursor */
    12281228    miDCInitialize(pScreen, xf86GetPointerScreenFuncs());

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy