xorg-server: Changes to 'debian-experimental'
debian/changelog | 4 +-
debian/patches/15-nouveau.diff | 24 +++++++--------
debian/patches/17-fix-DRI2-segfault-when-clientGone.diff | 8 ++---
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 6300a8bd646c78f13cc653851f361f2ee407b9c6
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 17 11:15:57 2010 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index c2ec5b8..2b67be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.8.99.905-1) UNRELEASED; urgency=low
+xorg-server (2:1.8.99.905-1) experimental; urgency=low
* Drop recommends on xbase-clients.
* Add xauth to xserver-common recommends.
@@ -6,7 +6,7 @@ xorg-server (2:1.8.99.905-1) UNRELEASED; urgency=low
* Don't install serverminver, drivers shouldn't use this anymore.
* New upstream release candidate.
- -- Julien Cristau <jcristau@debian.org> Sat, 17 Jul 2010 10:25:47 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Jul 2010 11:13:32 +0100
xorg-server (2:1.8.99.904-1) experimental; urgency=low
commit ae18e3eb58842ac99ba4fbc01ba51b1d59ca68ea
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 17 11:12:59 2010 +0100
Refresh patches
diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff
index b5a18e7..39035fb 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -12,9 +12,9 @@ Also, don't treat DRI setup failure as an error for nouveau.
Index: xorg-server/glx/glxdri.c
===================================================================
---- xorg-server.orig/glx/glxdri.c 2010-07-05 16:12:34.000000000 +1000
-+++ xorg-server/glx/glxdri.c 2010-07-05 17:17:49.378394001 +1000
-@@ -968,6 +968,7 @@
+--- xorg-server.orig/glx/glxdri.c
++++ xorg-server/glx/glxdri.c
+@@ -981,6 +981,7 @@
const __DRIconfig **driConfigs;
const __DRIextension **extensions;
int i;
@@ -22,7 +22,7 @@ Index: xorg-server/glx/glxdri.c
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
-@@ -1047,7 +1048,9 @@
+@@ -1060,7 +1061,9 @@
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -33,7 +33,7 @@ Index: xorg-server/glx/glxdri.c
filename, dlerror());
goto handle_error;
}
-@@ -1185,7 +1188,7 @@
+@@ -1198,7 +1201,7 @@
free(screen);
@@ -44,9 +44,9 @@ Index: xorg-server/glx/glxdri.c
}
Index: xorg-server/glx/glxdri2.c
===================================================================
---- xorg-server.orig/glx/glxdri2.c 2010-07-05 16:12:34.000000000 +1000
-+++ xorg-server/glx/glxdri2.c 2010-07-05 17:17:49.378394001 +1000
-@@ -696,6 +696,7 @@
+--- xorg-server.orig/glx/glxdri2.c
++++ xorg-server/glx/glxdri2.c
+@@ -709,6 +709,7 @@
const __DRIextension **extensions;
const __DRIconfig **driConfigs;
int i;
@@ -54,7 +54,7 @@ Index: xorg-server/glx/glxdri2.c
screen = calloc(1, sizeof *screen);
if (screen == NULL)
-@@ -722,7 +723,9 @@
+@@ -735,7 +736,9 @@
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -65,7 +65,7 @@ Index: xorg-server/glx/glxdri2.c
filename, dlerror());
goto handle_error;
}
-@@ -816,7 +819,7 @@
+@@ -829,7 +832,7 @@
free(screen);
@@ -76,8 +76,8 @@ Index: xorg-server/glx/glxdri2.c
}
Index: xorg-server/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2010-07-05 17:20:04.268394001 +1000
-+++ xorg-server/hw/xfree86/common/xf86pciBus.c 2010-07-05 17:20:27.318394001 +1000
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c
++++ xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -1118,7 +1118,24 @@
break;
case 0x102b: driverList[0] = "mga"; break;
diff --git a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
index 08ee08b..2e75ca2 100644
--- a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
+++ b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
@@ -19,9 +19,9 @@ Cc: Kristian Høgsberg <krh@bitplanet.net>
Index: xorg-server/hw/xfree86/dri2/dri2ext.c
===================================================================
---- xorg-server.orig/hw/xfree86/dri2/dri2ext.c 2010-06-18 12:59:17.534477001 +1000
-+++ xorg-server/hw/xfree86/dri2/dri2ext.c 2010-06-18 13:06:30.914477000 +1000
-@@ -355,6 +355,9 @@
+--- xorg-server.orig/hw/xfree86/dri2/dri2ext.c
++++ xorg-server/hw/xfree86/dri2/dri2ext.c
+@@ -362,6 +362,9 @@
xDRI2BufferSwapComplete event;
DrawablePtr pDrawable = data;
@@ -29,5 +29,5 @@ Index: xorg-server/hw/xfree86/dri2/dri2ext.c
+ return;
+
event.type = DRI2EventBase + DRI2_BufferSwapComplete;
- event.sequenceNumber = client->sequence;
event.event_type = type;
+ event.drawable = pDrawable->id;
Reply to: