rpms/xorg-x11-server/F-13 10-quirks.conf, NONE, 1.1 xserver-1.8-udev-warning.patch, NONE, 1.1 xorg-x11-server.spec, 1.497, 1.498

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18476

Modified Files:
	xorg-x11-server.spec 
Added Files:
	10-quirks.conf xserver-1.8-udev-warning.patch 
Log Message:
* Wed Feb 17 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-4.2010208
- One day I'll remember to cvs add everything.
  xserver-1.8-udev-warning.patch added.



--- NEW FILE 10-quirks.conf ---
# Collection of quirks and blacklist/whitelists for specific devices.


# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
Section "InputClass"
        Identifier "ThinkPad HDAPS accelerometer blacklist"
        MatchProduct "ThinkPad HDAPS accelerometer data"
        Option "Ignore" "on"
EndSection

xserver-1.8-udev-warning.patch:
 xf86Config.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE xserver-1.8-udev-warning.patch ---
>From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Wed, 17 Feb 2010 11:12:36 +1000
Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes.

Signed-off-by: Fedora X Ninjas <x at fedoraproject.org>
---
 hw/xfree86/common/xf86Config.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 132e8bc..b1722cd 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
 	                "input devices.\n\tIf no devices become available, "
 	                "reconfigure %s or disable AutoAddDevices.\n",
 			config_backend, config_backend);
+
+	xf86Msg(X_INFO, "\n"
+        "***************************************************************\n"
+        "***************************************************************\n"
+        "** Fedora switched to udev-based device detection with       **\n"
+        "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration    **\n"
+        "** stored in /etc/hal/fdi/policy will not be seen by this    **\n"
+        "** server version. If you have such configuration you will   **\n"
+        "** need to update it to the new format.                      **\n"
+        "** For more information, see the Fedora wiki page            **\n"
+        "** https://fedoraproject.org/wiki/Input_device_configuration **\n"
+        "***************************************************************\n"
+        "***************************************************************\n");
 #else
 	xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n"
 			"\tTry disabling AllowEmptyInput.\n");
-- 
1.6.6.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-13/xorg-x11-server.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- xorg-x11-server.spec	16 Feb 2010 06:14:13 -0000	1.497
+++ xorg-x11-server.spec	17 Feb 2010 05:32:34 -0000	1.498
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.99.901
-Release:   2.%{gitdate}%{dist}
+Release:   4.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -36,6 +36,7 @@ Source0:   http://www.x.org/pub/individu
 Source1:   gitignore
 %endif
 Source3:   00-evdev.conf
+Source4:   10-quirks.conf
 
 Source10:   xserver.pamd
 
@@ -78,6 +79,9 @@ Patch6045: xserver-1.7.0-randr-gamma-res
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 
+# Remove this some day. Not today though.
+Patch6052: xserver-1.8-udev-warning.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -359,6 +363,7 @@ install -m 644 %{SOURCE10} $RPM_BUILD_RO
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
 
 %endif
 
@@ -455,6 +460,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/xorg.conf.5*
 %dir %{_sysconfdir}/xorg.conf.d
 %{_sysconfdir}/xorg.conf.d/00-evdev.conf
+%{_sysconfdir}/xorg.conf.d/10-quirks.conf
 %endif
 
 
@@ -511,6 +517,15 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Feb 17 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-4.2010208
+- One day I'll remember to cvs add everything.
+  xserver-1.8-udev-warning.patch added.
+
+* Wed Feb 17 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-3.2010208
+- Add 10-quirks.conf for specific black/whitelisting of devices.
+- xserver-1.8-udev-warning.patch: stick giant warning into log file that fdi
+  files need to be ported.
+
 * Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.901-2.2010208
 - Add 00-evdev.conf this time.