Hello community, here is the log from the commit of package xf86-input-evdev.1230 for openSUSE:12.2:Update checked in at 2013-01-21 12:34:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/xf86-input-evdev.1230 (Old) and /work/SRC/openSUSE:12.2:Update/.xf86-input-evdev.1230.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-evdev.1230", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:12.2:Update/.xf86-input-evdev.1230.new/xf86-input-evdev.changes 2013-01-21 12:34:44.000000000 +0100 @@ -0,0 +1,50 @@ +------------------------------------------------------------------- +Tue Jan 15 13:28:16 UTC 2013 - m...@suse.cz + +- evdev_handle-axis-swap-calibration-and-inversion-for-touch-events.patch, + evdev_move-calibration-asjustments-to-helper-function.patch, + evdev_move-valuator-swapping-into-a-helper-function.patch + * Handle axis swap, calibration and inversion for touch events + (bnc#785508) + +------------------------------------------------------------------- +Fri Dec 7 11:24:18 UTC 2012 - vu...@opensuse.org + +- Update to version 2.7.3: + + Fix broken ButtonMapping option. + + Don't delete the device on ENODEV. + + Build fixes. +- Changes from version 2.7.2: + + Various bug fixes. +- Changes from version 2.7.1: + + Fix buffer overrun when populating axis label property array + (bnc#790938). + + Fix inverted horizontal scroll (bnc#774539). + + Various bug fixes. +- Drop u_evdev_fix-inverted-scrolling.patch: fixed upstream. + +------------------------------------------------------------------- +Thu Sep 27 15:17:12 CEST 2012 - m...@suse.cz + +- u_evdev_fix-inverted-scrolling.patch + (bnc#774539) + +------------------------------------------------------------------- +Thu Apr 19 13:49:23 UTC 2012 - dims...@opensuse.org + +- Update to version 2.7.0: + + Only force REL_X/Y if no ABS_X/Y exists + + Copy last valuator values into new touch valuator masks + + Prefere relative axis labelling over absolute axis labelling + + Force x/y axes to exist on devices with any other axes + (fdo#44655) +- Add pkgconfig(libudev) BuildRequires: New dependency +- Add pkgconfig(mtdev) BuildRequires: Support Multi-Touch. +- Use %x11_abi_xinpot_req instead of static ABI Requires. + +------------------------------------------------------------------- +Wed Apr 18 11:22:34 UTC 2012 - vu...@opensuse.org + +- Split xf86-input-evdev from xorg-x11-driver-input. + Initial version: 2.6.0. + New: ---- evdev_handle-axis-swap-calibration-and-inversion-for-touch-events.patch evdev_move-calibration-asjustments-to-helper-function.patch evdev_move-valuator-swapping-into-a-helper-function.patch xf86-input-evdev-2.7.3.tar.bz2 xf86-input-evdev.changes xf86-input-evdev.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-evdev.spec ++++++ # # spec file for package xf86-input-evdev # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xf86-input-evdev Version: 2.7.3 Release: 0 Summary: Generic Linux input driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch0: evdev_move-valuator-swapping-into-a-helper-function.patch Patch1: evdev_move-calibration-asjustments-to-helper-function.patch Patch2: evdev_handle-axis-swap-calibration-and-inversion-for-touch-events.patch BuildRequires: pkg-config BuildRequires: pkgconfig(inputproto) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(mtdev) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(xproto) Requires: udev Supplements: xorg-x11-server # This was part of the xorg-x11-driver-input package up to version 7.6 Conflicts: xorg-x11-driver-input <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x %x11_abi_xinput_req %description evdev is an Xorg input driver for Linux's generic event devices. It therefore supports all input devices that the kernel knows about, including most mice, keyboards, tablets and touchscreens. %package devel Summary: Generic Linux input driver for the Xorg X server -- Development Files Group: Development/Libraries/X11 Requires: %{name} = %{version} %description devel evdev is an Xorg input driver for Linux's generic event devices. It therefore supports all input devices that the kernel knows about, including most mice, keyboards, tablets and touchscreens. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build %configure make %{?_smp_mflags} %install %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %post # re-plug the input devices udevadm trigger --subsystem-match=input --action=change exit 0 %postun # re-plug the input devices udevadm trigger --subsystem-match=input --action=change exit 0 %files %defattr(-,root,root) %doc ChangeLog COPYING README %dir %{_libdir}/xorg/modules/input %{_libdir}/xorg/modules/input/evdev_drv.so %{_datadir}/man/man4/evdev.4%{?ext_man} %files devel %defattr(-,root,root) %{_includedir}/xorg/evdev-properties.h %{_libdir}/pkgconfig/xorg-evdev.pc %changelog ++++++ evdev_handle-axis-swap-calibration-and-inversion-for-touch-events.patch ++++++ Author: Peter Hutterer <peter.hutte...@who-t.net> Subject: Handle axis swap, calibration, and inversion for touch events (#59340) Patch-Mainline: Upstream References: fdo#59340 bnc#785508 X.Org Bug 59340 <http://bugs.freedesktop.org/show_bug.cgi?id=59340> Reported-by: Bastien Nocera <had...@hadess.net> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Michal Srb <m...@suse.com> --- src/evdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/evdev.c b/src/evdev.c index 1581d47..c689257 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -744,6 +744,9 @@ EvdevProcessTouch(InputInfoPtr pInfo) type = XI_TouchUpdate; + EvdevSwapAbsValuators(pEvdev, pEvdev->mt_mask); + EvdevApplyCalibration(pEvdev, pEvdev->mt_mask); + EvdevQueueTouchEvent(pInfo, pEvdev->cur_slot, pEvdev->mt_mask, type); pEvdev->slot_state = SLOTSTATE_EMPTY; -- 1.8.1 ++++++ evdev_move-calibration-asjustments-to-helper-function.patch ++++++ Author: Peter Hutterer <peter.hutte...@who-t.net> Subject: Move calibration adjustments to helper function Patch-Mainline: Upstream References: fdo#59340 bnc#785508 No functional changes. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Michal Srb <m...@suse.com> --- src/evdev.c | 69 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index f061324..1581d47 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -448,6 +448,42 @@ EvdevSwapAbsValuators(EvdevPtr pEvdev, ValuatorMask *mask) } } +static void +EvdevApplyCalibration(EvdevPtr pEvdev, ValuatorMask *mask) +{ + int i; + + for (i = 0; i <= 1; i++) { + int val; + int calib_min; + int calib_max; + + if (!valuator_mask_isset(mask, i)) + continue; + + val = valuator_mask_get(mask, i); + + if (i == 0) { + calib_min = pEvdev->calibration.min_x; + calib_max = pEvdev->calibration.max_x; + } else { + calib_min = pEvdev->calibration.min_y; + calib_max = pEvdev->calibration.max_y; + } + + if (pEvdev->flags & EVDEV_CALIBRATED) + val = xf86ScaleAxis(val, pEvdev->absinfo[i].maximum, + pEvdev->absinfo[i].minimum, calib_max, + calib_min); + + if ((i == 0 && pEvdev->invert_x) || (i == 1 && pEvdev->invert_y)) + val = (pEvdev->absinfo[i].maximum - val + + pEvdev->absinfo[i].minimum); + + valuator_mask_set(mask, i, val); + } +} + /** * Take the valuators and process them accordingly. */ @@ -524,39 +560,8 @@ EvdevProcessValuators(InputInfoPtr pInfo) * just works. */ else if (pEvdev->abs_queued && pEvdev->in_proximity) { - int i; - EvdevSwapAbsValuators(pEvdev, pEvdev->vals); - - for (i = 0; i <= 1; i++) { - int val; - int calib_min; - int calib_max; - - if (!valuator_mask_isset(pEvdev->vals, i)) - continue; - - val = valuator_mask_get(pEvdev->vals, i); - - if (i == 0) { - calib_min = pEvdev->calibration.min_x; - calib_max = pEvdev->calibration.max_x; - } else { - calib_min = pEvdev->calibration.min_y; - calib_max = pEvdev->calibration.max_y; - } - - if (pEvdev->flags & EVDEV_CALIBRATED) - val = xf86ScaleAxis(val, pEvdev->absinfo[i].maximum, - pEvdev->absinfo[i].minimum, calib_max, - calib_min); - - if ((i == 0 && pEvdev->invert_x) || (i == 1 && pEvdev->invert_y)) - val = (pEvdev->absinfo[i].maximum - val + - pEvdev->absinfo[i].minimum); - - valuator_mask_set(pEvdev->vals, i, val); - } + EvdevApplyCalibration(pEvdev, pEvdev->vals); Evdev3BEmuProcessAbsMotion(pInfo, pEvdev->vals); } } -- 1.8.1++++++ evdev_move-valuator-swapping-into-a-helper-function.patch ++++++ Author: Peter Hutterer <peter.hutte...@who-t.net> Subject: Move valuator swapping into a helper function Patch-Mainline: Upstream References: fdo#59340 bnc#785508 No functional changes. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Michal Srb <m...@suse.com> --- src/evdev.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index dfce8c4..f061324 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -418,6 +418,36 @@ EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count) } } +static void +EvdevSwapAbsValuators(EvdevPtr pEvdev, ValuatorMask *mask) +{ + int i; + int swapped_isset[2] = {0, 0}; + int swapped_values[2]; + + if (!pEvdev->swap_axes) + return; + + for(i = 0; i <= 1; i++) { + if (valuator_mask_isset(mask, i)) { + swapped_isset[1 - i] = 1; + swapped_values[1 - i] = + xf86ScaleAxis(valuator_mask_get(mask, i), + pEvdev->absinfo[1 - i].maximum, + pEvdev->absinfo[1 - i].minimum, + pEvdev->absinfo[i].maximum, + pEvdev->absinfo[i].minimum); + } + } + + for (i = 0; i <= 1; i++) { + if (swapped_isset[i]) + valuator_mask_set(mask, i, swapped_values[i]); + else + valuator_mask_unset(mask, i); + } +} + /** * Take the valuators and process them accordingly. */ @@ -496,27 +526,7 @@ EvdevProcessValuators(InputInfoPtr pInfo) else if (pEvdev->abs_queued && pEvdev->in_proximity) { int i; - if (pEvdev->swap_axes) { - int swapped_isset[2] = {0, 0}; - int swapped_values[2]; - - for(i = 0; i <= 1; i++) - if (valuator_mask_isset(pEvdev->vals, i)) { - swapped_isset[1 - i] = 1; - swapped_values[1 - i] = - xf86ScaleAxis(valuator_mask_get(pEvdev->vals, i), - pEvdev->absinfo[1 - i].maximum, - pEvdev->absinfo[1 - i].minimum, - pEvdev->absinfo[i].maximum, - pEvdev->absinfo[i].minimum); - } - - for (i = 0; i <= 1; i++) - if (swapped_isset[i]) - valuator_mask_set(pEvdev->vals, i, swapped_values[i]); - else - valuator_mask_unset(pEvdev->vals, i); - } + EvdevSwapAbsValuators(pEvdev, pEvdev->vals); for (i = 0; i <= 1; i++) { int val; -- 1.8.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
