git snapshot for 2.10, mostly to pick up 10-evdev.conf that moved from the
server to here
This commit is contained in:
Peter Hutterer
parent
b8649b641b
commit
38c47fb944
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@ xf86-input-evdev-20100823.tar.bz2
|
||||
/xf86-input-evdev-2.9.0.tar.bz2
|
||||
/xf86-input-evdev-2.9.1.tar.bz2
|
||||
/xf86-input-evdev-2.9.2.tar.bz2
|
||||
/xf86-input-evdev-20150807.tar.bz2
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From 39ef4444a231d3b0296ba421b78f0417f18955f9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 13 Feb 2015 08:12:38 +1000
|
||||
Subject: [PATCH evdev] Drop evdev-specific XKB defaults
|
||||
|
||||
Just use the server defaults instead. This has very little effect, on most
|
||||
systems there was some sort of default configuration applied anyway.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
src/evdev.c | 23 ++++++++++-------------
|
||||
1 file changed, 10 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/evdev.c b/src/evdev.c
|
||||
index 5cbce35..9c1a4d3 100644
|
||||
--- a/src/evdev.c
|
||||
+++ b/src/evdev.c
|
||||
@@ -90,13 +90,6 @@
|
||||
#define XI86_SERVER_FD 0x20
|
||||
#endif
|
||||
|
||||
-static const char *evdevDefaults[] = {
|
||||
- "XkbRules", "evdev",
|
||||
- "XkbModel", "pc104", /* the right model for 'us' */
|
||||
- "XkbLayout", "us",
|
||||
- NULL
|
||||
-};
|
||||
-
|
||||
/* Any of those triggers a proximity event */
|
||||
static int proximity_bits[] = {
|
||||
BTN_TOOL_PEN,
|
||||
@@ -1161,23 +1154,27 @@ static int
|
||||
EvdevAddKeyClass(DeviceIntPtr device)
|
||||
{
|
||||
int rc = Success;
|
||||
- XkbRMLVOSet rmlvo = {0};
|
||||
+ XkbRMLVOSet rmlvo = {0},
|
||||
+ defaults;
|
||||
InputInfoPtr pInfo;
|
||||
|
||||
pInfo = device->public.devicePrivate;
|
||||
|
||||
+ XkbGetRulesDflts(&defaults);
|
||||
+
|
||||
/* sorry, no rules change allowed for you */
|
||||
xf86ReplaceStrOption(pInfo->options, "xkb_rules", "evdev");
|
||||
rmlvo.rules = xf86SetStrOption(pInfo->options, "xkb_rules", NULL);
|
||||
- rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", NULL);
|
||||
- rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", NULL);
|
||||
- rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", NULL);
|
||||
- rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", NULL);
|
||||
+ rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", defaults.model);
|
||||
+ rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", defaults.layout);
|
||||
+ rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", defaults.variant);
|
||||
+ rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", defaults.options);
|
||||
|
||||
if (!InitKeyboardDeviceStruct(device, &rmlvo, NULL, EvdevKbdCtrl))
|
||||
rc = !Success;
|
||||
|
||||
XkbFreeRMLVOSet(&rmlvo, FALSE);
|
||||
+ XkbFreeRMLVOSet(&defaults, FALSE);
|
||||
|
||||
return rc;
|
||||
}
|
||||
@@ -2692,7 +2689,7 @@ _X_EXPORT InputDriverRec EVDEV = {
|
||||
EvdevPreInit,
|
||||
EvdevUnInit,
|
||||
NULL,
|
||||
- evdevDefaults,
|
||||
+ NULL,
|
||||
#ifdef XI86_DRV_CAP_SERVER_FD
|
||||
XI86_DRV_CAP_SERVER_FD
|
||||
#endif
|
||||
--
|
||||
2.1.0
|
||||
|
||||
2
commitid
2
commitid
@ -1 +1 @@
|
||||
ae67f64f02434171e1828b00fbf4277c8166966e
|
||||
66c997886424a20e92ce30fcfda46cbb5c7352ab
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
99eebf171e6c7bffc42d4fc430d47454 xf86-input-evdev-2.9.2.tar.bz2
|
||||
ff44db3ef641f49af02f17a8c727bc7c xf86-input-evdev-20150807.tar.bz2
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
%global moduledir %(pkg-config xorg-server --variable=moduledir )
|
||||
%global driverdir %{moduledir}/input
|
||||
|
||||
#global gitdate 20140417
|
||||
%global gitversion ae67f64
|
||||
%global gitdate 20150807
|
||||
%global gitversion 66c997886
|
||||
|
||||
Summary: Xorg X11 evdev input driver
|
||||
Name: xorg-x11-drv-evdev
|
||||
Version: 2.9.2
|
||||
Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
Version: 2.9.99
|
||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
URL: http://www.x.org
|
||||
License: MIT
|
||||
Group: User Interface/X Hardware Support
|
||||
@ -21,8 +21,6 @@ Source2: commitid
|
||||
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
|
||||
%endif
|
||||
|
||||
Patch01: 0001-Drop-evdev-specific-XKB-defaults.patch
|
||||
|
||||
ExcludeArch: s390 s390x
|
||||
|
||||
BuildRequires: autoconf automake libtool
|
||||
@ -43,7 +41,6 @@ X.Org X11 evdev input driver.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
autoreconf --force -v --install || exit 1
|
||||
@ -62,7 +59,7 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
|
||||
%doc COPYING
|
||||
%{driverdir}/evdev_drv.so
|
||||
%{_mandir}/man4/evdev.4*
|
||||
|
||||
%{_datadir}/X11/xorg.conf.d/10-evdev.conf
|
||||
|
||||
%package devel
|
||||
Summary: Xorg X11 evdev input driver development package.
|
||||
@ -79,6 +76,10 @@ X.Org X11 evdev input driver development files.
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 07 2015 Peter Hutterer <peter.hutterer@redhat.com> 2.9.99-1
|
||||
- git snapshot for 2.10, mostly to pick up 10-evdev.conf that moved from the
|
||||
server to here
|
||||
|
||||
* Wed Jul 29 2015 Dave Airlie <airlied@redhat.com> - 2.9.2-3
|
||||
- 1.15 ABI rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user