From 52d766947f2c368bdeff87347b3a252f5a5d52b4 Mon Sep 17 00:00:00 2001 From: jkim Date: Wed, 26 Nov 2014 19:55:52 +0000 Subject: Do not use DRI2 as we did not port vboxvideo.ko for DRM2/KMS yet. PR: 194324 --- ...h-src-VBox-Additions-x11-vboxvideo-Makefile.kmk | 118 +++++++++++---------- 1 file changed, 64 insertions(+), 54 deletions(-) (limited to 'emulators/virtualbox-ose') diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk index 4f5ea776a0a7..75a5329317a5 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk @@ -1,5 +1,5 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-11-24 19:16:07.000000000 -0500 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-11-24 19:22:38.000000000 -0500 +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-11-26 01:38:10.000000000 -0500 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-11-26 01:45:20.000000000 -0500 @@ -36,7 +36,7 @@ vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ @@ -78,70 +78,80 @@ vboxvideo_drv_19_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 -@@ -291,7 +307,11 @@ +@@ -287,6 +303,10 @@ + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_110_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_110_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 - vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_13_SOURCES) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) -+ vboxvideo_drv_110_SOURCES += \ -+ vboxvideo_dri2.c +@@ -301,6 +321,10 @@ + vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_111_DEFS += \ ++ VBOX_DRI_OLD +endif - - - # -@@ -305,7 +325,7 @@ + vboxvideo_drv_111_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 - vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -319,7 +339,7 @@ +@@ -315,6 +339,10 @@ + vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_112_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_112_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 - vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -333,7 +353,7 @@ +@@ -329,6 +357,10 @@ + vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_113_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_113_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 - vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -347,7 +367,7 @@ +@@ -343,6 +375,10 @@ + vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_114_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_114_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 - vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -361,7 +381,7 @@ +@@ -357,6 +393,10 @@ + vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_115_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_115_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 - vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -375,7 +395,7 @@ +@@ -371,6 +411,10 @@ + vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_116_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_116_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 - vboxvideo_drv_116_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - ifdef VBOX_USE_SYSTEM_XORG_HEADERS -- cgit