003-ogl-include-new.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. diff -Nuar a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
  2. --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2017-10-18 10:06:45.000000000 +0300
  3. +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2017-11-20 12:49:55.626419756 +0300
  4. @@ -69,17 +69,12 @@
  5. if1of ($(KBUILD_TARGET), linux solaris freebsd)
  6. ifndef VBOX_USE_SYSTEM_GL_HEADERS
  7. VBoxOGL_INCS += \
  8. - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
  9. - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
  10. - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
  11. - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
  12. - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
  13. - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
  14. - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
  15. - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
  16. - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
  17. - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
  18. - $(VBOX_GL_INCS)
  19. + /usr/include/x11 \
  20. + /usr/include/xorg \
  21. + /usr/include/pixman-1 \
  22. + $(VBOX_GL_INCS) \
  23. + /usr/include/drm \
  24. + /usr/include/libdrm
  25. endif
  26. VBoxOGL_DEFS += VBOX_NO_NATIVEGL
  27. endif
  28. @@ -219,10 +214,10 @@
  29. VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
  30. else
  31. VBoxOGL_LIBS += \
  32. - $(PATH_STAGE_LIB)/libXcomposite.so \
  33. - $(PATH_STAGE_LIB)/libXdamage.so \
  34. - $(PATH_STAGE_LIB)/libXfixes.so \
  35. - $(PATH_STAGE_LIB)/libXext.so
  36. + Xcomposite \
  37. + Xdamage \
  38. + Xfixes \
  39. + Xext
  40. endif
  41. ifdef VBoxOGL_FAKEDRI
  42. ifeq ($(KBUILD_TARGET), freebsd)