Группа :: Система/X11
Пакет: xorg-drv-joystick
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: xorg-drv-joystick-1.6.2-alt5.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/868377148d088ba9ab87b966c13af024b3189619 | 6 +
.gear/tags/list | 1 +
config/50-x11-input-joystick.fdi | 34 ++++++
src/jstk.c | 5 +
xorg-drv-joystick.spec | 128 +++++++++++++++++++++
6 files changed, 176 insertions(+)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..8eaedf6
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: xf86-input-joystick-@version@:.
+diff: xf86-input-joystick-@version@:. .
diff --git a/.gear/tags/868377148d088ba9ab87b966c13af024b3189619 b/.gear/tags/868377148d088ba9ab87b966c13af024b3189619
new file mode 100644
index 0000000..232e5c2
--- /dev/null
+++ b/.gear/tags/868377148d088ba9ab87b966c13af024b3189619
@@ -0,0 +1,6 @@
+object 426c3aa3c8a2385f17e37ae73c1e78f072656027
+type commit
+tag xf86-input-joystick-1.6.2
+tagger Sascha Hlusiak <saschahlusiak@arcor.de> 1358331117 +0100
+
+joystick 1.6.2
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..fb2f58f
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+868377148d088ba9ab87b966c13af024b3189619 xf86-input-joystick-1.6.2
diff --git a/config/50-x11-input-joystick.fdi b/config/50-x11-input-joystick.fdi
index aec77b0..f159978 100644
--- a/config/50-x11-input-joystick.fdi
+++ b/config/50-x11-input-joystick.fdi
@@ -42,6 +42,40 @@
<merge key="input.x11_options.MapAxis2" type="string">mode=accelerated keylow=111 keyhigh=116</merge>
-->
</match>
+ <match key="input.product" string_outof="Sony Computer Entertainment Wireless Controller;Sony PLAYSTATION(R)3 Controller">
+ <append key="info.capabilities" type="strlist">input.keys</append>
+ <append key="info.capabilities" type="strlist">input.mouse</append>
+
+ <merge key="input.x11_driver" type="string">joystick</merge>
+
+ <merge key="input.x11_options.MapAxis1" type="string">mode=relative axis=+1x deadzone=5000</merge>
+ <merge key="input.x11_options.MapAxis2" type="string">mode=relative axis=+1y deadzone=5000</merge>
+ <merge key="input.x11_options.MapAxis3" type="string">mode=relative axis=+1zx deadzone=5000</merge>
+ <merge key="input.x11_options.MapAxis4" type="string">mode=relative axis=+1zy deadzone=5000</merge>
+ <merge key="input.x11_options.MapAxis5" type="string">mode=accelerated axis=+1x deadzone=5000</merge>
+ <merge key="input.x11_options.MapAxis6" type="string">mode=accelerated axis=+1y deadzone=5000</merge>
+
+ <merge key="input.x11_options.MapButton1" type="string">button=2</merge>
+ <merge key="input.x11_options.MapButton2" type="string">button=1</merge>
+ <merge key="input.x11_options.MapButton3" type="string">button=3</merge>
+
+ <merge key="input.x11_options.MapButton4" type="string">key=Menu</merge>
+
+ <merge key="input.x11_options.MapButton5" type="string">key=Up</merge>
+ <merge key="input.x11_options.MapButton6" type="string">key=Right</merge>
+ <merge key="input.x11_options.MapButton7" type="string">key=Down</merge>
+ <merge key="input.x11_options.MapButton8" type="string">key=Left</merge>
+ <!--
+ <merge key="input.x11_options.MapButton9" type="string">key=F1</merge>
+ <merge key="input.x11_options.MapButton10" type="string">key=F3</merge>
+ <merge key="input.x11_options.MapButton11" type="string">key=F2</merge>
+ <merge key="input.x11_options.MapButton12" type="string">key=F4</merge>
+ -->
+ <merge key="input.x11_options.MapButton13" type="string">key=Home</merge>
+ <merge key="input.x11_options.MapButton14" type="string">key=Escape</merge>
+ <merge key="input.x11_options.MapButton15" type="string">key=Return</merge>
+ <merge key="input.x11_options.MapButton16" type="string">key=Alt_L+Tab</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff --git a/src/jstk.c b/src/jstk.c
index b82481a..bee34fc 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -422,6 +422,11 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
pJstk->public.on = FALSE;
break;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+ case DEVICE_ABORT:
+ break;
+#endif
+
default:
ErrorF("unsupported mode=%d\n", what);return BadValue;
diff --git a/xorg-drv-joystick.spec b/xorg-drv-joystick.spec
new file mode 100644
index 0000000..34fba18
--- /dev/null
+++ b/xorg-drv-joystick.spec
@@ -0,0 +1,128 @@
+Name: xorg-drv-joystick
+Version: 1.6.2
+Release: alt5
+Epoch: 1
+Summary: joystick input driver
+License: MIT/X11
+Group: System/X11
+Url: http://xorg.freedesktop.org
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Requires: XORG_ABI_XINPUT = %get_xorg_abi_xinput
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires(Pre): xorg-sdk xorg-util-macros
+BuildRequires: libmtdev-devel libXi-devel xorg-kbproto-devel xorg-randrproto-devel xorg-xproto-devel
+BuildRequires: xorg-resourceproto-devel xorg-scrnsaverproto-devel
+
+%description
+joystick is an Xorg input driver
+
+%prep
+%setup -q
+
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+ --with-xorg-module-dir=%_x11modulesdir \
+ --disable-static
+
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+%files
+%_x11modulesdir/input/*.so
+%_man4dir/*.4*
+
+%changelog
+* Thu Nov 26 2015 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.2-alt5
+- requires XORG_ABI_XINPUT = 22.1
+
+* Fri Oct 10 2014 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.2-alt4
+- requires XORG_ABI_XINPUT = 21.0
+
+* Fri Jan 31 2014 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.2-alt3
+- requires XORG_ABI_XINPUT = 20.0
+
+* Wed Mar 06 2013 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.2-alt2
+- requires XORG_ABI_XINPUT = 19.1
+
+* Fri Jan 18 2013 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.2-alt1
+- 1.6.2
+
+* Sun Mar 25 2012 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.1-alt1
+- 1.6.1
+
+* Mon Aug 29 2011 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.0-alt2
+- requires XORG_ABI_XINPUT = 13.0
+
+* Thu Apr 28 2011 Valery Inozemtsev <shrek@altlinux.ru> 1:1.6.0-alt1
+- 1.6.0
+
+* Wed Dec 08 2010 Valery Inozemtsev <shrek@altlinux.ru> 1:1.5.0-alt3
+- requires XORG_ABI_XINPUT = 12.0
+
+* Sun Aug 22 2010 Valery Inozemtsev <shrek@altlinux.ru> 1:1.5.0-alt2
+- requires XORG_ABI_XINPUT = 11.0
+
+* Sun Nov 01 2009 Valery Inozemtsev <shrek@altlinux.ru> 1:1.5.0-alt1
+- 1.5.0
+
+* Thu Oct 08 2009 Valery Inozemtsev <shrek@altlinux.ru> 1:1.4.99.2-alt1
+- 1.4.99.2
+
+* Thu Feb 26 2009 Valery Inozemtsev <shrek@altlinux.ru> 1:1.4.0-alt2
+- requires XORG_ABI_XINPUT = 4.0
+
+* Wed Jan 07 2009 Valery Inozemtsev <shrek@altlinux.ru> 1:1.4.0-alt1
+- 1.4.0
+
+* Sat Sep 06 2008 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.3-alt1
+- 1.3.3
+
+* Wed Aug 27 2008 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.2-alt3
+- requires XORG_ABI_XINPUT = 2.1
+
+* Tue Jun 03 2008 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.2-alt2
+- renamed xorg-x11-drv-joystick to xorg-drv-joystick
+- added requires XORG_ABI_XINPUT = 2.0
+
+* Mon Apr 28 2008 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.2-alt1
+- 1.3.1
+
+* Sat Dec 08 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.1-alt1
+- 1.3.1
+
+* Sat Oct 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.3.0-alt1
+- 1.3.0
+
+* Mon Sep 10 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.2.3-alt2
+- rebuild with xorg-server-1.4
+
+* Thu Aug 16 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.2.3-alt1
+- 1.2.3
+
+* Sun Apr 01 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.2.0-alt1
+- 1.2.0
+
+* Tue Mar 13 2007 Valery Inozemtsev <shrek@altlinux.ru> 1:1.1.1-alt1
+- 1.1.1
+
+* Sat May 13 2006 Valery Inozemtsev <shrek@altlinux.ru> 1:1.1.0-alt1
+- 1.1.0
+
+* Wed Dec 28 2005 Valery Inozemtsev <shrek@altlinux.ru> 1:1.0.0.5-alt1
+- Xorg-7.0
+
+* Sun Dec 04 2005 Valery Inozemtsev <shrek@altlinux.ru> 1.0.0.3-alt1
+- Xorg-7.0RC3
+
+* Sun Nov 27 2005 Valery Inozemtsev <shrek@altlinux.ru> 1.0.0.2-alt0.1
+- initial release
+