virtualbox-system-x.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
  2. ===================================================================
  3. --- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
  4. +++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
  5. @@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
  6. VBoxOGL_INCS = .
  7. if1of ($(KBUILD_TARGET), linux solaris freebsd)
  8. VBoxOGL_INCS += \
  9. - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
  10. - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
  11. - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
  12. - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
  13. - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
  14. - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
  15. - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
  16. - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
  17. - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
  18. - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
  19. + /usr/include/x11 \
  20. + /usr/include/xorg \
  21. + /usr/include/pixman-1 \
  22. $(VBOX_MESA_INCS) \
  23. - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
  24. + /usr/include/drm \
  25. + /usr/include/libdrm
  26. VBoxOGL_DEFS += VBOX_NO_NATIVEGL
  27. endif
  28. @@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \
  29. if1of ($(KBUILD_TARGET), linux solaris freebsd)
  30. VBoxOGL_LIBS += \
  31. - $(PATH_STAGE_LIB)/libXcomposite.so \
  32. - $(PATH_STAGE_LIB)/libXdamage.so \
  33. - $(PATH_STAGE_LIB)/libXfixes.so \
  34. - $(PATH_STAGE_LIB)/libXext.so
  35. + Xcomposite \
  36. + Xdamage \
  37. + Xfixes \
  38. + Xext
  39. ifdef VBoxOGL_FAKEDRI
  40. ifeq ($(KBUILD_TARGET), freebsd)
  41. VBoxOGL_LIBS += \
  42. Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
  43. ===================================================================
  44. --- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
  45. +++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
  46. @@ -40,8 +40,6 @@ LIBRARIES += \
  47. VBoxGuestR3LibShared
  48. ifndef VBOX_ONLY_VALIDATIONKIT
  49. if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
  50. - LIBRARIES += \
  51. - VBoxGuestR3LibXFree86
  52. endif
  53. if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
  54. LIBRARIES += \