diff options
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk | 91 |
1 files changed, 75 insertions, 16 deletions
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 7f5ea7b042dc..3ca631699f11 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,6 +1,6 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-02-25 12:00:33.000000000 -0500 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-02-26 16:10:28.000000000 -0500 -@@ -33,7 +33,7 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-09-14 16:52:56.396443385 +0400 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-09-14 16:57:44.198422874 +0400 +@@ -36,7 +36,7 @@ vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS @@ -9,7 +9,7 @@ vboxvideo_15_DEFS += \ VBOX_DRI endif -@@ -198,7 +198,7 @@ +@@ -201,7 +201,7 @@ vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000 @@ -18,7 +18,7 @@ vboxvideo_drv_15_DEFS += \ VBOX_DRI_OLD endif -@@ -207,7 +207,7 @@ +@@ -210,7 +210,7 @@ $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) @@ -27,7 +27,7 @@ vboxvideo_drv_15_SOURCES += \ vboxvideo_dri.c endif -@@ -220,7 +220,7 @@ +@@ -223,7 +223,7 @@ vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000 @@ -36,7 +36,7 @@ vboxvideo_drv_16_DEFS += \ VBOX_DRI_OLD endif -@@ -238,11 +238,19 @@ +@@ -241,11 +241,19 @@ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000 @@ -56,7 +56,7 @@ if1of ($(KBUILD_TARGET), linux solaris) vboxvideo_drv_17_SOURCES += \ vboxvideo_dri2.c -@@ -256,6 +264,10 @@ +@@ -259,6 +267,10 @@ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000 @@ -67,7 +67,7 @@ vboxvideo_drv_18_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 -@@ -270,6 +282,10 @@ +@@ -273,6 +285,10 @@ vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000 @@ -78,7 +78,15 @@ vboxvideo_drv_19_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 -@@ -288,7 +304,11 @@ +@@ -287,11 +303,19 @@ + 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_19_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 @@ -91,7 +99,15 @@ # -@@ -302,7 +322,7 @@ +@@ -301,11 +325,15 @@ + 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 + 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 @@ -100,7 +116,15 @@ # -@@ -316,7 +336,7 @@ +@@ -315,11 +343,15 @@ + 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 @@ -109,7 +133,15 @@ # -@@ -330,7 +350,7 @@ +@@ -329,11 +361,15 @@ + 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 @@ -118,7 +150,15 @@ # -@@ -344,7 +364,7 @@ +@@ -343,11 +379,15 @@ + 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 @@ -127,7 +167,15 @@ # -@@ -358,7 +378,7 @@ +@@ -357,11 +397,15 @@ + 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 @@ -135,4 +183,15 @@ +vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_110_SOURCES) - ifdef VBOX_USE_SYSTEM_XORG_HEADERS + # +@@ -371,6 +415,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 |