xorg-server: Changes to 'debian-unstable'
debian/changelog | 13 ++++++
debian/patches/22-stop-searching-for-xf86config-files | 37 ++++++++++++++++++
debian/patches/series | 1
mi/mieq.c | 8 +++
4 files changed, 58 insertions(+), 1 deletion(-)
New commits:
commit 1123cea654ccc7053f6f4c6b947362ae35dc6c14
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 18 20:23:57 2011 +0100
Stop searching for XF86Config files (Closes: #610453).
Many thanks to Bernhard R. Link for the notice.
diff --git a/debian/changelog b/debian/changelog
index 2593e44..98aba91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ xorg-server (2:1.7.7-12) UNRELEASED; urgency=low
* Cherry-pick this to fix crashes with MCE remotes (Closes: #609750):
- mi: handle DGA subtypes when determining the master device.
+ * Add 22-stop-searching-for-xf86config-files, cherry-picking the
+ upstream commit below (which we can't do directly since it depends on
+ a patch kept in the quilt series: 08-config-xorg-conf-d.diff), so that
+ XF86Config-4 is no longer considered (Closes: #610453). Thanks,
+ Bernhard R. Link!
+ - Stop searching for XF86Config files
-- Cyril Brulebois <kibi@debian.org> Tue, 18 Jan 2011 19:42:09 +0100
diff --git a/debian/patches/22-stop-searching-for-xf86config-files b/debian/patches/22-stop-searching-for-xf86config-files
new file mode 100644
index 0000000..d54b9dd
--- /dev/null
+++ b/debian/patches/22-stop-searching-for-xf86config-files
@@ -0,0 +1,37 @@
+Stop searching for XF86Config files
+
+xorg.conf has been used since the X11R6.7 release in April 2004.
+6 years has been a generous transition period for users to
+"mv XF86Config xorg.conf" and for distros to update their
+configuration tools and packages.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: James Cloos <cloos@jhcloos.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+(cherry picked from commit d163266692235261e1e0cfa6b900f54e6ec63de5)
+
+Signed-off-by: Cyril Brulebois <kibi@debian.org>
+
+--- a/hw/xfree86/parser/scan.c
++++ b/hw/xfree86/parser/scan.c
+@@ -626,7 +626,6 @@ xf86pathIsSafe(const char *path)
+ #ifndef XCONFENV
+ #define XCONFENV "XORGCONFIG"
+ #endif
+-#define XFREE86CFGFILE "XF86Config"
+ #ifndef XF86_VERSION_MAJOR
+ #ifdef XVERSION
+ #if XVERSION > 40000000
+@@ -994,11 +993,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
+ if (!projroot || !projroot[0])
+ projroot = PROJECTROOT;
+
+- /* Search for a config file or a fallback */
++ /* Search for a config file */
+ configPath = OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
+- if (!configPath)
+- configPath = OpenConfigFile(path, cmdline, projroot,
+- XFREE86CFGFILE);
+ return configPath;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 4a57f61..231ba02 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-stop-searching-for-xf86config-files
commit ba9b6f011d9c3b314f2ade82624e2703e371b1e3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 18 19:44:23 2011 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index ac93354..2593e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.7-12) UNRELEASED; urgency=low
+
+ * Cherry-pick this to fix crashes with MCE remotes (Closes: #609750):
+ - mi: handle DGA subtypes when determining the master device.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 18 Jan 2011 19:42:09 +0100
+
xorg-server (2:1.7.7-11) unstable; urgency=low
* Merge server-1.7-branch from upstream:
commit ae0ee0181b2842047fc8d3fb5569ca9c85681437
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 3 11:54:41 2010 +1000
mi: handle DGA subtypes when determining the master device.
The subtype in the DGA event is the core type and all ET_ event types (where
applicable) are identical to the core types. Thus the switch statement below
will work as required and assign the right master device.
Fixes a crasher bug on keyboard devices with valuators. If a device sends a
motion event while grabbed and a DGA client is active (but has not selected
input through DGA), the valuator event is posted through the VCK and
eventually results in a NULL-pointer dereference on dev->valuator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 31ab9f8860848504df18a8be9d19b817b191e0df)
(cherry picked from commit faecab3b13bbaecf4f35f49b833d1b79a5fb647d)
Signed-off-by: Cyril Brulebois <kibi@debian.org>
diff --git a/mi/mieq.c b/mi/mieq.c
index 9b6d0c9..97f4afc 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
{
DeviceIntPtr mdev;
int len = original->any.length;
+ int type = original->any.type;
CHECKEVENT(original);
@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
if (!sdev || !sdev->u.master)
return NULL;
- switch(original->any.type)
+#if XFreeXDGA
+ if (type == ET_DGAEvent)
+ type = original->dga_event.subtype;
+#endif
+
+ switch(type)
{
case ET_KeyPress:
case ET_KeyRelease:
Reply to: