xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog | 10 ++++++
debian/control | 7 +---
debian/patches/series | 1
debian/patches/support-new-api.diff | 58 ++++++++++++++++++++++++++++++++++++
debian/watch | 2 -
5 files changed, 73 insertions(+), 5 deletions(-)
New commits:
commit 27dba58ed7a0d8d984504f7c2ab7435ba6b83257
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 17 16:35:07 2016 +0200
upload to sid
diff --git a/debian/changelog b/debian/changelog
index c35ed4d..0f9a13d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
+xserver-xorg-input-joystick (1:1.6.2-2) unstable; urgency=medium
* support-new-api.diff: Fix build with xserver 1.19.
* Use https URLs in Vcs-* control fields.
@@ -6,7 +6,7 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.8.
* control: Remove Drew and Cyril from uploaders.
- -- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:34:47 +0200
xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low
commit fdeda3e9ed0cff730cfb3ec39e8b666eaace5e5c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 17 16:30:32 2016 +0200
Bump Standards-Version to 3.9.8.
* Bump Standards-Version to 3.9.8.
* control: Remove Drew and Cyril from uploaders.
diff --git a/debian/changelog b/debian/changelog
index 47aa3e3..c35ed4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
* support-new-api.diff: Fix build with xserver 1.19.
* Use https URLs in Vcs-* control fields.
* Use https URL in watch file.
+ * Bump Standards-Version to 3.9.8.
+ * control: Remove Drew and Cyril from uploaders.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
diff --git a/debian/control b/debian/control
index 06dbeff..bb75dbc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-input-joystick
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
@@ -15,7 +14,7 @@ Build-Depends:
x11proto-randr-dev,
x11proto-kb-dev,
libusbhid-dev [kfreebsd-any],
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git
commit a79ef7a9bdeaaa0a31ed38a6c93598a4728a3501
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 17 16:29:13 2016 +0200
Use https URL in watch file.
diff --git a/debian/changelog b/debian/changelog
index d3bd70f..47aa3e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
* support-new-api.diff: Fix build with xserver 1.19.
* Use https URLs in Vcs-* control fields.
+ * Use https URL in watch file.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
diff --git a/debian/watch b/debian/watch
index ed92f0a..4ecc980 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick
version=3
-http://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz
commit 9bb757131c87b3b28cf5987de22da293cc297ba9
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 17 16:28:57 2016 +0200
Use https URLs in Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index ffed023..d3bd70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
* support-new-api.diff: Fix build with xserver 1.19.
+ * Use https URLs in Vcs-* control fields.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
diff --git a/debian/control b/debian/control
index f77f7cc..06dbeff 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends:
x11proto-kb-dev,
libusbhid-dev [kfreebsd-any],
Standards-Version: 3.9.4
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git
Package: xserver-xorg-input-joystick
Architecture: any
commit d311cf6459b79fe93fc0cc7db3c7b793b371deeb
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 17 16:28:19 2016 +0200
support-new-api.diff: Fix build with xserver 1.19.
diff --git a/debian/changelog b/debian/changelog
index fdac6af..ffed023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
+
+ * support-new-api.diff: Fix build with xserver 1.19.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
+
xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low
[ Michele Cane ]
diff --git a/debian/patches/series b/debian/patches/series
index f047877..258f787 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-includes-for-kfreebsd.diff
+support-new-api.diff
diff --git a/debian/patches/support-new-api.diff b/debian/patches/support-new-api.diff
new file mode 100644
index 0000000..1b2356c
--- /dev/null
+++ b/debian/patches/support-new-api.diff
@@ -0,0 +1,58 @@
+--- a/src/jstk.c
++++ b/src/jstk.c
+@@ -61,6 +61,10 @@
+ char debug_level = 0;
+ #endif
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
++#define HAVE_THREADED_INPUT 1
++#endif
++
+ /*
+ ***************************************************************************
+ *
+@@ -124,8 +128,13 @@ jstkReadProc(InputInfoPtr pInfo)
+ ((r=priv->read_proc(priv, &event, &number))==0)) {
+ xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating device.\n");
+
+- if (pInfo->fd >= 0)
+- RemoveEnabledDevice(pInfo->fd);
++ if (pInfo->fd >= 0) {
++#if HAVE_THREADED_INPUT
++ xf86RemoveEnabledDevice(pInfo);
++#else
++ RemoveEnabledDevice(pInfo->fd);
++#endif
++ }
+ return;
+ }
+
+@@ -392,7 +401,11 @@ jstkDeviceControlProc(DeviceIntPtr
+ if (jstkOpenDevice(priv, FALSE) != -1) {
+ pJstk->public.on = TRUE;
+ pInfo->fd = priv->fd;
+- AddEnabledDevice(pInfo->fd);
++#if HAVE_THREADED_INPUT
++ xf86AddEnabledDevice(pInfo);
++#else
++ AddEnabledDevice(pInfo->fd);
++#endif
+ } else return !Success;
+ break;
+
+@@ -414,8 +427,13 @@ jstkDeviceControlProc(DeviceIntPtr
+ TimerCancel(priv->axis[i].timer);
+ }
+
+- if (pInfo->fd >= 0)
+- RemoveEnabledDevice(pInfo->fd);
++ if (pInfo->fd >= 0) {
++#if HAVE_THREADED_INPUT
++ xf86RemoveEnabledDevice(pInfo);
++#else
++ RemoveEnabledDevice(pInfo->fd);
++#endif
++ }
+ pInfo->fd = -1;
+ if (priv->close_proc)
+ priv->close_proc(priv);
Reply to: