cd52dc545f
- xserver-1.3.0-composite-version.patch: Force the server to report the Composite extension version it supports, not simply the version defined by the protocol headers it was built against.
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff -up xorg-server-1.3.0.0/composite/compext.c.jx xorg-server-1.3.0.0/composite/compext.c
|
|
--- xorg-server-1.3.0.0/composite/compext.c.jx 2007-07-12 09:30:39.000000000 -0400
|
|
+++ xorg-server-1.3.0.0/composite/compext.c 2007-07-12 09:33:45.000000000 -0400
|
|
@@ -49,6 +49,9 @@
|
|
|
|
#include "compint.h"
|
|
|
|
+#define SERVER_COMPOSITE_MAJOR 0
|
|
+#define SERVER_COMPOSITE_MINOR 3
|
|
+
|
|
static CARD8 CompositeReqCode;
|
|
int CompositeClientPrivateIndex;
|
|
RESTYPE CompositeClientWindowType;
|
|
@@ -133,16 +136,16 @@ ProcCompositeQueryVersion (ClientPtr cli
|
|
rep.type = X_Reply;
|
|
rep.length = 0;
|
|
rep.sequenceNumber = client->sequence;
|
|
- if (stuff->majorVersion < COMPOSITE_MAJOR) {
|
|
+ if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) {
|
|
rep.majorVersion = stuff->majorVersion;
|
|
rep.minorVersion = stuff->minorVersion;
|
|
} else {
|
|
- rep.majorVersion = COMPOSITE_MAJOR;
|
|
- if (stuff->majorVersion == COMPOSITE_MAJOR &&
|
|
- stuff->minorVersion < COMPOSITE_MINOR)
|
|
+ rep.majorVersion = SERVER_COMPOSITE_MAJOR;
|
|
+ if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR &&
|
|
+ stuff->minorVersion < SERVER_COMPOSITE_MINOR)
|
|
rep.minorVersion = stuff->minorVersion;
|
|
else
|
|
- rep.minorVersion = COMPOSITE_MINOR;
|
|
+ rep.minorVersion = SERVER_COMPOSITE_MINOR;
|
|
}
|
|
pCompositeClient->major_version = rep.majorVersion;
|
|
pCompositeClient->minor_version = rep.minorVersion;
|