[packages/xorg-driver-input-mtrack: 2/2] new, version 1.0-rc2 (20120115)
glen
glen at pld-linux.org
Sun Feb 3 02:44:02 CET 2013
commit 1b31c0ea3ff60278c2dd2780b333a9ef4c434189
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Feb 3 03:41:47 2013 +0200
new, version 1.0-rc2 (20120115)
based on src.rpm found from here:
http://acksyn.org/files/rpms/xf86-input-mtrack/
and xorg-driver-input-multitouch package
compile.patch | 59 +++++++++++++++++++++++++++++++++++++++
libdir.patch | 15 ----------
xf86-input-mtrack.conf | 5 ++++
xf86-input-multitouch.conf | 7 -----
xorg-driver-input-mtrack.spec | 56 +++++++++++++++++++++++++++++++++++++
xorg-driver-input-multitouch.spec | 51 ---------------------------------
6 files changed, 120 insertions(+), 73 deletions(-)
---
diff --git a/xorg-driver-input-mtrack.spec b/xorg-driver-input-mtrack.spec
new file mode 100644
index 0000000..3ed45af
--- /dev/null
+++ b/xorg-driver-input-mtrack.spec
@@ -0,0 +1,56 @@
+%define subver 20120115
+%define rel 1
+Summary: Multitouch X input driver
+Name: xorg-driver-input-mtrack
+Version: 1.0
+Release: 0.rc2.%{subver}.%{rel}
+License: GPL v2+
+Group: X11/Applications
+URL: https://github.com/BlueDragonX/xf86-input-mtrack
+Source0: xf86-input-mtrack-20120115.tar.bz2
+Source1: xf86-input-mtrack.conf
+Patch0: compile.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: mtdev-devel >= 1.1.0
+BuildRequires: xorg-xserver-server-devel
+BuildRequires: xorg-util-util-macros
+%{?requires_xorg_xserver_xinput}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This X input driver provides gestures support for multitouch
+touchpads, in particular those with integrated button.
+
+%prep
+%setup -q -n xf86-input-mtrack-20120115
+%patch0 -p1
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/40-xf86-input-mtrack.conf
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc README.md CREDITS
+%{_datadir}/X11/xorg.conf.d/40-xf86-input-mtrack.conf
+%attr(755,root,root) %{_libdir}/xorg/modules/input/mtrack_drv.so
diff --git a/xorg-driver-input-multitouch.spec b/xorg-driver-input-multitouch.spec
deleted file mode 100644
index b768ac4..0000000
--- a/xorg-driver-input-multitouch.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-%define subver 20110303
-%define rel 1
-Summary: Multitouch X input driver
-Name: xorg-driver-input-multitouch
-Version: 1.0
-Release: 0.rc2.%{subver}.%{rel}
-License: GPL v2+
-Group: X11/Applications
-Source0: xf86-input-multitouch-%{subver}.tar.bz2
-Source1: xf86-input-multitouch.conf
-Patch0: libdir.patch
-URL: http://bitmath.org/code/multitouch/
-BuildRequires: mtdev-devel >= 1.1.0
-BuildRequires: pixman-devel
-BuildRequires: sed >= 4.0
-%{?requires_xorg_xserver_xinput}
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-This X input driver provides gestures support for multitouch
-touchpads, in particular those with integrated button.
-
-%prep
-%setup -q -n xf86-input-multitouch-%{subver}
-%patch0 -p1
-
-%{__sed} -i -e 's,gcc,$(CC),g' Makefile
-
-%build
-%{__make} \
- CC="%{__cc}" \
- OPTS="%{rpmcflags} -fPIC" \
- LIBDIR=%{_libdir}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/40-xf86-input-multitouch.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%doc README CREDITS
-%{_datadir}/X11/xorg.conf.d/40-xf86-input-multitouch.conf
-%{_libdir}/xorg/modules/input/multitouch.so
diff --git a/compile.patch b/compile.patch
new file mode 100644
index 0000000..db5f2ae
--- /dev/null
+++ b/compile.patch
@@ -0,0 +1,59 @@
+diff -up xf86-input-mtrack-20120115/include/common.h.patch1 xf86-input-mtrack-20120115/include/common.h
+--- xf86-input-mtrack-20120115/include/common.h.patch1 2012-02-27 20:41:57.698656744 +0100
++++ xf86-input-mtrack-20120115/include/common.h 2012-02-27 20:42:46.026654576 +0100
+@@ -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
+@@ -84,7 +85,7 @@ static inline int bitcount(unsigned v)
+
+ /* boost-style foreach bit */
+ #define foreach_bit(i, m) \
+- for (i = firstbit(m); i >= 0; i = firstbit((m) & (~0U << i + 1)))
++ for (i = firstbit(m); i >= 0; i = firstbit((m) & (~0U << (i + 1))))
+
+ /* robust system ioctl calls */
+ #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
+diff -up xf86-input-mtrack-20120115/src/mtstate.c.patch1 xf86-input-mtrack-20120115/src/mtstate.c
+--- xf86-input-mtrack-20120115/src/mtstate.c.patch1 2012-02-27 20:42:11.962656104 +0100
++++ xf86-input-mtrack-20120115/src/mtstate.c 2012-02-27 20:42:46.029654576 +0100
+@@ -71,8 +71,10 @@ static int is_thumb(const struct MConfig
+
+ int min = MINVAL(hw->touch_minor, hw->touch_major);
+ int max = MAXVAL(hw->touch_minor, hw->touch_major);
+- int pct = percentage(min, max);
+ int size = touch_range_ratio(cfg, hw->touch_major);
++#if DEBUG_MTSTATE
++ int pct = percentage(min, max);
++#endif
+
+ if (percentage(min, max) > cfg->thumb_ratio && size > cfg->thumb_size) {
+ #if DEBUG_MTSTATE
+diff -up xf86-input-mtrack-20120115/tools/mtrack-test.c.patch1 xf86-input-mtrack-20120115/tools/mtrack-test.c
+--- xf86-input-mtrack-20120115/tools/mtrack-test.c.patch1 2012-02-27 20:42:23.971655565 +0100
++++ xf86-input-mtrack-20120115/tools/mtrack-test.c 2012-02-27 20:42:46.031654576 +0100
+@@ -32,17 +32,17 @@ void xf86Msg(int type, const char *forma
+ va_end(args);
+ }
+
+-int xf86SetIntOption(pointer opts, const char *name, int deflt)
++int xf86SetIntOption(XF86OptionPtr opts, const char *name, int deflt)
+ {
+ return deflt;
+ }
+
+-int xf86SetBoolOption(pointer opts, const char *name, int deflt)
++int xf86SetBoolOption(XF86OptionPtr opts, const char *name, int deflt)
+ {
+ return deflt;
+ }
+
+-double xf86SetRealOption(pointer opts, const char *name, double deflt)
++double xf86SetRealOption(XF86OptionPtr opts, const char *name, double deflt)
+ {
+ return deflt;
+ }
diff --git a/libdir.patch b/libdir.patch
deleted file mode 100644
index 803cee9..0000000
--- a/libdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c61f955..4ad3597 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,8 +25,9 @@ TOBJ = $(addprefix obj/,$(addsuffix .o,$(TARGETS)))
- OBJS = $(addprefix obj/,$(OBJECTS))
- XOBJS = $(addprefix obj/,$(XOBJECTS))
- LIBS = -lmtdev -lm
-+LIBDIR = /usr/lib
-
--DLIB = usr/lib/xorg/modules/input
-+DLIB = $(LIBDIR)/xorg/modules/input
-
- INCLUDE = -Iinclude -I/usr/include/xorg -I/usr/include/pixman-1
- OPTS = -O3 -fPIC
diff --git a/xf86-input-mtrack.conf b/xf86-input-mtrack.conf
new file mode 100644
index 0000000..26aa981
--- /dev/null
+++ b/xf86-input-mtrack.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+ MatchIsTouchpad "on"
+ Identifier "Touchpads"
+ Driver "mtrack"
+EndSection
diff --git a/xf86-input-multitouch.conf b/xf86-input-multitouch.conf
deleted file mode 100644
index 5f40910..0000000
--- a/xf86-input-multitouch.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-Section "InputClass"
- MatchIsTouchpad "true"
- Identifier "Multitouch Touchpad"
- MatchProduct "bcm5974"
- Driver "multitouch"
- MatchDevicePath "/dev/input/event*"
-EndSection
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-mtrack.git/commitdiff/1b31c0ea3ff60278c2dd2780b333a9ef4c434189
More information about the pld-cvs-commit
mailing list