From b038ed455306dafb013763eeb6d911c960e8284f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 02:49:39 +0000 Subject: import xorg-x11-drv-evdev-2.10.5-2.1.el7 --- diff --git a/.gitignore b/.gitignore index 242e760..dc83f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-input-evdev-2.9.2.tar.bz2 +SOURCES/xf86-input-evdev-2.10.5.tar.bz2 diff --git a/.xorg-x11-drv-evdev.metadata b/.xorg-x11-drv-evdev.metadata index 94e2db1..f3160c8 100644 --- a/.xorg-x11-drv-evdev.metadata +++ b/.xorg-x11-drv-evdev.metadata @@ -1 +1 @@ -347eae8cc6c2f3f84bac77ce0b06eef06f541fd3 SOURCES/xf86-input-evdev-2.9.2.tar.bz2 +1f599c8f95f7d39af83aa2a59039432f35ab8c55 SOURCES/xf86-input-evdev-2.10.5.tar.bz2 diff --git a/SOURCES/0001-Drop-evdev-specific-XKB-defaults.patch b/SOURCES/0001-Drop-evdev-specific-XKB-defaults.patch deleted file mode 100644 index fafecc7..0000000 --- a/SOURCES/0001-Drop-evdev-specific-XKB-defaults.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 39ef4444a231d3b0296ba421b78f0417f18955f9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -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 ---- - 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 diff --git a/SPECS/xorg-x11-drv-evdev.spec b/SPECS/xorg-x11-drv-evdev.spec index f042090..f78dc36 100644 --- a/SPECS/xorg-x11-drv-evdev.spec +++ b/SPECS/xorg-x11-drv-evdev.spec @@ -7,8 +7,8 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev -Version: 2.9.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 2.10.5 +Release: 2.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 @@ -40,7 +38,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 @@ -64,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT %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. @@ -80,8 +77,16 @@ X.Org X11 evdev input driver development files. %dir %{_includedir}/xorg %{_includedir}/xorg/evdev-properties.h - %changelog +* Wed Feb 08 2017 Peter Hutterer 2.10.5-2.1 +- Build against the correct server package (#1401651) + +* Wed Feb 08 2017 Peter Hutterer 2.10.5-2 +- Move 10-evdev.conf to the correct subpackage (#1401651) + +* Fri Jan 27 2017 Peter Hutterer 2.10.5-1 +- evdev 2.10.5 (#1401651) + * Thu Apr 30 2015 Peter Hutterer 2.9.2-2 - git-add the missing patch (#1194874)