xorg-server: Changes to 'debian-unstable'
debian/changelog | 2
debian/patches/render-return-the-supported-version.patch | 34 +++++++++++++++
debian/patches/series | 1
3 files changed, 37 insertions(+)
New commits:
commit 0c5ab464dd5bee5644ac05164d1154006e338d04
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 12:09:50 2009 +0200
Fix RenderQueryVersion with newer renderproto
Add patch to return the actually supported version in RenderQueryVersion
rather than whatever renderproto version the server built against.
diff --git a/debian/changelog b/debian/changelog
index 94be5a3..0d208ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
them (closes: #542707). Thanks, Josselin Mouette!
* Add avr32 to the libselinux-dev/libaudit-dev build-deps (closes: #543540).
Thanks, Bradley Smith!
+ * Add patch to return the actually supported version in RenderQueryVersion
+ rather than whatever renderproto version the server built against.
[ David Nusinow ]
* Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
diff --git a/debian/patches/render-return-the-supported-version.patch b/debian/patches/render-return-the-supported-version.patch
new file mode 100644
index 0000000..cdd8485
--- /dev/null
+++ b/debian/patches/render-return-the-supported-version.patch
@@ -0,0 +1,34 @@
+From a4c328fe2f65d1bacd5593233277b0ea4eb9af69 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 13 Sep 2009 11:52:37 +0200
+Subject: [PATCH] render: return the supported version rather than just passing the proto's version
+
+---
+ render/render.c | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+Index: xorg-server/render/render.c
+===================================================================
+--- xorg-server.orig/render/render.c
++++ xorg-server/render/render.c
+@@ -54,6 +54,9 @@
+ #define UINT32_MAX 0xffffffffU
+ #endif
+
++#define SERVER_RENDER_MAJOR 0
++#define SERVER_RENDER_MINOR 10
++
+ static int ProcRenderQueryVersion (ClientPtr pClient);
+ static int ProcRenderQueryPictFormats (ClientPtr pClient);
+ static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
+@@ -271,8 +274,8 @@
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- rep.majorVersion = RENDER_MAJOR;
+- rep.minorVersion = RENDER_MINOR;
++ rep.majorVersion = SERVER_RENDER_MAJOR;
++ rep.minorVersion = SERVER_RENDER_MINOR;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
diff --git a/debian/patches/series b/debian/patches/series
index 7cb847a..a6c870c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ Add-libgcrypt-as-an-option-for-sha1.diff
fedora-bad-fbdev-thats-mine.patch
fedora-pci-primary.diff
fedora-vboxvideo.diff
+render-return-the-supported-version.patch
Reply to: