update for xorg-server 1.6.3.diff -r1.11 -r1.12 xsrc/external/mit/xorg-server/include/dix-config.h
(mrg)
--- xsrc/external/mit/xorg-server/include/dix-config.h 2009/07/09 07:30:54 1.11
+++ xsrc/external/mit/xorg-server/include/dix-config.h 2009/08/22 01:40:37 1.12
@@ -323,27 +323,27 @@ | @@ -323,27 +323,27 @@ | |||
323 | /* Build XKB */ | 323 | /* Build XKB */ | |
324 | #define XKB 1 | 324 | #define XKB 1 | |
325 | 325 | |||
326 | /* Enable XKB per default */ | 326 | /* Enable XKB per default */ | |
327 | #define XKB_DFLT_DISABLED 0 | 327 | #define XKB_DFLT_DISABLED 0 | |
328 | 328 | |||
329 | /* Build XKB server */ | 329 | /* Build XKB server */ | |
330 | #define XKB_IN_SERVER 1 | 330 | #define XKB_IN_SERVER 1 | |
331 | 331 | |||
332 | /* Vendor release */ | 332 | /* Vendor release */ | |
333 | /* #undef XORG_RELEASE */ | 333 | /* #undef XORG_RELEASE */ | |
334 | 334 | |||
335 | /* Current Xorg version */ | 335 | /* Current Xorg version */ | |
336 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((2) * 1000) + 0) | 336 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((3) * 1000) + 0) | |
337 | 337 | |||
338 | /* Xorg release date */ | 338 | /* Xorg release date */ | |
339 | #define XORG_DATE "2009-7-7" | 339 | #define XORG_DATE "2009-7-7" | |
340 | 340 | |||
341 | /* Build Xv Extension */ | 341 | /* Build Xv Extension */ | |
342 | #define XvExtension 1 | 342 | #define XvExtension 1 | |
343 | 343 | |||
344 | /* Build XvMC Extension */ | 344 | /* Build XvMC Extension */ | |
345 | #define XvMCExtension 1 | 345 | #define XvMCExtension 1 | |
346 | 346 | |||
347 | /* Support XSync extension */ | 347 | /* Support XSync extension */ | |
348 | #define XSYNC 1 | 348 | #define XSYNC 1 | |
349 | 349 |
--- xsrc/external/mit/xorg-server/include/xorg-config.h 2009/07/09 07:30:54 1.7
+++ xsrc/external/mit/xorg-server/include/xorg-config.h 2009/08/22 01:40:37 1.8
@@ -7,27 +7,27 @@ | @@ -7,27 +7,27 @@ | |||
7 | * | 7 | * | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _XORG_CONFIG_H_ | 10 | #ifndef _XORG_CONFIG_H_ | |
11 | #define _XORG_CONFIG_H_ | 11 | #define _XORG_CONFIG_H_ | |
12 | 12 | |||
13 | #include <dix-config.h> | 13 | #include <dix-config.h> | |
14 | #include <xkb-config.h> | 14 | #include <xkb-config.h> | |
15 | 15 | |||
16 | /* Building Xorg server. */ | 16 | /* Building Xorg server. */ | |
17 | #define XORGSERVER 1 | 17 | #define XORGSERVER 1 | |
18 | 18 | |||
19 | /* Current X.Org version. */ | 19 | /* Current X.Org version. */ | |
20 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((2) * 1000) + 0) | 20 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((3) * 1000) + 0) | |
21 | 21 | |||
22 | /* Name of X server. */ | 22 | /* Name of X server. */ | |
23 | #define __XSERVERNAME__ "Xorg" | 23 | #define __XSERVERNAME__ "Xorg" | |
24 | 24 | |||
25 | /* URL to go to for support. */ | 25 | /* URL to go to for support. */ | |
26 | #define __VENDORDWEBSUPPORT__ "http://wiki.x.org" | 26 | #define __VENDORDWEBSUPPORT__ "http://wiki.x.org" | |
27 | 27 | |||
28 | /* Built-in output drivers. */ | 28 | /* Built-in output drivers. */ | |
29 | /* #undef DRIVERS */ | 29 | /* #undef DRIVERS */ | |
30 | 30 | |||
31 | /* Built-in input drivers. */ | 31 | /* Built-in input drivers. */ | |
32 | /* #undef IDRIVERS */ | 32 | /* #undef IDRIVERS */ | |
33 | 33 |
--- xsrc/external/mit/xorg-server/include/xorg-server.h 2009/07/09 07:30:54 1.4
+++ xsrc/external/mit/xorg-server/include/xorg-server.h 2009/08/22 01:40:37 1.5
@@ -116,27 +116,27 @@ | @@ -116,27 +116,27 @@ | |||
116 | /* Build DRI extension */ | 116 | /* Build DRI extension */ | |
117 | #define XF86DRI 1 | 117 | #define XF86DRI 1 | |
118 | 118 | |||
119 | /* Build DRI2 extension */ | 119 | /* Build DRI2 extension */ | |
120 | #define DRI2 1 | 120 | #define DRI2 1 | |
121 | 121 | |||
122 | /* Build Xorg server */ | 122 | /* Build Xorg server */ | |
123 | #define XORGSERVER 1 | 123 | #define XORGSERVER 1 | |
124 | 124 | |||
125 | /* Vendor release */ | 125 | /* Vendor release */ | |
126 | /* #undef XORG_RELEASE */ | 126 | /* #undef XORG_RELEASE */ | |
127 | 127 | |||
128 | /* Current Xorg version */ | 128 | /* Current Xorg version */ | |
129 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((2) * 1000) + 0) | 129 | #define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((3) * 1000) + 0) | |
130 | 130 | |||
131 | /* Build Xv Extension */ | 131 | /* Build Xv Extension */ | |
132 | #define XvExtension 1 | 132 | #define XvExtension 1 | |
133 | 133 | |||
134 | /* Build XvMC Extension */ | 134 | /* Build XvMC Extension */ | |
135 | #define XvMCExtension 1 | 135 | #define XvMCExtension 1 | |
136 | 136 | |||
137 | /* Support XSync extension */ | 137 | /* Support XSync extension */ | |
138 | #define XSYNC 1 | 138 | #define XSYNC 1 | |
139 | 139 | |||
140 | /* Support XTest extension */ | 140 | /* Support XTest extension */ | |
141 | #define XTEST 1 | 141 | #define XTEST 1 | |
142 | 142 |