[arch-commits] Commit in xorg-server/trunk (11 files)
Jan de Groot
jgc at archlinux.org
Fri Sep 4 16:15:27 UTC 2009
Date: Friday, September 4, 2009 @ 12:15:27
Author: jgc
Revision: 51033
upgpkg: xorg-server 1.6.3.901-1
Update to 1.6.4RC1:
Add patches to compile with latest protocols
Add new patches from server16branch wiki page
Remove old applied patches
Added:
xorg-server/trunk/dga.patch
xorg-server/trunk/dpms-dont-reset-lastdeviceeventtime.patch
xorg-server/trunk/dri2-dontcrash.patch
xorg-server/trunk/xinerama.patch
Modified:
xorg-server/trunk/PKGBUILD
Deleted:
xorg-server/trunk/dix-dpmsfixes-idletime.patch
xorg-server/trunk/glx-bug21132.patch
xorg-server/trunk/glx-cleanup.patch
xorg-server/trunk/hal-init-failed.patch
xorg-server/trunk/xext-bug23100.patch
xorg-server/trunk/xext-fix-sync-transitions.patch
-------------------------------------------+
PKGBUILD | 44 +++++++----------
dga.patch | 55 ++++++++++++++++++++++
dix-dpmsfixes-idletime.patch | 25 ----------
dpms-dont-reset-lastdeviceeventtime.patch | 43 +++++++++++++++++
dri2-dontcrash.patch | 33 +++++++++++++
glx-bug21132.patch | 27 ----------
glx-cleanup.patch | 46 ------------------
hal-init-failed.patch | 65 --------------------------
xext-bug23100.patch | 64 -------------------------
xext-fix-sync-transitions.patch | 69 ----------------------------
xinerama.patch | 26 ++++++++++
11 files changed, 175 insertions(+), 322 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-04 16:13:11 UTC (rev 51032)
+++ PKGBUILD 2009-09-04 16:15:27 UTC (rev 51033)
@@ -3,14 +3,14 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.6.3
-pkgrel=4
+pkgver=1.6.3.901
+pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.11' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8k' 'libpciaccess>=0.10.6' 'libxv>=1.0.4' 'pixman>=0.14.0' 'xcursor-themes' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.3')
-makedepends=('libx11>=1.2.2' 'mesa>=7.5' 'xf86driproto>=2.0.4' 'xtrans>=1.2.4' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2' 'libgl>=7.5' 'glproto>=1.4.9' 'xorg-util-macros' 'xineramaproto')
+depends=('hal>=0.5.12' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8k' 'libpciaccess>=0.10.8' 'libxv>=1.0.4' 'pixman>=0.16.0' 'xcursor-themes' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5')
+makedepends=('libx11>=1.2.2' 'mesa>=7.5.1' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.0.2' 'videoproto>=2.3.0' 'compositeproto>=0.4' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.0.99.1' 'recordproto>=1.13.2' 'libgl>=7.5.1' 'glproto>=1.4.9' 'xorg-util-macros' 'xineramaproto>=1.1.99.1')
conflicts=('catalyst-utils<=9.2')
options=('!libtool')
provides=('x-server')
@@ -18,22 +18,18 @@
install=xorg-server.install
source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
xorg-redhat-die-ugly-pattern-die-die-die.patch
- hal-init-failed.patch
- xext-fix-sync-transitions.patch
- xext-bug23100.patch
- dix-dpmsfixes-idletime.patch
- glx-bug21132.patch
- glx-cleanup.patch
+ dpms-dont-reset-lastdeviceeventtime.patch
+ dri2-dontcrash.patch
+ xinerama.patch
+ dga.patch
xvfb-run
xvfb-run.1)
-md5sums=('0af168abeefa6579cab20387f75c0c7a'
+md5sums=('8d43c4cb43e6a10550e68fbbcad10e9d'
'1a336eb22e27cbf443ec5a2ecddfa93c'
- '0f30199da182c531eabd5bbf1c2707e3'
- '2171fbbdb0b4c51a60ad0944351cd910'
- 'e9092737cd87aee57013a5d4dcc0e2d4'
- '521980433509b389beb9004b2f5236e4'
- '3f2b2576332754a3dc2c24a10e55caa7'
- '92e17943a7300417d6576dd30eeef180'
+ '9ea2e9f5a7192da23c5c573545fe9836'
+ '03cd32862fbfe5f493e108ee7205ade6'
+ '060aaa85d64d26915783e9f6837a666c'
+ 'f426f93dfec972ba6f641a8e7d6a9256'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b')
@@ -42,17 +38,13 @@
# Get rid of the ugly pattern
patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
- # Fix crash/abort on hal initialization failure
- patch -Np1 -i "${srcdir}/hal-init-failed.patch" || return 1
+ # Build fixes for new protos
+ patch -Np1 -i "${srcdir}/xinerama.patch" || return 1
+ patch -Np1 -i "${srcdir}/dga.patch" || return 1
- # Fix issue with gnome-power-manager random screen blanking
- patch -Np1 -i "${srcdir}/xext-fix-sync-transitions.patch" || return 1
-
# Fixes from http://wiki.x.org/wiki/Server16Branch
- patch -Np1 -i "${srcdir}/xext-bug23100.patch" || return 1
- patch -Np1 -i "${srcdir}/dix-dpmsfixes-idletime.patch" || return 1
- patch -Np1 -i "${srcdir}/glx-bug21132.patch" || return 1
- patch -Np1 -i "${srcdir}/glx-cleanup.patch" || return 1
+ patch -Np1 -i "${srcdir}/dpms-dont-reset-lastdeviceeventtime.patch" || return 1
+ patch -Np1 -i "${srcdir}/dri2-dontcrash.patch" || return 1
# Fix dbus config path
sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1
Added: dga.patch
===================================================================
--- dga.patch (rev 0)
+++ dga.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -0,0 +1,55 @@
+From 6fffcd5825454a7fe58ffbcfb219f007cf38e731 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 27 Aug 2009 03:43:15 +0000
+Subject: xfree86: require xf86dgaproto 2.0.99.1.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/configure.ac b/configure.ac
+index 1ee81f9..378ac66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1512,10 +1512,10 @@ if test "x$XORG" = xyes; then
+ XORG_OS_PCI=$XORG_OS
+ fi
+ if test "x$DGA" = xauto; then
+- PKG_CHECK_MODULES(DGA, xf86dgaproto, [DGA=yes], [DGA=no])
++ PKG_CHECK_MODULES(DGA, [xf86dgaproto >= 2.0.99.1], [DGA=yes], [DGA=no])
+ fi
+ if test "x$DGA" = xyes; then
+- XORG_MODULES="$XORG_MODULES xf86dgaproto"
++ XORG_MODULES="$XORG_MODULES [xf86dgaproto >= 2.0.99.1]"
+ PKG_CHECK_MODULES(DGA, xf86dgaproto)
+ AC_DEFINE(DGA, 1, [Support DGA extension])
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
+diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
+index ad53408..2292175 100644
+--- a/hw/xfree86/dixmods/extmod/modinit.h
++++ b/hw/xfree86/dixmods/extmod/modinit.h
+@@ -37,8 +37,7 @@ extern void XFree86VidModeExtensionInit(INITARGS);
+ #ifdef XFreeXDGA
+ extern void XFree86DGAExtensionInit(INITARGS);
+ extern void XFree86DGARegister(INITARGS);
+-#define _XF86DGA_SERVER_
+-#include <X11/extensions/xf86dgastr.h>
++#include <X11/extensions/xf86dgaproto.h>
+ #endif
+
+ #ifdef DPMSExtension
+diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
+index 6286659..7579f7d 100644
+--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
++++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
+@@ -22,9 +22,7 @@
+ #include "cursorstr.h"
+ #include "scrnintstr.h"
+ #include "servermd.h"
+-#define _XF86DGA_SERVER_
+-#include <X11/extensions/xf86dga.h>
+-#include <X11/extensions/xf86dgastr.h>
++#include <X11/extensions/xf86dgaproto.h>
+ #include "swaprep.h"
+ #include "dgaproc.h"
+ #include "xf86dgaext.h"
+--
+cgit v0.8.2
Deleted: dix-dpmsfixes-idletime.patch
===================================================================
--- dix-dpmsfixes-idletime.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ dix-dpmsfixes-idletime.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,25 +0,0 @@
-From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Mon, 17 Aug 2009 08:15:32 +0000
-Subject: Do not reset lastDeviceEventTime when we do dixSaveScreens
-
-When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
-event time else session clients using IDLETIME will be reset.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/dix/window.c b/dix/window.c
-index 32e26d9..1a645f6 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
-
- if (on == SCREEN_SAVER_FORCER)
- {
-- UpdateCurrentTimeIf();
-- lastDeviceEventTime = currentTime;
- if (mode == ScreenSaverReset)
- what = SCREEN_SAVER_OFF;
- else
---
-cgit v0.8.2
Added: dpms-dont-reset-lastdeviceeventtime.patch
===================================================================
--- dpms-dont-reset-lastdeviceeventtime.patch (rev 0)
+++ dpms-dont-reset-lastdeviceeventtime.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -0,0 +1,43 @@
+From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Fri, 14 Aug 2009 10:44:35 +0000
+Subject: Don't reset the lastDeviceEventTime when doing DPMS actions
+
+When we change the DPMS mode, don't play games with the last event time as
+this breaks applications using IDLETIME to turn the backlight off after a
+preset time.
+
+This patch fixes gnome-power-manager and xfce-power-manager
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/Xext/dpms.c b/Xext/dpms.c
+index 21ba923..df63a8b 100644
+--- a/Xext/dpms.c
++++ b/Xext/dpms.c
+@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
+ if (!DPMSEnabled)
+ return BadMatch;
+
+- if (stuff->level == DPMSModeOn) {
+- lastDeviceEventTime.milliseconds =
+- GetTimeInMillis();
+- } else if (stuff->level == DPMSModeStandby) {
+- lastDeviceEventTime.milliseconds =
+- GetTimeInMillis() - DPMSStandbyTime;
+- } else if (stuff->level == DPMSModeSuspend) {
+- lastDeviceEventTime.milliseconds =
+- GetTimeInMillis() - DPMSSuspendTime;
+- } else if (stuff->level == DPMSModeOff) {
+- lastDeviceEventTime.milliseconds =
+- GetTimeInMillis() - DPMSOffTime;
+- } else {
++ if (stuff->level != DPMSModeOn &&
++ stuff->level != DPMSModeStandby &&
++ stuff->level != DPMSModeSuspend &&
++ stuff->level != DPMSModeOff) {
+ client->errorValue = stuff->level;
+ return BadValue;
+ }
+--
+cgit v0.8.2
Added: dri2-dontcrash.patch
===================================================================
--- dri2-dontcrash.patch (rev 0)
+++ dri2-dontcrash.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -0,0 +1,33 @@
+From df597709d71f47b8516e27c6fb1bfffd59de5e48 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <daenzer at vmware.com>
+Date: Tue, 23 Jun 2009 14:45:39 +0000
+Subject: dri2: Don't crash if pPriv is NULL.
+
+---
+diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
+index 385c5e8..aead33b 100644
+--- a/hw/xfree86/dri2/dri2.c
++++ b/hw/xfree86/dri2/dri2.c
+@@ -186,10 +186,18 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
+ int need_fake_front = 0;
+ int have_fake_front = 0;
+ int front_format = 0;
+- const int dimensions_match = (pDraw->width == pPriv->width)
+- && (pDraw->height == pPriv->height);
++ int dimensions_match;
+ int i;
+
++ if (!pPriv) {
++ *width = pDraw->width;
++ *height = pDraw->height;
++ *out_count = 0;
++ return NULL;
++ }
++
++ dimensions_match = (pDraw->width == pPriv->width)
++ && (pDraw->height == pPriv->height);
+
+ buffers = xalloc((count + 1) * sizeof(buffers[0]));
+
+--
+cgit v0.8.2
Deleted: glx-bug21132.patch
===================================================================
--- glx-bug21132.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ glx-bug21132.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,27 +0,0 @@
-From 2075d4bf9e53b8baef0b919da6c44771220cd4a5 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <daenzer at vmware.com>
-Date: Thu, 14 May 2009 09:46:41 +0000
-Subject: glx: If a destroyed window is bound to the current context, make it not current.
-
-Avoids subsequent crashes due to stale pointers to the DrawableRec, see
-https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments.
-
-Signed-off-by: Michel Dänzer <daenzer at vmware.com>
----
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 93391e9..6bc7bef 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -126,6 +126,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
- __GLXcontext *c;
-
- for (c = glxAllContexts; c; c = c->next) {
-+ if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
-+ (*c->loseCurrent)(c);
-+ __glXFlushContextCache();
-+ }
- if (c->drawPriv == glxPriv)
- c->drawPriv = NULL;
- if (c->readPriv == glxPriv)
---
-cgit v0.8.2
Deleted: glx-cleanup.patch
===================================================================
--- glx-cleanup.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ glx-cleanup.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,46 +0,0 @@
-From 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <daenzer at vmware.com>
-Date: Tue, 23 Jun 2009 14:45:40 +0000
-Subject: glx: Clean up more thoroughly if the drawable of a current context goes away.
-
-Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
----
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 520eb2e..a571ec9 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -128,8 +128,31 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
-
- for (c = glxAllContexts; c; c = c->next) {
- if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
-+ int i;
-+
- (*c->loseCurrent)(c);
-- __glXFlushContextCache();
-+ c->isCurrent = GL_FALSE;
-+ if (c == __glXLastContext)
-+ __glXFlushContextCache();
-+
-+ for (i = 1; i < currentMaxClients; i++) {
-+ if (clients[i]) {
-+ __GLXclientState *cl = glxGetClient(clients[i]);
-+
-+ if (cl->inUse) {
-+ int j;
-+
-+ for (j = 0; j < cl->numCurrentContexts; j++) {
-+ if (cl->currentContexts[j] == c)
-+ cl->currentContexts[j] = NULL;
-+ }
-+ }
-+ }
-+ }
-+
-+ if (!c->idExists) {
-+ __glXFreeContext(c);
-+ }
- }
- if (c->drawPriv == glxPriv)
- c->drawPriv = NULL;
---
-cgit v0.8.2
Deleted: hal-init-failed.patch
===================================================================
--- hal-init-failed.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ hal-init-failed.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,65 +0,0 @@
-From 49046088f10cceaea7da97401d742d3fb59371f5 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 13 Aug 2009 23:48:45 +0000
-Subject: config: don't shutdown the libhal ctx if it failed to initialize (#23213)
-
-Regression introduced by b1c3dc6ae226db178420e3b5f297b94afc87c94c.
-Shutting down the libhal_ctx if the init failed may cause an abort.
-This can happen if hald is not yet running at server startup.
-
-X.Org Bug 23213 <http://bugs.freedesktop.org/show_bug.cgi?id=23213>
-
-Tested-by: Stefan Dirsch
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/config/hal.c b/config/hal.c
-index 59bff66..28f55a0 100644
---- a/config/hal.c
-+++ b/config/hal.c
-@@ -489,13 +489,13 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
-
- if (!libhal_ctx_set_dbus_connection(info->hal_ctx, info->system_bus)) {
- LogMessage(X_ERROR, "config/hal: couldn't associate HAL context with bus\n");
-- goto out_ctx;
-+ goto out_err;
- }
- if (!libhal_ctx_init(info->hal_ctx, &error)) {
- LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
- error.name ? error.name : "unknown error",
- error.message ? error.message : "null");
-- goto out_ctx;
-+ goto out_err;
- }
- if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
- LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
-@@ -526,19 +526,20 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
- out_ctx:
- dbus_error_free(&error);
-
-- if (info->hal_ctx) {
-- if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
-- LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
-- error.name ? error.name : "unknown error",
-- error.message ? error.message : "null");
-- dbus_error_free(&error);
-- }
-- libhal_ctx_free(info->hal_ctx);
-+ if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
-+ LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
-+ error.name ? error.name : "unknown error",
-+ error.message ? error.message : "null");
-+ dbus_error_free(&error);
- }
-
- out_err:
- dbus_error_free(&error);
-
-+ if (info->hal_ctx) {
-+ libhal_ctx_free(info->hal_ctx);
-+ }
-+
- info->hal_ctx = NULL;
- info->system_bus = NULL;
-
---
-cgit v0.8.2
Deleted: xext-bug23100.patch
===================================================================
--- xext-bug23100.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ xext-bug23100.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,64 +0,0 @@
-diff -ruN xorg-server-1.6.3/Xext/xtest.c xorg-server-1.6.3.patched/Xext/xtest.c
---- xorg-server-1.6.3/Xext/xtest.c 2009-07-26 22:56:57.000000000 +0200
-+++ xorg-server-1.6.3.patched/Xext/xtest.c 2009-08-25 22:52:11.000000000 +0200
-@@ -54,6 +54,11 @@
- extern int DeviceValuator;
- extern int DeviceMotionNotify;
-
-+/* XTest events are sent during request processing and may be interruped by
-+ * a SIGIO. We need a separate event list to avoid events overwriting each
-+ * other's memory */
-+static EventListPtr xtest_evlist;
-+
- #ifdef PANORAMIX
- #include "panoramiX.h"
- #include "panoramiXsrv.h"
-@@ -81,6 +86,8 @@
- AddExtension(XTestExtensionName, 0, 0,
- ProcXTestDispatch, SProcXTestDispatch,
- NULL, StandardMinorOpcode);
-+
-+ xtest_evlist = InitEventList(GetMaximumEventsNum());
- }
-
- static int
-@@ -157,7 +164,6 @@
- int valuators[MAX_VALUATORS] = {0};
- int numValuators = 0;
- int firstValuator = 0;
-- EventListPtr events;
- int nevents = 0;
- int i;
- int base = 0;
-@@ -384,27 +390,26 @@
- if (screenIsSaved == SCREEN_SAVER_ON)
- dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
-
-- GetEventList(&events);
- switch(type) {
- case MotionNotify:
-- nevents = GetPointerEvents(events, dev, type, 0, flags,
-+ nevents = GetPointerEvents(xtest_evlist, dev, type, 0, flags,
- firstValuator, numValuators, valuators);
- break;
- case ButtonPress:
- case ButtonRelease:
-- nevents = GetPointerEvents(events, dev, type, ev->u.u.detail,
-+ nevents = GetPointerEvents(xtest_evlist, dev, type, ev->u.u.detail,
- flags, firstValuator,
- numValuators, valuators);
- break;
- case KeyPress:
- case KeyRelease:
-- nevents = GetKeyboardEvents(events, dev, type, ev->u.u.detail);
-+ nevents = GetKeyboardEvents(xtest_evlist, dev, type, ev->u.u.detail);
- break;
- }
-
- OsBlockSignals();
- for (i = 0; i < nevents; i++)
-- mieqEnqueue(dev, (events+i)->event);
-+ mieqEnqueue(dev, (xtest_evlist+i)->event);
- OsReleaseSignals();
-
- return client->noClientException;
Deleted: xext-fix-sync-transitions.patch
===================================================================
--- xext-fix-sync-transitions.patch 2009-09-04 16:13:11 UTC (rev 51032)
+++ xext-fix-sync-transitions.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -1,69 +0,0 @@
-From db568f9eabf3450d8a023597ff007df355b13ea8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 13 Aug 2009 06:37:00 +0000
-Subject: Xext: fix up wrong conditions for negative sync transitions.
-
-If the counter had a value higher than the trigger value for a negative
-transition, the trigger value did not get set.
-
-The correct sequence of checks is:
-if (positive transition)
- if (counter value < trigger value)
- set up trigger
-if (negative transition)
- if (counter value > trigger value)
- set up trigger
-
-Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/Xext/sync.c b/Xext/sync.c
-index 5f4ce56..667f8ab 100644
---- a/Xext/sync.c
-+++ b/Xext/sync.c
-@@ -962,28 +962,24 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
- pnewltval = &psci->bracket_less;
- }
- }
-- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
-+ else if (pTrigger->test_type == XSyncNegativeTransition &&
- ct != XSyncCounterNeverIncreases)
-- ||
-- (pTrigger->test_type == XSyncNegativeTransition &&
-+ {
-+ if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
-+ XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
-+ {
-+ psci->bracket_less = pTrigger->test_value;
-+ pnewltval = &psci->bracket_less;
-+ }
-+ }
-+ else if (pTrigger->test_type == XSyncPositiveTransition &&
- ct != XSyncCounterNeverDecreases)
-- )
- {
-- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
-+ if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
-+ XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
- {
-- if (XSyncValueLessThan(pTrigger->test_value,
-- psci->bracket_greater))
-- {
-- psci->bracket_greater = pTrigger->test_value;
-- pnewgtval = &psci->bracket_greater;
-- }
-- else
-- if (XSyncValueGreaterThan(pTrigger->test_value,
-- psci->bracket_less))
-- {
-- psci->bracket_less = pTrigger->test_value;
-- pnewltval = &psci->bracket_less;
-- }
-+ psci->bracket_greater = pTrigger->test_value;
-+ pnewgtval = &psci->bracket_greater;
- }
- }
- } /* end for each trigger */
---
-cgit v0.8.2
Added: xinerama.patch
===================================================================
--- xinerama.patch (rev 0)
+++ xinerama.patch 2009-09-04 16:15:27 UTC (rev 51033)
@@ -0,0 +1,26 @@
+From a38ca0063c91ef221f20bf0c4ac0dc84ce07d557 Mon Sep 17 00:00:00 2001
+From: Benjamin Close <Benjamin.Close at clearchain.com>
+Date: Fri, 13 Feb 2009 04:14:53 +0000
+Subject: xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
+
+Signed-off-by: Benjamin Close <Benjamin.Close at clearchain.com>
+Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
+Acked-by: Daniel Stone <daniel at fooishbar.org>
+---
+diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
+index 700c5a4..d413ff9 100644
+--- a/Xext/panoramiX.h
++++ b/Xext/panoramiX.h
+@@ -41,9 +41,8 @@ Equipment Corporation.
+ #define _PANORAMIX_H_
+
+ #define _PANORAMIX_SERVER
+-#include <X11/extensions/panoramiXext.h>
++#include <X11/extensions/panoramiXproto.h>
+ #undef _PANORAMIX_SERVER
+-
+ #include "gcstruct.h"
+
+
+--
+cgit v0.8.2
More information about the arch-commits
mailing list