commit x11-input-mtrack for openSUSE:Factory

2013-03-14 Thread h_root
Hello community,

here is the log from the commit of package x11-input-mtrack for 
openSUSE:Factory checked in at 2013-03-14 15:02:35

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:

--- /work/SRC/openSUSE:Factory/x11-input-mtrack/x11-input-mtrack.changes
2012-05-08 12:01:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.x11-input-mtrack.new/x11-input-mtrack.changes   
2013-03-14 15:03:22.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 13 13:12:06 UTC 2013 - pgaj...@suse.com
+
+- builds with automake 1.13
+
+---



Other differences:
--
++ x11-input-mtrack.spec ++
--- /var/tmp/diff_new_pack.jhJ26M/_old  2013-03-14 15:03:46.0 +0100
+++ /var/tmp/diff_new_pack.jhJ26M/_new  2013-03-14 15:03:46.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package x11-input-mtrack
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -15,17 +15,20 @@
 # 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
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  mtdev-devel
+BuildRequires:  pkgconfig
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  xorg-x11-server-sdk
 Summary:An Xorg driver for multitouch trackpads
-Version:0.2.0
-Release:1
 License:GPL-2.0
 Group:  System/X11/Servers/XF86_4
+Version:0.2.0
+Release:0
 Source: xf86-input-mtrack-0.2.0-1-g71abf32.tar.bz2
 Source1:mtrack.conf
 Patch:  multitouch-missing-include.diff
@@ -48,6 +51,7 @@
 
 %build
 export CFLAGS=%{optflags} -lxf86config
+libtoolize -f
 autoreconf -fi
 %configure
 %{__make} V=1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit x11-input-mtrack for openSUSE:Factory

2012-05-08 Thread h_root
Hello community,

here is the log from the commit of package x11-input-mtrack for 
openSUSE:Factory checked in at 2012-05-08 12:00:05

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:

--- /work/SRC/openSUSE:Factory/x11-input-mtrack/x11-input-mtrack.changes
2012-01-25 10:41:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.x11-input-mtrack.new/x11-input-mtrack.changes   
2012-05-08 12:01:12.0 +0200
@@ -1,0 +2,7 @@
+Fri Apr 20 15:45:42 UTC 2012 - dims...@opensuse.org
+
+- Add mtrack-xorg112.patch: Fix build with X.Org 1.12. Do not build
+  the tests that are anyway not installed.
+- Add %x11_abi_xinput_req to ensure we have a compatible X Server.
+
+---

New:

  mtrack-xorg112.patch



Other differences:
--
++ x11-input-mtrack.spec ++
--- /var/tmp/diff_new_pack.hI08rk/_old  2012-05-08 12:01:13.0 +0200
+++ /var/tmp/diff_new_pack.hI08rk/_new  2012-05-08 12:01:13.0 +0200
@@ -29,10 +29,12 @@
 Source: xf86-input-mtrack-0.2.0-1-g71abf32.tar.bz2
 Source1:mtrack.conf
 Patch:  multitouch-missing-include.diff
+Patch1: mtrack-xorg112.patch
 ExcludeArch:s390 s390x
 Conflicts:  x11-input-multitouch
 Url:http://github.com/BlueDragonX/xf86-input-mtrack
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%x11_abi_xinput_req
 
 %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.
@@ -42,11 +44,13 @@
 %prep
 %setup -q -n xf86-input-mtrack
 %patch -p1
+%patch1 -p1
 
 %build
+export CFLAGS=%{optflags} -lxf86config
 autoreconf -fi
 %configure
-%{__make}
+%{__make} V=1
 
 %install
 %makeinstall

++ mtrack-xorg112.patch ++
Index: xf86-input-mtrack/Makefile.am
===
--- xf86-input-mtrack.orig/Makefile.am
+++ xf86-input-mtrack/Makefile.am
@@ -14,11 +14,6 @@ SOURCES_COMMON = \
$(srcdir)/driver/mprops.c
 @DRIVER_NAME@_drv_ladir = @inputdir@
 
-noinst_PROGRAMS = mtrack-test
-mtrack_test_SOURCES = $(SOURCES_COMMON) \
-   $(srcdir)/tools/mtrack-test.c
-mtrack_test_CFLAGS = $(AM_CFLAGS)
-
 AM_CPPFLAGS = -I$(top_srcdir)/include/ \
-I/usr/include/xorg \
-I/usr/include/pixman-1
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit x11-input-mtrack for openSUSE:Factory

2012-01-25 Thread h_root
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.x11-input-mtrack.new/x11-input-mtrack.changes   
2012-01-25 10:41:37.0 +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