xorg-server: Changes to 'debian-experimental'
debian/changelog | 14 ++
debian/patches/43_Set-the-Damage-version-supported-in-the-server-instead-of-using-damageproto.diff | 56 ++++++++++
debian/patches/44_fedora-xephyr-keysym-madness.diff | 24 ++++
debian/patches/series | 2
4 files changed, 94 insertions(+), 2 deletions(-)
New commits:
commit 91cbde7d6ea7504d65617f806cfa254f9d51d517
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 12:03:50 2007 +0100
Prepare changelog for upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 08ca230..1972f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.2.0-3) UNRELEASED; urgency=low
+xorg-server (2:1.2.0-3) experimental; urgency=low
[ Julien Cristau ]
* Pass --with-os-name and --with-os-vendor to configure.
@@ -7,7 +7,7 @@ xorg-server (2:1.2.0-3) UNRELEASED; urge
server, instead of from the damage headers. xserver 1.2.0 supports damage
1.0, not 1.1.
- -- Julien Cristau <jcristau@debian.org> Fri, 16 Feb 2007 11:58:07 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 12:03:03 +0100
xorg-server (2:1.2.0-2) experimental; urgency=low
commit bc57ffd1986e7d4629b4a0f3b5c54f44e4243939
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 01:29:58 2007 +0100
Fix xephyr on 64bit architectures.
Add patch by Adam Jackson stolen from Fedora to fix Xephyr segv on startup on
64bit architectures.
diff --git a/debian/changelog b/debian/changelog
index 04cc704..200e40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.1.1-18) unstable; urgency=medium
+
+ * Add patch from Fedora to make xephyr work on 64bit architectures
+ (closes: #405928).
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 16 Feb 2007 22:20:08 +0100
+
xorg-server (2:1.1.1-17) unstable; urgency=medium
* Make the int10 module usable on i386 with a 64bit kernel (closes: #409730).
diff --git a/debian/patches/43_fedora-xephyr-keysym-madness.diff b/debian/patches/43_fedora-xephyr-keysym-madness.diff
new file mode 100644
index 0000000..7e22253
--- /dev/null
+++ b/debian/patches/43_fedora-xephyr-keysym-madness.diff
@@ -0,0 +1,24 @@
+--- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx 2006-07-05 14:31:39.000000000 -0400
++++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c 2007-01-29 17:56:34.000000000 -0500
+@@ -77,9 +77,10 @@
+
+ static int HostXWantDamageDebug = 0;
+
+-extern KeySym EphyrKeymap[];
++/* these two need to be 32-bits. do not say KeySym, that way lies madness */
++extern unsigned int EphyrKeymap[];
++extern unsigned int kdKeymap[];
+
+-extern KeySym kdKeymap[];
+ extern int kdMinScanCode;
+ extern int kdMaxScanCode;
+ extern int kdMinKeyCode;
+@@ -668,7 +669,7 @@
+ void
+ hostx_load_keymap(void)
+ {
+- KeySym *keymap;
++ unsigned int *keymap;
+ int mapWidth, min_keycode, max_keycode;
+ int i,j;
+
diff --git a/debian/patches/series b/debian/patches/series
index d690348..2e0c8ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@
40_xorg-xserver-1.1.0-dbe-render.diff
41_xfree86_linux_acpi_fix_tokenizing.diff
42_build_int10_submodules.diff
+43_fedora-xephyr-keysym-madness.diff
commit 59ee8f0925a6285dd3f19683435ea4cd572fb021
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 16 12:07:57 2007 +0100
Set the damage version supported in the server instead of using damageproto.
xorg-server 1.2.0 supports damage 1.0, not 1.1, so it can't advertise support
for 1.1 even if built with a newer damageproto. Patch from upstream git.
diff --git a/debian/changelog b/debian/changelog
index 3b827f1..32e26c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ xorg-server (2:1.2.0-3) UNRELEASED; urge
[ Julien Cristau ]
* Pass --with-os-name and --with-os-vendor to configure.
* Bump serverabiver to 2:1.2.0-1.
+ * Add patch from upstream git to set the supported damage version from the
+ server, instead of from the damage headers. xserver 1.2.0 supports damage
+ 1.0, not 1.1.
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Feb 2007 21:12:32 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 16 Feb 2007 11:58:07 +0100
xorg-server (2:1.2.0-2) experimental; urgency=low
diff --git a/debian/patches/43_Set-the-Damage-version-supported-in-the-server-instead-of-using-damageproto.diff b/debian/patches/43_Set-the-Damage-version-supported-in-the-server-instead-of-using-damageproto.diff
new file mode 100644
index 0000000..34ada2e
--- /dev/null
+++ b/debian/patches/43_Set-the-Damage-version-supported-in-the-server-instead-of-using-damageproto.diff
@@ -0,0 +1,56 @@
+From c328513b36633b7100c7ca3dd7a6682c2b1f2051 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Thu, 1 Feb 2007 12:15:54 -0800
+Subject: [PATCH] Set the Damage version supported in the server, instead of using damageproto.
+
+This was caught by distributions upgrading damageproto to 1.1, before the
+server they had supported it. The server then advertised the new version
+without supporting the protocol.
+(cherry picked from 8274ea6aa97b06a56b7468c3908894c0ff72b687 commit)
+---
+ damageext/damageext.c | 17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/damageext/damageext.c b/damageext/damageext.c
+index d13c67b..a27ca22 100755
+--- a/damageext/damageext.c
++++ b/damageext/damageext.c
+@@ -35,6 +35,13 @@ int DamageClientPrivateIndex;
+ RESTYPE DamageExtType;
+ RESTYPE DamageExtWinType;
+
++/* Version of the damage extension supported by the server, as opposed to the
++ * DAMAGE_* defines from damageproto for what version the proto header
++ * supports.
++ */
++#define SERVER_DAMAGE_MAJOR 1
++#define SERVER_DAMAGE_MINOR 0
++
+ #define prScreen screenInfo.screens[0]
+
+ static void
+@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client)
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- if (stuff->majorVersion < DAMAGE_MAJOR) {
++ if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) {
+ rep.majorVersion = stuff->majorVersion;
+ rep.minorVersion = stuff->minorVersion;
+ } else {
+- rep.majorVersion = DAMAGE_MAJOR;
+- if (stuff->majorVersion == DAMAGE_MAJOR &&
+- stuff->minorVersion < DAMAGE_MINOR)
++ rep.majorVersion = SERVER_DAMAGE_MAJOR;
++ if (stuff->majorVersion == SERVER_DAMAGE_MAJOR &&
++ stuff->minorVersion < SERVER_DAMAGE_MINOR)
+ rep.minorVersion = stuff->minorVersion;
+ else
+- rep.minorVersion = DAMAGE_MINOR;
++ rep.minorVersion = SERVER_DAMAGE_MINOR;
+ }
+ pDamageClient->major_version = rep.majorVersion;
+ pDamageClient->minor_version = rep.minorVersion;
+--
+1.4.4.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 835a8d2..73782d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
35_randr_byteswap.patch
39_alpha_build_flags.patch -p0
42_build_int10_submodules.diff
+43_Set-the-Damage-version-supported-in-the-server-instead-of-using-damageproto.diff
Reply to: