1 diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
2 index 592d65e..6cdf46b 100644
3 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
4 +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
5 @@ -130,7 +130,7 @@ vboxvideo_drv_SOURCES = \
7 DLLS += vboxvideo_drv_70
8 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
9 -vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700000000
10 +vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70000000
11 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
12 vboxvideo_drv_70_CFLAGS += -D_XPG6 -Wno-shadow # Use XPG6 until we have moved the C++ bits into a library.
14 @@ -147,7 +147,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
15 DLLS += vboxvideo_drv_71
16 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
17 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
18 -vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
19 +vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70100000
20 vboxvideo_drv_71_INCS = \
21 $(vboxvideo_xorg_INCS) \
22 $(VBOX_PATH_X11_ROOT)/xorg-server-1.1.0
23 @@ -161,7 +161,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
24 DLLS += vboxvideo_drv_13
25 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
26 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
27 -vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
28 +vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10300000
29 vboxvideo_drv_13_INCS = \
30 $(vboxvideo_xorg_INCS) \
31 $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0
32 @@ -175,7 +175,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) edid.c
33 DLLS += vboxvideo_drv_14
34 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
35 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
36 -vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
37 +vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10400000
38 vboxvideo_drv_14_INCS = \
39 $(vboxvideo_xorg_INCS) \
40 $(VBOX_PATH_X11_ROOT)/xorg-server-1.4.2
41 @@ -189,7 +189,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
42 DLLS += vboxvideo_drv_15
43 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
44 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
45 -vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
46 +vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000
47 if1of ($(KBUILD_TARGET), linux solaris)
48 vboxvideo_drv_15_DEFS += \
50 @@ -211,7 +211,7 @@ endif
51 DLLS += vboxvideo_drv_16
52 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
53 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
54 -vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
55 +vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
56 if1of ($(KBUILD_TARGET), linux solaris)
57 vboxvideo_drv_16_DEFS += \
59 @@ -229,7 +229,7 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
60 DLLS += vboxvideo_drv_17
61 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
62 vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
63 -vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
64 +vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000
65 vboxvideo_drv_17_INCS = \
66 $(vboxvideo_xorg_INCS) \
67 $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7
68 @@ -247,7 +247,7 @@ endif
69 DLLS += vboxvideo_drv_18
70 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
71 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
72 -vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
73 +vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000
74 vboxvideo_drv_18_INCS = \
75 $(vboxvideo_xorg_INCS) \
76 $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
77 @@ -261,7 +261,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_17_SOURCES)
78 DLLS += vboxvideo_drv_19
79 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
80 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
81 -vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
82 +vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000
83 vboxvideo_drv_19_INCS = \
84 $(vboxvideo_xorg_INCS) \
85 $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
86 @@ -275,7 +275,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_17_SOURCES)
87 DLLS += vboxvideo_drv_110
88 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
89 vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
90 -vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
91 +vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000
92 vboxvideo_drv_110_INCS = \
93 $(vboxvideo_xorg_INCS) \
94 $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
95 @@ -289,7 +289,7 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_17_SOURCES)
96 DLLS += vboxvideo_drv_111
97 vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
98 vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
99 -vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
100 +vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000
101 vboxvideo_drv_111_INCS = \
102 $(vboxvideo_xorg_INCS) \
103 $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
104 @@ -303,7 +303,7 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_17_SOURCES)
105 DLLS += vboxvideo_drv_112
106 vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
107 vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
108 -vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
109 +vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000
110 vboxvideo_drv_112_INCS = \
111 $(vboxvideo_xorg_INCS) \
112 $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
113 @@ -317,7 +317,7 @@ vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_17_SOURCES)
114 DLLS += vboxvideo_drv_113
115 vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
116 vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
117 -vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
118 +vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000
119 vboxvideo_drv_113_INCS = \
120 $(vboxvideo_xorg_INCS) \
121 $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
122 @@ -331,7 +331,7 @@ vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES)
123 DLLS += vboxvideo_drv_114
124 vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
125 vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
126 -vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
127 +vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000
128 vboxvideo_drv_114_INCS = \
129 $(vboxvideo_xorg_INCS) \
130 $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
131 @@ -345,7 +345,7 @@ vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_17_SOURCES)
132 DLLS += vboxvideo_drv_115
133 vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
134 vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
135 -vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
136 +vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000
137 vboxvideo_drv_115_INCS = \
138 $(vboxvideo_xorg_INCS) \
139 $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0
140 @@ -359,7 +359,7 @@ vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_17_SOURCES)
141 DLLS += vboxvideo_drv_116
142 vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
143 vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
144 -vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
145 +vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000
146 vboxvideo_drv_116_INCS = \
147 $(vboxvideo_xorg_INCS) \
148 $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0
149 @@ -373,7 +373,7 @@ vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_17_SOURCES)
150 DLLS += vboxvideo_drv_117
151 vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
152 vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
153 -vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
154 +vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000
155 vboxvideo_drv_117_INCS = \
156 $(vboxvideo_xorg_INCS) \
157 $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1
158 @@ -388,7 +388,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
159 vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
160 vboxvideo_drv_system_CFLAGS := \
161 $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
162 - vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
163 + vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
164 vboxvideo_drv_system_INCS += \
165 $(PATH_ROOT)/src/VBox/Runtime/include \
167 diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
168 index 381479c..29ff888 100644
169 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
170 +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
171 @@ -133,8 +133,8 @@ extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
173 /** Helper to work round different ways of getting the root window in different
174 * server versions. */
175 -#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \
176 - && XORG_VERSION_CURRENT >= 100900000
177 +#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
178 + && XORG_VERSION_CURRENT >= 10900000
179 # define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
181 # define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]