Hello community, here is the log from the commit of package x11-input-mtrack for openSUSE:Factory checked in at 2012-01-25 10:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x11-input-mtrack (Old) and /work/SRC/openSUSE:Factory/.x11-input-mtrack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x11-input-mtrack", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.x11-input-mtrack.new/x11-input-mtrack.changes 2012-01-25 10:41:37.000000000 +0100 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Mon Jan 23 10:52:36 UTC 2012 - sndir...@suse.com + +- added missing copyright for specfile + +------------------------------------------------------------------- +Thu Jan 12 15:00:29 UTC 2012 - cfarr...@suse.com + +- license update: GPL-2.0 + SPDX format + +------------------------------------------------------------------- +Tue Jan 10 13:39:20 UTC 2012 - sndir...@suse.com + +- reworked mtrack.conf +- give the driver higher priority in /etc/X11/xorg.conf.d than the + synaptics one; removed the voodoo of synaptics driver config + renaming + +------------------------------------------------------------------- +Thu Aug 11 16:38:38 CEST 2011 - ti...@suse.de + +- initial version: 0.2.0 +- add xorg.conf file + New: ---- mtrack.conf multitouch-missing-include.diff x11-input-mtrack.changes x11-input-mtrack.spec xf86-input-mtrack-0.2.0-1-g71abf32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-mtrack.spec ++++++ # # spec file for package x11-input-mtrack # # Copyright (c) 2012 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/ # # norootforbuild Name: x11-input-mtrack BuildRequires: mtdev-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk BuildRequires: autoconf automake libtool Summary: An Xorg driver for multitouch trackpads Version: 0.2.0 Release: 1 License: GPL-2.0 Group: System/X11/Servers/XF86_4 Source: xf86-input-mtrack-0.2.0-1-g71abf32.tar.bz2 Source1: mtrack.conf Patch: multitouch-missing-include.diff ExcludeArch: s390 s390x Conflicts: x11-input-multitouch Url: http://github.com/BlueDragonX/xf86-input-mtrack BuildRoot: %{_tmppath}/%{name}-%{version}-build %description An Xorg driver for multitouch trackpads. Supports any trackpad whose kernel driver uses the slotted multitouch protocol. For more information on the protocol see the kernel documentation. This driver is compatible with Xorg server versions 1.7, 1.8, and 1.10. It requires the mtdev library to operate. %prep %setup -q -n xf86-input-mtrack %patch -p1 %build autoreconf -fi %configure %{__make} %install %makeinstall mkdir -p $RPM_BUILD_ROOT/etc/X11/xorg.conf.d # higher priority than synaptics (50-synaptics.conf), apparently the last # driver entry wins ... install -c -m 0644 %{S:1} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/60-mtrack.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING README.md %{_libdir}/xorg/modules/input /etc/X11/xorg.conf.d/*.conf %changelog ++++++ mtrack.conf ++++++ Section "InputClass" MatchIsTouchpad "on" Identifier "Touchpads" MatchDevicePath "/dev/input/event*" Driver "mtrack" # Default for some options # Option "ButtonIntegrated" "true" # Option "ClickFinger1" "3" # Option "ClickFinger2" "2" # Option "ClickFinger3" "0" # Option "ThumbSize" "25" # Option "PalmSize" "40" # Option "ClickTime" "50" # Option "ScrollDistance" "150" EndSection ++++++ multitouch-missing-include.diff ++++++ diff --git a/driver/mtrack.c b/driver/mtrack.c index a835b5e..6052243 100644 --- a/driver/mtrack.c +++ b/driver/mtrack.c @@ -27,6 +27,7 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> #include <xserver-properties.h> +#include <xorg/exevents.h> #endif #define TAP_HOLD 100 diff --git a/include/common.h b/include/common.h index 6098c30..e01cebe 100644 --- a/include/common.h +++ b/include/common.h @@ -33,6 +33,7 @@ #include <xf86Xinput.h> #include <errno.h> #include <mtdev-mapping.h> +#include <mtdev-plumbing.h> #include <stdint.h> #define DIM_FINGER 32 diff --git a/tools/mtrack-test.c b/tools/mtrack-test.c index 5eb6a08..784d0dc 100644 --- a/tools/mtrack-test.c +++ b/tools/mtrack-test.c @@ -23,6 +23,7 @@ #include "mtouch.h" #include <fcntl.h> #include <stdarg.h> +#include <unistd.h> void xf86Msg(int type, const char *format, ...) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
