[arch-commits] Commit in xf86-input-joystick/repos (5 files)
Date: Sunday, February 12, 2012 @ 04:44:08
Author: andyrtr
Revision: 150007
db-move: moved xf86-input-joystick from [staging] to [testing] (i686)
Added:
xf86-input-joystick/repos/testing-i686/
xf86-input-joystick/repos/testing-i686/50-joystick.conf
(from rev 149988, xf86-input-joystick/repos/staging-i686/50-joystick.conf)
xf86-input-joystick/repos/testing-i686/PKGBUILD
(from rev 149988, xf86-input-joystick/repos/staging-i686/PKGBUILD)
xf86-input-joystick/repos/testing-i686/git-fixes.patch
(from rev 149988, xf86-input-joystick/repos/staging-i686/git-fixes.patch)
Deleted:
xf86-input-joystick/repos/staging-i686/
--+
50-joystick.conf |6
PKGBUILD | 40 +
git-fixes.patch | 399 +
3 files changed, 445 insertions(+)
Copied: xf86-input-joystick/repos/testing-i686/50-joystick.conf (from rev
149988, xf86-input-joystick/repos/staging-i686/50-joystick.conf)
===
--- testing-i686/50-joystick.conf (rev 0)
+++ testing-i686/50-joystick.conf 2012-02-12 09:44:08 UTC (rev 150007)
@@ -0,0 +1,6 @@
+Section InputClass
+ Identifier joystick catchall
+ MatchIsJoystick on
+ MatchDevicePath /dev/input/event*
+ Driver joystick
+EndSection
Copied: xf86-input-joystick/repos/testing-i686/PKGBUILD (from rev 149988,
xf86-input-joystick/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-02-12 09:44:08 UTC (rev 150007)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-input-joystick
+pkgver=1.6.0
+pkgrel=4
+pkgdesc=X.Org Joystick input driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.902')
+conflicts=('xorg-server1.11.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch
+50-joystick.conf)
+sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
+ '7812a34013a2333641bd7c5d044c46179490cb32'
+ 'e1ff3699a0470c6bb78a53f718df9d8521621e11')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ install -m755 -d ${pkgdir}/etc/X11/xorg.conf.d
+ install -m644 ${srcdir}/50-joystick.conf ${pkgdir}/etc/X11/xorg.conf.d/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}
Copied: xf86-input-joystick/repos/testing-i686/git-fixes.patch (from rev
149988, xf86-input-joystick/repos/staging-i686/git-fixes.patch)
===
--- testing-i686/git-fixes.patch(rev 0)
+++ testing-i686/git-fixes.patch2012-02-12 09:44:08 UTC (rev 150007)
@@ -0,0 +1,399 @@
+From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
+From: Terry Lambert tlamb...@chromium.org
+Date: Sat, 16 Jul 2011 00:23:22 +
+Subject: Return proper default for unknown values in pInfo-device_control.
+
+Signed-off-by: Terry Lambert tlamb...@chromium.org
+Reviewed-by: Stephane Marchesin marc...@chromium.org
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/src/jstk.c b/src/jstk.c
+index ec6b79a..6db0e7c 100644
+--- a/src/jstk.c
b/src/jstk.c
+@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
+
+ default:
+ ErrorF(unsupported mode=%d\n, what);
+-return !Success;
+-break;
++return BadValue;
+ } /* switch (what) */
+ return Success;
+ }
+diff --git a/src/jstk_key.c b/src/jstk_key.c
+index 3c471ce..d699dcd 100644
+--- a/src/jstk_key.c
b/src/jstk_key.c
+@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev,
+ DBG(2, ErrorF(jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n));
+ dev-public.on = FALSE;
+ break;
++default:
++return BadValue;
+ }
+
+ return Success;
+--
+cgit v0.9.0.2-2-gbebe
+From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
+From: Devin J. Pohly djpohly+x...@gmail.com
+Date: Sat, 03 Sep 2011 23:00:07 +
+Subject: unify capitalization of joystick properties
+
+the axis keys high/low properties were inconsistently capitalized,
+leading to potential confusion as to why one works but not the other.
+
+Signed-off-by: Devin J. Pohly djpohly+x...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/include/joystick-properties.h b/include/joystick-properties.h
+index 49ef800..36f4082
[arch-commits] Commit in xf86-input-joystick/repos (5 files)
Date: Sunday, February 12, 2012 @ 04:44:09
Author: andyrtr
Revision: 150008
db-move: moved xf86-input-joystick from [staging] to [testing] (x86_64)
Added:
xf86-input-joystick/repos/testing-x86_64/
xf86-input-joystick/repos/testing-x86_64/50-joystick.conf
(from rev 149988, xf86-input-joystick/repos/staging-x86_64/50-joystick.conf)
xf86-input-joystick/repos/testing-x86_64/PKGBUILD
(from rev 149988, xf86-input-joystick/repos/staging-x86_64/PKGBUILD)
xf86-input-joystick/repos/testing-x86_64/git-fixes.patch
(from rev 149988, xf86-input-joystick/repos/staging-x86_64/git-fixes.patch)
Deleted:
xf86-input-joystick/repos/staging-x86_64/
--+
50-joystick.conf |6
PKGBUILD | 40 +
git-fixes.patch | 399 +
3 files changed, 445 insertions(+)
Copied: xf86-input-joystick/repos/testing-x86_64/50-joystick.conf (from rev
149988, xf86-input-joystick/repos/staging-x86_64/50-joystick.conf)
===
--- testing-x86_64/50-joystick.conf (rev 0)
+++ testing-x86_64/50-joystick.conf 2012-02-12 09:44:09 UTC (rev 150008)
@@ -0,0 +1,6 @@
+Section InputClass
+ Identifier joystick catchall
+ MatchIsJoystick on
+ MatchDevicePath /dev/input/event*
+ Driver joystick
+EndSection
Copied: xf86-input-joystick/repos/testing-x86_64/PKGBUILD (from rev 149988,
xf86-input-joystick/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-12 09:44:09 UTC (rev 150008)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-input-joystick
+pkgver=1.6.0
+pkgrel=4
+pkgdesc=X.Org Joystick input driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.902')
+conflicts=('xorg-server1.11.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch
+50-joystick.conf)
+sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
+ '7812a34013a2333641bd7c5d044c46179490cb32'
+ 'e1ff3699a0470c6bb78a53f718df9d8521621e11')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ install -m755 -d ${pkgdir}/etc/X11/xorg.conf.d
+ install -m644 ${srcdir}/50-joystick.conf ${pkgdir}/etc/X11/xorg.conf.d/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}
Copied: xf86-input-joystick/repos/testing-x86_64/git-fixes.patch (from rev
149988, xf86-input-joystick/repos/staging-x86_64/git-fixes.patch)
===
--- testing-x86_64/git-fixes.patch (rev 0)
+++ testing-x86_64/git-fixes.patch 2012-02-12 09:44:09 UTC (rev 150008)
@@ -0,0 +1,399 @@
+From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
+From: Terry Lambert tlamb...@chromium.org
+Date: Sat, 16 Jul 2011 00:23:22 +
+Subject: Return proper default for unknown values in pInfo-device_control.
+
+Signed-off-by: Terry Lambert tlamb...@chromium.org
+Reviewed-by: Stephane Marchesin marc...@chromium.org
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/src/jstk.c b/src/jstk.c
+index ec6b79a..6db0e7c 100644
+--- a/src/jstk.c
b/src/jstk.c
+@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
+
+ default:
+ ErrorF(unsupported mode=%d\n, what);
+-return !Success;
+-break;
++return BadValue;
+ } /* switch (what) */
+ return Success;
+ }
+diff --git a/src/jstk_key.c b/src/jstk_key.c
+index 3c471ce..d699dcd 100644
+--- a/src/jstk_key.c
b/src/jstk_key.c
+@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev,
+ DBG(2, ErrorF(jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n));
+ dev-public.on = FALSE;
+ break;
++default:
++return BadValue;
+ }
+
+ return Success;
+--
+cgit v0.9.0.2-2-gbebe
+From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
+From: Devin J. Pohly djpohly+x...@gmail.com
+Date: Sat, 03 Sep 2011 23:00:07 +
+Subject: unify capitalization of joystick properties
+
+the axis keys high/low properties were inconsistently capitalized,
+leading to potential confusion as to why one works but not the other.
+
+Signed-off-by: Devin J. Pohly djpohly+x...@gmail.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/include/joystick-properties.h
