xorg-server: Changes to 'debian-unstable'
ChangeLog | 40 ++++++-
Xi/extinit.c | 3
Xi/xiproperty.c | 9 +
Xi/xiproperty.h | 3
debian/changelog | 9 +
debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 16 +-
debian/patches/10-config-libudev-backend.diff | 80 +++++++-------
debian/patches/15-nouveau.diff | 43 +++----
debian/patches/19-compresize-fix.diff | 71 +++++-------
debian/patches/22-render-swap-stops.diff | 33 +++++
debian/patches/series | 1
11 files changed, 197 insertions(+), 111 deletions(-)
New commits:
commit a41b8c3439d8acd36e012727e99de912a0976ed9
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 18 17:08:04 2010 +0100
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index b0a9bfd..86b943b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.7.7-10) UNRELEASED; urgency=low
* render: Fix byteswapping of gradient stops
* Cherry-pick from upstream:
- Xi: reset the known properties at each server generation
+ * Refresh patches.
-- Julien Cristau <jcristau@debian.org> Thu, 18 Nov 2010 16:46:32 +0100
diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
index 8281634..1197c9a 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -10,9 +10,9 @@ Subject: [PATCH] xfree86: fix build with xv disabled
Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2010-03-30 13:22:36.000000000 +0300
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.c 2010-03-30 13:22:39.000000000 +0300
-@@ -3011,6 +3011,7 @@
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c
+@@ -3013,6 +3013,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
@@ -20,7 +20,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3099,6 +3100,7 @@
+@@ -3101,6 +3102,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
return ret;
}
@@ -30,9 +30,9 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h 2010-03-30 13:22:36.000000000 +0300
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.h 2010-03-30 13:22:39.000000000 +0300
-@@ -934,6 +934,7 @@
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h
+@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
@@ -40,7 +40,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
/*
* For overlay video, compute the relevant CRTC and
* clip video to that.
-@@ -952,6 +953,7 @@
+@@ -952,6 +953,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
RegionPtr reg,
INT32 width,
INT32 height);
diff --git a/debian/patches/10-config-libudev-backend.diff b/debian/patches/10-config-libudev-backend.diff
index dd3137e..1de16e5 100644
--- a/debian/patches/10-config-libudev-backend.diff
+++ b/debian/patches/10-config-libudev-backend.diff
@@ -8,8 +8,8 @@ aa91508356f243edc3b11795b1481edcfe0d39c2
---
Index: xorg-server/config/Makefile.am
===================================================================
---- xorg-server.orig/config/Makefile.am 2010-03-30 13:22:30.000000000 +0300
-+++ xorg-server/config/Makefile.am 2010-03-30 13:55:51.000000000 +0300
+--- xorg-server.orig/config/Makefile.am
++++ xorg-server/config/Makefile.am
@@ -1,12 +1,20 @@
-AM_CFLAGS = @DIX_CFLAGS@
+AM_CFLAGS = $(DIX_CFLAGS)
@@ -34,7 +34,7 @@ Index: xorg-server/config/Makefile.am
if CONFIG_DBUS_API
dbusconfigdir = $(sysconfdir)/dbus-1/system.d
-@@ -16,7 +24,13 @@
+@@ -16,7 +24,13 @@ libconfig_la_SOURCES += dbus.c
endif
if CONFIG_HAL
@@ -50,8 +50,8 @@ Index: xorg-server/config/Makefile.am
EXTRA_DIST = xorg-server.conf x11-input.fdi
Index: xorg-server/config/config-backends.h
===================================================================
---- xorg-server.orig/config/config-backends.h 2010-03-30 13:22:30.000000000 +0300
-+++ xorg-server/config/config-backends.h 2010-03-30 13:55:51.000000000 +0300
+--- xorg-server.orig/config/config-backends.h
++++ xorg-server/config/config-backends.h
@@ -26,8 +26,18 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -72,7 +72,7 @@ Index: xorg-server/config/config-backends.h
#include <dbus/dbus.h>
typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection,
-@@ -46,14 +56,15 @@
+@@ -46,14 +56,15 @@ int config_dbus_core_init(void);
void config_dbus_core_fini(void);
int config_dbus_core_add_hook(struct config_dbus_core_hook *hook);
void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook);
@@ -94,8 +94,8 @@ Index: xorg-server/config/config-backends.h
#endif
Index: xorg-server/config/config.c
===================================================================
---- xorg-server.orig/config/config.c 2010-03-30 13:22:30.000000000 +0300
-+++ xorg-server/config/config.c 2010-03-30 13:55:51.000000000 +0300
+--- xorg-server.orig/config/config.c
++++ xorg-server/config/config.c
@@ -28,13 +28,17 @@
#endif
@@ -115,7 +115,7 @@ Index: xorg-server/config/config.c
if (config_dbus_core_init()) {
# ifdef CONFIG_DBUS_API
if (!config_dbus_init())
-@@ -54,7 +58,9 @@
+@@ -54,7 +58,9 @@ config_init(void)
void
config_fini(void)
{
@@ -126,7 +126,7 @@ Index: xorg-server/config/config.c
# ifdef CONFIG_HAL
config_hal_fini();
# endif
-@@ -64,3 +70,70 @@
+@@ -64,3 +70,70 @@ config_fini(void)
config_dbus_core_fini();
#endif
}
@@ -199,9 +199,9 @@ Index: xorg-server/config/config.c
+}
Index: xorg-server/config/hal.c
===================================================================
---- xorg-server.orig/config/hal.c 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/config/hal.c 2010-03-30 13:55:51.000000000 +0300
-@@ -58,25 +58,9 @@
+--- xorg-server.orig/config/hal.c
++++ xorg-server/config/hal.c
+@@ -58,25 +58,9 @@ struct xkb_options {
char* options;
};
@@ -227,7 +227,7 @@ Index: xorg-server/config/hal.c
char *value;
value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
-@@ -84,36 +68,11 @@
+@@ -84,36 +68,11 @@ device_removed(LibHalContext *ctx, const
return;
sprintf(value, "hal:%s", udi);
@@ -265,7 +265,7 @@ Index: xorg-server/config/hal.c
static char *
get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
{
-@@ -166,26 +125,6 @@
+@@ -166,26 +125,6 @@ get_prop_string_array(LibHalContext *hal
return ret;
}
@@ -294,8 +294,8 @@ Index: xorg-server/config/hal.c
{
Index: xorg-server/config/udev.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/config/udev.c 2010-03-30 13:56:07.000000000 +0300
+--- /dev/null
++++ xorg-server/config/udev.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright © 2009 Julien Cristau
@@ -566,9 +566,9 @@ Index: xorg-server/config/udev.c
+}
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/configure.ac 2010-03-30 13:55:51.000000000 +0300
-@@ -601,6 +601,7 @@
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -601,6 +601,7 @@ AC_ARG_ENABLE(multibuffer, AS_HELP_ST
AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
@@ -576,7 +576,7 @@ Index: xorg-server/configure.ac
AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-@@ -760,6 +761,26 @@
+@@ -760,6 +761,26 @@ LIBXTST="xtst >= 1.0.99.2"
LIBPCIACCESS="pciaccess >= 0.8.0"
LIBGLIB="glib-2.0 >= 2.16"
LIBSELINUX="libselinux >= 2.0.86"
@@ -603,7 +603,7 @@ Index: xorg-server/configure.ac
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
-@@ -793,13 +814,11 @@
+@@ -793,13 +814,11 @@ if test "x$CONFIG_HAL" = xyes; then
fi
AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])
@@ -619,9 +619,9 @@ Index: xorg-server/configure.ac
AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])
Index: xorg-server/hw/kdrive/src/kinput.c
===================================================================
---- xorg-server.orig/hw/kdrive/src/kinput.c 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/hw/kdrive/src/kinput.c 2010-03-30 13:55:51.000000000 +0300
-@@ -2281,6 +2281,14 @@
+--- xorg-server.orig/hw/kdrive/src/kinput.c
++++ xorg-server/hw/kdrive/src/kinput.c
+@@ -2281,6 +2281,14 @@ NewInputDeviceRequest(InputOption *optio
return BadValue;
}
#endif
@@ -638,9 +638,9 @@ Index: xorg-server/hw/kdrive/src/kinput.c
if (!ki && !pi) {
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2010-03-30 13:55:51.000000000 +0300
-@@ -1461,12 +1461,19 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c
++++ xorg-server/hw/xfree86/common/xf86Config.c
+@@ -1461,12 +1461,19 @@ checkCoreInputDevices(serverLayoutPtr se
}
if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) {
@@ -666,9 +666,9 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
}
Index: xorg-server/hw/xfree86/common/xf86Globals.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Globals.c 2010-03-30 13:55:47.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Globals.c 2010-03-30 13:55:51.000000000 +0300
-@@ -132,7 +132,7 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Globals.c
++++ xorg-server/hw/xfree86/common/xf86Globals.c
+@@ -132,7 +132,7 @@ xf86InfoRec xf86Info = {
.kbdCustomKeycodes = FALSE,
.disableRandR = FALSE,
.randRFrom = X_DEFAULT,
@@ -679,9 +679,9 @@ Index: xorg-server/hw/xfree86/common/xf86Globals.c
.autoEnableDevices = TRUE
Index: xorg-server/hw/xfree86/common/xf86Xinput.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Xinput.c 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Xinput.c 2010-03-30 13:55:51.000000000 +0300
-@@ -788,9 +788,9 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Xinput.c
++++ xorg-server/hw/xfree86/common/xf86Xinput.c
+@@ -788,9 +788,9 @@ NewInputDeviceRequest (InputOption *opti
}
}
@@ -695,8 +695,8 @@ Index: xorg-server/hw/xfree86/common/xf86Xinput.c
rval = BadMatch;
Index: xorg-server/include/dix-config.h.in
===================================================================
---- xorg-server.orig/include/dix-config.h.in 2010-03-30 13:55:48.000000000 +0300
-+++ xorg-server/include/dix-config.h.in 2010-03-30 13:55:51.000000000 +0300
+--- xorg-server.orig/include/dix-config.h.in
++++ xorg-server/include/dix-config.h.in
@@ -393,6 +393,9 @@
/* Support D-Bus */
#undef HAVE_DBUS
@@ -709,9 +709,9 @@ Index: xorg-server/include/dix-config.h.in
Index: xorg-server/dix/main.c
===================================================================
---- xorg-server.orig/dix/main.c 2010-03-30 13:22:30.000000000 +0300
-+++ xorg-server/dix/main.c 2010-03-30 13:55:51.000000000 +0300
-@@ -168,7 +168,6 @@
+--- xorg-server.orig/dix/main.c
++++ xorg-server/dix/main.c
+@@ -166,7 +166,6 @@ int main(int argc, char *argv[], char *e
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
@@ -719,7 +719,7 @@ Index: xorg-server/dix/main.c
if(serverGeneration == 1)
{
CreateWellKnownSockets();
-@@ -256,6 +255,7 @@
+@@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *e
InitCoreDevices();
InitInput(argc, argv);
InitAndStartDevices();
diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff
index 35a1ff9..1473ca8 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -10,11 +10,11 @@ Also, don't treat DRI setup failure as an error for nouveau.
hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++-
3 files changed, 28 insertions(+), 5 deletions(-)
-diff --git a/glx/glxdri.c b/glx/glxdri.c
-index 21e44d1..30b820c 100644
---- a/glx/glxdri.c
-+++ b/glx/glxdri.c
-@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+Index: xorg-server/glx/glxdri.c
+===================================================================
+--- xorg-server.orig/glx/glxdri.c
++++ xorg-server/glx/glxdri.c
+@@ -981,6 +981,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIconfig **driConfigs;
const __DRIextension **extensions;
int i;
@@ -22,7 +22,7 @@ index 21e44d1..30b820c 100644
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
-@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -1060,7 +1061,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -33,7 +33,7 @@ index 21e44d1..30b820c 100644
filename, dlerror());
goto handle_error;
}
-@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -1197,7 +1200,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
xfree(screen);
@@ -42,11 +42,11 @@ index 21e44d1..30b820c 100644
return NULL;
}
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 0f998de..a244809 100644
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+Index: xorg-server/glx/glxdri2.c
+===================================================================
+--- xorg-server.orig/glx/glxdri2.c
++++ xorg-server/glx/glxdri2.c
+@@ -609,6 +609,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIextension **extensions;
const __DRIconfig **driConfigs;
int i;
@@ -54,7 +54,7 @@ index 0f998de..a244809 100644
screen = xcalloc(1, sizeof *screen);
if (screen == NULL)
-@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -635,7 +636,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -65,7 +65,7 @@ index 0f998de..a244809 100644
filename, dlerror());
goto handle_error;
}
-@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -714,7 +717,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
xfree(screen);
@@ -74,11 +74,11 @@ index 0f998de..a244809 100644
return NULL;
}
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..d964c6c 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev,
+Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
+@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *
break;
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
@@ -102,8 +102,5 @@ index 7f4ada8..d964c6c 100644
+ }
+ break;
case 0x1106: driverList[0] = "openchrome"; break;
- case 0x1b36: driverList[0] = "qxl"; break;
case 0x1163: driverList[0] = "rendition"; break;
---
-1.6.5.2
-
+ case 0x5333:
diff --git a/debian/patches/19-compresize-fix.diff b/debian/patches/19-compresize-fix.diff
index a211093..aaff038 100644
--- a/debian/patches/19-compresize-fix.diff
+++ b/debian/patches/19-compresize-fix.diff
@@ -18,11 +18,11 @@ misapplied - fixup
include/window.h | 11 ++++
6 files changed, 77 insertions(+), 91 deletions(-)
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index 73adc72..8a6beb9 100644
---- a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -143,6 +143,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
+Index: xorg-server/composite/compalloc.c
+===================================================================
+--- xorg-server.orig/composite/compalloc.c
++++ xorg-server/composite/compalloc.c
+@@ -143,6 +143,7 @@ compRedirectWindow (ClientPtr pClient, W
cw->oldy = COMP_ORIGIN_INVALID;
cw->damageRegistered = FALSE;
cw->damaged = FALSE;
@@ -30,11 +30,11 @@ index 73adc72..8a6beb9 100644
dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, cw);
}
ccw->next = cw->clients;
-diff --git a/composite/compinit.c b/composite/compinit.c
-index e8b563d..2ee9332 100644
---- a/composite/compinit.c
-+++ b/composite/compinit.c
-@@ -69,6 +69,7 @@ compCloseScreen (int index, ScreenPtr pScreen)
+Index: xorg-server/composite/compinit.c
+===================================================================
+--- xorg-server.orig/composite/compinit.c
++++ xorg-server/composite/compinit.c
+@@ -69,6 +69,7 @@ compCloseScreen (int index, ScreenPtr pS
pScreen->InstallColormap = cs->InstallColormap;
pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
pScreen->ReparentWindow = cs->ReparentWindow;
@@ -50,10 +50,10 @@ index e8b563d..2ee9332 100644
+ RegisterCompositeConfigNotifyProc(compConfigNotify);
return TRUE;
}
-diff --git a/composite/compint.h b/composite/compint.h
-index 845a196..a959ad5 100644
---- a/composite/compint.h
-+++ b/composite/compint.h
+Index: xorg-server/composite/compint.h
+===================================================================
+--- xorg-server.orig/composite/compint.h
++++ xorg-server/composite/compint.h
@@ -126,14 +126,11 @@ typedef struct _CompScreen {
RealizeWindowProcPtr RealizeWindow;
UnrealizeWindowProcPtr UnrealizeWindow;
@@ -80,11 +80,11 @@ index 845a196..a959ad5 100644
+ int bw, WindowPtr pSib);
+
#endif /* _COMPINT_H_ */
-diff --git a/composite/compwindow.c b/composite/compwindow.c
-index 2f5a717..550df39 100644
---- a/composite/compwindow.c
-+++ b/composite/compwindow.c
-@@ -334,37 +334,9 @@ compImplicitRedirect (WindowPtr pWin, WindowPtr pParent)
+Index: xorg-server/composite/compwindow.c
+===================================================================
+--- xorg-server.orig/composite/compwindow.c
++++ xorg-server/composite/compwindow.c
+@@ -334,37 +334,9 @@ compImplicitRedirect (WindowPtr pWin, Wi
return FALSE;
}
@@ -123,7 +123,7 @@ index 2f5a717..550df39 100644
if (pWin->redirectDraw != RedirectDrawNone)
{
CompWindowPtr cw = GetCompWindow (pWin);
-@@ -374,7 +346,19 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
+@@ -374,7 +346,19 @@ compMoveWindow (WindowPtr pWin, int x, i
cw->pOldPixmap = NullPixmap;
}
}
@@ -143,7 +143,7 @@ index 2f5a717..550df39 100644
compCheckTree (pScreen);
}
-@@ -385,37 +369,12 @@ compResizeWindow (WindowPtr pWin, int x, int y,
+@@ -385,37 +369,12 @@ compResizeWindow (WindowPtr pWin, int x,
ScreenPtr pScreen = pWin->drawable.pScreen;
CompScreenPtr cs = GetCompScreen (pScreen);
@@ -183,7 +183,7 @@ index 2f5a717..550df39 100644
compCheckTree (pWin->drawable.pScreen);
}
-@@ -425,38 +384,12 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw)
+@@ -425,38 +384,12 @@ compChangeBorderWidth (WindowPtr pWin, u
ScreenPtr pScreen = pWin->drawable.pScreen;
CompScreenPtr cs = GetCompScreen (pScreen);
@@ -251,11 +251,11 @@ index 2f5a717..550df39 100644
+ return BadAlloc;
+ return Success;
+}
-diff --git a/dix/window.c b/dix/window.c
-index e191f09..e4c850f 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -2104,6 +2104,13 @@ ReflectStackChange(
+Index: xorg-server/dix/window.c
+===================================================================
+--- xorg-server.orig/dix/window.c
++++ xorg-server/dix/window.c
+@@ -2102,6 +2102,13 @@ ReflectStackChange(
WindowsRestructured ();
}
@@ -269,7 +269,7 @@ index e191f09..e4c850f 100644
/*****
* ConfigureWindow
*****/
-@@ -2220,7 +2227,6 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
+@@ -2218,7 +2225,6 @@ ConfigureWindow(WindowPtr pWin, Mask mas
else
pSib = pWin->nextSib;
@@ -277,7 +277,7 @@ index e191f09..e4c850f 100644
if ((!pWin->overrideRedirect) &&
(RedirectSend(pParent)
))
-@@ -2305,6 +2311,16 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
+@@ -2303,6 +2309,16 @@ ConfigureWindow(WindowPtr pWin, Mask mas
return(Success);
ActuallyDoSomething:
@@ -294,11 +294,11 @@ index e191f09..e4c850f 100644
if (SubStrSend(pWin, pParent))
{
memset(&event, 0, sizeof(xEvent));
-diff --git a/include/window.h b/include/window.h
-index 6fb2f8c..ea2edab 100644
---- a/include/window.h
-+++ b/include/window.h
-@@ -266,4 +266,15 @@ extern _X_EXPORT void DisableMapUnmapEvents(
+Index: xorg-server/include/window.h
+===================================================================
+--- xorg-server.orig/include/window.h
++++ xorg-server/include/window.h
+@@ -266,4 +266,15 @@ extern _X_EXPORT void DisableMapUnmapEve
extern _X_EXPORT void EnableMapUnmapEvents(
WindowPtr /* pWin */ );
@@ -314,6 +314,3 @@ index 6fb2f8c..ea2edab 100644
+_X_EXPORT void RegisterCompositeConfigNotifyProc(compositeConfigNotifyProcPtr proc);
+
#endif /* WINDOW_H */
---
-1.7.1
-
diff --git a/debian/patches/22-render-swap-stops.diff b/debian/patches/22-render-swap-stops.diff
index e9a2b7c..de52e8d 100644
--- a/debian/patches/22-render-swap-stops.diff
+++ b/debian/patches/22-render-swap-stops.diff
@@ -16,11 +16,11 @@ Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
render/render.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/render/render.c b/render/render.c
-index 00241f9..85a4392 100644
---- a/render/render.c
-+++ b/render/render.c
-@@ -2552,8 +2552,8 @@ static void swapStops(void *stuff, int num)
+Index: xorg-server/render/render.c
+===================================================================
+--- xorg-server.orig/render/render.c
++++ xorg-server/render/render.c
+@@ -2565,8 +2565,8 @@ static void swapStops(void *stuff, int n
}
colors = (CARD16 *)(stops);
for (i = 0; i < 4*num; ++i) {
@@ -31,11 +31,3 @@ index 00241f9..85a4392 100644
}
}
---
-1.7.1
-
-_______________________________________________
-xorg-devel@lists.x.org: X.Org development
-Archives: http://lists.x.org/archives/xorg-devel
-Info: http://lists.x.org/mailman/listinfo/xorg-devel
-
commit 32fac0f0960cd5dc07aa47770423a37a5dda3884
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 18 16:56:52 2010 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 70a5f48..34c08d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,41 @@
-commit e735a4ade45c12306958390c2191ed0dc8084ef7
+commit c9bca39848add875a76cf2434aabbadb97ddd721
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jun 9 17:10:57 2010 +1000
+
+ Xi: move property reset from extension shutdown to init.
+
+ If any part of the stack calls XIGetKnownProperty during device shutdown
+ the property is re-initialized before the server generation resets, leaving
+ the value invalid again.
+
+ Move the reset to the extension init which happens before input devices are
+ initialized before the first property is requested.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 5cd11d2356d153840f1b429bdb8284367f8dc468)
+
+commit 266dc682f623a2aca6654c42164a8d8b9362c53b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri May 7 16:22:12 2010 +1000
+
+ Xi: reset the known properties at the end of the server generation.
+
+ Properties allocated through XIGetKnownProperty() aren't reset on the second
+ server generation but keep the old value. As a result, wrong Atoms are
+ supplied to the driver, resulting in potential data corruption or weird
+ error message.
+
+ Reproducible by running "xlsatom | grep FLOAT" twice on a plain X server.
+ The second X server generation won't have the FLOAT atom defined anymore,
+ despite the users of this atom not noticing any errors.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9802839d35aaf788790f1d0e8300db4693a70096)
+
+commit 240e7c50cecdcc0ce6087e141f11f165d828a7e9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:42:54 2010 -0400
@@ -13,7 +50,6 @@ Date: Mon Oct 18 15:42:54 2010 -0400
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit d2064fbb687839c297a851a5d85f32dfbbe4a0d5)
- (cherry picked from commit e01d69c6e794d836d9f25870349f3164dbd831ae)
commit d7c2f764b399152eeaaf18b82abaf941574e6744
Author: Dirk Wallenstein <halsmit@t-online.de>
diff --git a/debian/changelog b/debian/changelog
index a8f6f5f..b0a9bfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.7.7-10) UNRELEASED; urgency=low
* render: Fix byteswapping of gradient stops
+ * Cherry-pick from upstream:
+ - Xi: reset the known properties at each server generation
-- Julien Cristau <jcristau@debian.org> Thu, 18 Nov 2010 16:46:32 +0100
commit 36d0dd62bb8d77d90e0ab743105401292dcc431d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 18 16:46:44 2010 +0100
render: Fix byteswapping of gradient stops
diff --git a/debian/changelog b/debian/changelog
index a6d04c5..a8f6f5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.7-10) UNRELEASED; urgency=low
+
+ * render: Fix byteswapping of gradient stops
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 18 Nov 2010 16:46:32 +0100
+
xorg-server (2:1.7.7-9) unstable; urgency=low
* The "Hello RHEL6" upload.
diff --git a/debian/patches/22-render-swap-stops.diff b/debian/patches/22-render-swap-stops.diff
new file mode 100644
index 0000000..e9a2b7c
--- /dev/null
+++ b/debian/patches/22-render-swap-stops.diff
@@ -0,0 +1,41 @@
+From: Andrea Canciani <ranma42@gmail.com>
+Date: Tue, 2 Nov 2010 20:10:32 +0100
+To: xorg-devel@lists.x.org
+Cc: Andrea Canciani <ranma42@gmail.com>
+Subject: [PATCH 2/2] render: Fix byteswapping of gradient stops
+Message-Id: <1288725032-684-2-git-send-email-ranma42@gmail.com>
+
+The function swapStops repeatedly swaps the color components as
+CARD16, but incorrectly steps over them as if they were CARD32.
+
+This causes half of the stops not to be swapped at all and some
+unrelated data be swapped instead.
+
+Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
+---
+ render/render.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/render/render.c b/render/render.c
+index 00241f9..85a4392 100644
+--- a/render/render.c
++++ b/render/render.c
+@@ -2552,8 +2552,8 @@ static void swapStops(void *stuff, int num)
+ }
+ colors = (CARD16 *)(stops);
+ for (i = 0; i < 4*num; ++i) {
+- swaps(stops, n);
+- ++stops;
++ swaps(colors, n);
++ ++colors;
+ }
+ }
+
+--
+1.7.1
+
+_______________________________________________
+xorg-devel@lists.x.org: X.Org development
+Archives: http://lists.x.org/archives/xorg-devel
+Info: http://lists.x.org/mailman/listinfo/xorg-devel
+
diff --git a/debian/patches/series b/debian/patches/series
index 4a57f61..7c3b4fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@
19-compresize-fix.diff
20-randr-shadow-crashes.diff
21-device-mode-list.diff
+22-render-swap-stops.diff
commit c9bca39848add875a76cf2434aabbadb97ddd721
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 9 17:10:57 2010 +1000
Xi: move property reset from extension shutdown to init.
If any part of the stack calls XIGetKnownProperty during device shutdown
the property is re-initialized before the server generation resets, leaving
the value invalid again.
Move the reset to the extension init which happens before input devices are
initialized before the first property is requested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 5cd11d2356d153840f1b429bdb8284367f8dc468)
diff --git a/Xi/extinit.c b/Xi/extinit.c
index d0fd2f6..daa79f6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1123,8 +1123,6 @@ RestoreExtensionEvents(void)
static void
IResetProc(ExtensionEntry * unused)
{
- XIResetProperties();
-
ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented;
EventSwapVector[DeviceKeyPress] = NotImplemented;
@@ -1303,6 +1301,8 @@ XInputExtensionInit(void)
inputInfo.all_devices = &xi_all_devices;
inputInfo.all_master_devices = &xi_all_master_devices;
+
+ XIResetProperties();
} else {
FatalError("IExtensionInit: AddExtensions failed\n");
}
commit 266dc682f623a2aca6654c42164a8d8b9362c53b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 7 16:22:12 2010 +1000
Xi: reset the known properties at the end of the server generation.
Properties allocated through XIGetKnownProperty() aren't reset on the second
server generation but keep the old value. As a result, wrong Atoms are
supplied to the driver, resulting in potential data corruption or weird
error message.
Reproducible by running "xlsatom | grep FLOAT" twice on a plain X server.
The second X server generation won't have the FLOAT atom defined anymore,
despite the users of this atom not noticing any errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 9802839d35aaf788790f1d0e8300db4693a70096)
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 0c12919..d0fd2f6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1123,6 +1123,7 @@ RestoreExtensionEvents(void)
static void
IResetProc(ExtensionEntry * unused)
{
+ XIResetProperties();
ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented;
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index ea66c54..2482171 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -392,6 +392,15 @@ XIGetKnownProperty(char *name)
return 0;
}
+void
+XIResetProperties(void)
+{
+ int i;
+
+ for (i = 0; i < (sizeof(dev_properties)/sizeof(struct dev_properties)); i++)
+ dev_properties[i].type = None;
+}
+
/**
* Convert the given property's value(s) into @nelem_return integer values and
* store them in @buf_return. If @nelem_return is larger than the number of
diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h
index 69b41fa..d8b8863 100644
--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@@ -62,4 +62,7 @@ void SRepXIListProperties(ClientPtr client, int size,
xXIListPropertiesReply *rep);
void SRepXIGetProperty(ClientPtr client, int size,
xXIGetPropertyReply *rep);
+
+void XIResetProperties(void);
+
#endif /* XIPROPERTY_H */
commit 240e7c50cecdcc0ce6087e141f11f165d828a7e9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:42:54 2010 -0400
ddc: Don't probe for DDC/CI or EEPROM
For whatever reason, some (broken) monitors will crash if you do this.
We're not actually using this information for anything, so let's just
not do it.
Originally reported as http://bugzilla.redhat.com/620333
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit d2064fbb687839c297a851a5d85f32dfbbe4a0d5)
diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index 6fad9fb..df46689 100644
--- a/hw/xfree86/ddc/ddc.c
+++ b/hw/xfree86/ddc/ddc.c
@@ -311,10 +311,6 @@ DDC2Init(int scrnIndex, I2CBusPtr pBus)
dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");
if (xf86I2CProbeAddress(pBus, 0x0060))
DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
- if (xf86I2CProbeAddress(pBus, 0x0062))
- DDC2MakeDevice(pBus, 0x0062, "EDID EEPROM interface");
- if (xf86I2CProbeAddress(pBus, 0x006E))
- DDC2MakeDevice(pBus, 0x006E, "DDC control interface");
return dev;
}
Reply to: