VirtualBox

Ticket #16052: VirtualBox-5.0.18-xserver_guest.patch

File VirtualBox-5.0.18-xserver_guest.patch, 4.7 KB (added by sergiomb, 8 years ago)

new version

  • ./Config.kmk 

    Copyright (c) 2016 Sérgio Basto

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

The MIT License is to allow be in included in VirtualBox source code.

Using also VBOX_USE_SYSTEM_XORG_HEADERS to build guest additions parts,
just compile with X11 system source and we may remove all bundle X11 source code.

when we use VBOX_USE_SYSTEM_XORG_HEADERS, we don't need compile the very old
VBoxGuestR3LibXFree86 for use with old servers where the C library is not
available and becasue fail to build when we unbundle all X11 sources, files like
xf86_ansic.h doesn't exist anymore.
    old new ifdef VBOX_WITH_CROGL  
    23622362 endif
    23632363
    23642364 if1of ($(KBUILD_TARGET), freebsd linux solaris)
     2365 ifndef VBOX_USE_SYSTEM_XORG_HEADERS
    23652366 # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
    23662367  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
    23672368  VBOX_MESA_INCS = \
    … … ifdef VBOX_WITH_CROGL  
    23722373        $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
    23732374        $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
    23742375 endif
     2376 endif
    23752377
    23762378 VBOX_DARWIN_OPENGL_INST     = obj/VBoxOGL/GL/
    23772379 VBOX_DARWIN_OPENGL_HEADERS  = gl.h glu.h

  • ./src/VBox/Additions/common/crOpenGL/Makefile.kmk

    old new endif  
    6767VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
    6868VBoxOGL_INCS           = .
    6969if1of ($(KBUILD_TARGET), linux solaris freebsd)
     70 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
     71 VBoxOGL_INCS     += \
     72        /usr/include/x11 \
     73        /usr/include/xorg \
     74        /usr/include/pixman-1 \
     75        $(VBOX_MESA_INCS) \
     76        /usr/include/drm \
     77        /usr/include/libdrm
     78 else
    7079 VBoxOGL_INCS     += \
    7180        $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
    7281        $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
    … … if1of ($(KBUILD_TARGET), linux solaris f  
    8190        $(VBOX_MESA_INCS) \
    8291        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
    8392 VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
     93 endif
    8494endif
    8595
    8696ifdef VBoxOGL_DRI
    … … VBoxOGL_LIBS.win += \  
    213223        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    214224
    215225if1of ($(KBUILD_TARGET), linux solaris freebsd)
    216  VBoxOGL_LIBS += \
     226 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
     227   VBoxOGL_LIBS += \
     228     Xcomposite \
     229     Xdamage \
     230     Xfixes \
     231     Xext
     232 else
     233   VBoxOGL_LIBS += \
    217234        $(PATH_STAGE_LIB)/libXcomposite.so \
    218235        $(PATH_STAGE_LIB)/libXdamage.so \
    219236        $(PATH_STAGE_LIB)/libXfixes.so \
    220237        $(PATH_STAGE_LIB)/libXext.so
     238endif
    221239 ifdef VBoxOGL_FAKEDRI
    222240  ifeq ($(KBUILD_TARGET), freebsd)
    223241    VBoxOGL_LIBS += \

  • ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    old new LIBRARIES += \  
    4040        VBoxGuestR3LibShared
    4141ifndef VBOX_ONLY_VALIDATIONKIT
    4242 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
     43 ifndef VBOX_USE_SYSTEM_XORG_HEADERS
    4344  LIBRARIES += \
    4445        VBoxGuestR3LibXFree86
    4546 endif
     47 endif
    4648 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    4749  LIBRARIES += \
    4850        VBoxGuestR3LibXOrg

  • ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    old new vboxvideo_drv_118_SOURCES := $(vboxvideo  
    376376
    377377ifdef VBOX_USE_SYSTEM_XORG_HEADERS
    378378 # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
    379  DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
     379 DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
    380380 SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
    381381 vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
    382382 vboxvideo_drv_system_CFLAGS := \

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