up to 5.2.2

[packages/VirtualBox.git] / 18-system-xorg.patch

diff --git a/18-system-xorg.patch b/18-system-xorg.patch
deleted file mode 100644 (file)
index a5279a6..0000000
--- a/18-system-xorg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org>
-
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
-       VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--      VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#     VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUES
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--      $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--      $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--      $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--      $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--      $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--      $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--      $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--      $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--      $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--      $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+      /usr/include/x11 \
-+      /usr/include/xorg \
-+      /usr/include/pixman-1 \
-       $(VBOX_MESA_INCS) \
--      $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+      /usr/include/drm \
-+      /usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-@@ -204,10 +198,10 @@ VBoxOGL_LIBS = \
-       $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_LIBS += \
--      $(PATH_STAGE_LIB)/libXcomposite.so \
--      $(PATH_STAGE_LIB)/libXdamage.so \
--      $(PATH_STAGE_LIB)/libXfixes.so \
--      $(PATH_STAGE_LIB)/libXext.so
-+      Xcomposite \
-+      Xdamage \
-+      Xfixes \
-+      Xext
-  ifdef VBoxOGL_FAKEDRI
-   VBoxOGL_LIBS += \
-       dl