Re: Bug#827335: evince: assertion failed: (wayland_display->cursor_theme_name)
Hi,
Michael Biebl:
+ owner /{,var/}run/user/*/weston-shared-* rw,
I've run into this bug myself last month and submitted a pull request
to AppArmor upstream that does basically that, except I do it by
introducing a new 'wayland' abstraction, that I include in the 'gnome'
one:
https://code.launchpad.net/~intrigeri/apparmor/wayland/+merge/305422
I've just poked upstream about it.
If you're in a hurry, patching /etc/apparmor.d/usr.bin.evince as
proposed on this bug (quoted above) should be a fine
temporary solution.
Cheers,
--
intrigeri
Bug#832594: libinput10: Thinkpad middle mouse not functioning properly, appears to be libinput10 issue
Does this help: $ xinput set-prop "TPPS/2 IBM TrackPoint" "libinput Button Scrolling Button" 0 libinput 1.5 appears to enable scroll wheel emulation for the middle button by default. I recently hit a similar issue after a jessie -> stretch upgrade. Ross
Re: libxfont_2.0.1-1_amd64.changes REJECTED
On Thu, Oct 13, 2016 at 18:00:08 +, Thorsten Alteholz wrote: > > Hi Timo, > > can you please take care of: > E: libxfont source: no-human-maintainers > This is not new, it's how most debian-x packages are today, see https://lintian.debian.org/tags/no-human-maintainers.html and bug #798476, I don't believe this is a reason to reject. Cheers, Julien
libxfont_2.0.1-1_amd64.changes REJECTED
Hi Timo, can you please take care of: E: libxfont source: no-human-maintainers Thanks! Thorsten === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
xserver-xorg-input-evdev: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/compat|2 +-
debian/control | 12 ++--
debian/copyright |2 +-
debian/rules |2 +-
5 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 327a5548e2319486c2d97623e2f902aae7d6c8ac
Author: Andreas Boll
Date: Thu Oct 13 15:45:28 2016 +0200
Bump Standards-Version to 3.9.8, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index 4d258b5..8133c2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-evdev (1:2.10.4-1) UNRELEASED; urgency=medium
* Update a bunch of URLs in packaging to https.
* Bump debhelper compat level to 9.
* Remove obsolete XC- prefix.
+ * Bump Standards-Version to 3.9.8, no changes needed.
-- Emilio Pozuelo Monfort Sun, 09 Oct 2016 21:50:02 +0200
diff --git a/debian/control b/debian/control
index b9950ae..ea34d15 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
libudev-dev,
libmtdev-dev,
libevdev-dev (>= 1.2.2+dfsg-1~),
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev.git
Vcs-Browser:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev.git
commit b1a2b7f31b4e24e513f1400510727de4ad6ca955
Author: Andreas Boll
Date: Thu Oct 13 15:44:58 2016 +0200
Remove obsolete XC- prefix.
diff --git a/debian/changelog b/debian/changelog
index b4b90ff..4d258b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-evdev (1:2.10.4-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
* Update a bunch of URLs in packaging to https.
* Bump debhelper compat level to 9.
+ * Remove obsolete XC- prefix.
-- Emilio Pozuelo Monfort Sun, 09 Oct 2016 21:50:02 +0200
diff --git a/debian/control b/debian/control
index 32e3312..b9950ae 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: X.Org X server -- evdev input driver
This package is built from the X.org xf86-input-evdev driver module.
Package: xserver-xorg-input-evdev-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
Section: debian-installer
Architecture: linux-any
Depends:
commit 6f0fccd966c2709140fe822035daf79432c9c2d0
Author: Andreas Boll
Date: Thu Oct 13 15:44:08 2016 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 9b37456..b4b90ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-input-evdev (1:2.10.4-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
* Update a bunch of URLs in packaging to https.
+ * Bump debhelper compat level to 9.
-- Emilio Pozuelo Monfort Sun, 09 Oct 2016 21:50:02 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index d1d6d16..32e3312 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
quilt,
diff --git a/debian/rules b/debian/rules
index 5e790de..5a3f503 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
override_dh_auto_configure:
dh_auto_configure -- --disable-silent-rules \
-$(shell dpkg-buildflags --export=configure)
+ --libdir=\$${exec_prefix}/lib
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
commit 398d7221cd5c16e5b0870f61bc6e5effe8741f8e
Author: Andreas Boll
Date: Thu Oct 13 15:42:47 2016 +0200
Update a bunch of URLs in packaging to https.
diff --git a/debian/changelog b/debian/changelog
index ec51e23..9b37456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xserver-xorg-input-evdev (1:2.10.4-1) UNRELEASED; urgency=medium
+ [ Emilio Pozuelo Monfort ]
* New upstream release.
+ [ Andreas Boll ]
+ * Update a bunch of URLs in packaging to https.
+
-- Emilio Pozuelo Monfort Sun, 09 Oct 2016 21:50:02 +0200
xserver-xorg-input-evdev (1:2.10.3-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f5cb4ab..d1d6d16 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X.Org X server -- evdev input driver
and mice to be treated as separate input devices.
.
More information about X.Org can be found at:
- http://www.X.org>
+ https://www.X.org>
.
This package is built from the X.org xf86-input-evdev driver module.
@@ -67,7 +67,7 @@ Description: X.Org X server -- evdev input driver
(development headers)
for this package.
.
More information about X.Org can be found at:
- http://www.X.org>
+ https://www.X.org>
.
This package is built from the X.org xf86-input-evdev driver module.
@@ -84,7 +84,7 @@ Description: X.Org X server -- evdev input d
xserver-xorg-input-synaptics: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor: commit 75eb73d6104e0d67f19cb435b42deb73a7be92d2 Author: Andreas Boll Date: Thu Oct 13 15:39:37 2016 +0200 Bump Standards-Version to 3.9.8, no changes needed. diff --git a/debian/changelog b/debian/changelog index 1c56d1d..df5868f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-synaptics (1.8.99.2-1) UNRELEASED; urgency=medium [ Andreas Boll ] * New upstream snapshot. * Use https URL in debian/copyright. + * Bump Standards-Version to 3.9.8, no changes needed. [ Julien Cristau ] * Use https URL in debian/watch. diff --git a/debian/control b/debian/control index 74659a8..e365680 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: quilt, xutils-dev (>= 1:7.5+4), libxtst-dev, -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics.git commit 5216a55bcc5103264a1c46eb9b6ef0226a14b811 Author: Andreas Boll Date: Thu Oct 13 15:39:07 2016 +0200 Use https URL in debian/copyright. diff --git a/debian/changelog b/debian/changelog index bef953b..1c56d1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-synaptics (1.8.99.2-1) UNRELEASED; urgency=medium [ Andreas Boll ] * New upstream snapshot. + * Use https URL in debian/copyright. [ Julien Cristau ] * Use https URL in debian/watch. diff --git a/debian/copyright b/debian/copyright index 219b077..a0aaa58 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Tue, 2 Mar 2004 11:42:05 +0100. It was downloaded from git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics. Release tarballs are available at -http://xorg.freedesktop.org/releases/individual/driver/ +https://xorg.freedesktop.org/releases/individual/driver/ Copyright (c) 1997 C. Scott Ananian Copyright (c) 1998-2000 Bruce Kalk commit 19e2a5bbdf4fd9273ff6d4ed9037d2b12e08b9b6 Author: Andreas Boll Date: Thu Oct 13 15:31:55 2016 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 7903df4..1aeefd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,31 +1,141 @@ -commit af7d8a15278a968d919bf539628281bf713f747b +commit a7d76f4275a88d98b18eed29a1ee94a70e7fa367 Author: Peter Hutterer -Date: Thu Oct 29 12:10:09 2015 +1000 +Date: Sun Oct 9 19:27:47 2016 +1000 -synaptics 1.8.3 +synaptics 1.8.99.2 Signed-off-by: Peter Hutterer -commit 3e7508ac087028f8f8e116f5279dad1ebcdc58e6 -Author: Gabriele Mazzotta -Date: Thu Aug 14 20:03:42 2014 +0200 +commit 35b9472a189c88415fed137fb4c62a5081caaea5 +Author: Peter Hutterer +Date: Thu Sep 15 13:47:09 2016 +1000 -Use cumulative relative touch movements while scrolling +Remove unused fraction calculations + +hw.x and the motion history are integers so our deltas are always integers. +It's a bit pointless to split them into the fractional and integral part. + +obsolete since defc1d008e5674306a or so + +Signed-off-by: Peter Hutterer + +commit 486322116d70365c2e2a1d9f45830057fa03153e +Author: Peter Hutterer +Date: Wed Aug 17 11:32:12 2016 +1000 + +eventcomm: don't ever probe if a device is set + +If opening the fd fails we still need to fail the device. This is particularly +the case when a device disappears before we can open it - the current code +wouldn't exit but instead switch to auto-probe touchpad devices on the system. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede + +commit cd9f9799235aefff1ec1a0af9ec6b45969119659 +Author: Anton Lindqvist +Date: Fri Aug 5 10:21:59 2016 +0200 + +syndaemon: enable touchpad when pressing a modifier combo + +When ignoring modifiers, ensure the touchpad is enabled once a modifier +key is pressed disregarding any previous key press that caused the +touchpad to be disabled. + +Signed-off-by: Anton Lindqvist +Signed-off-by: Peter Hutterer + +commit 248c5936a0151d0766a95457330c7d3ef9335b94 +Author: Peter Hutterer +Date: Thu Jun 2 10:05:02 2016 +1000 + +Support XINPUT ABI version 23 + +Use input_lock/input_unlock calls instead of SIGIO functions + +Signed-off-by: Peter Hutterer + +commit 59e5db025307404fbfbc82f2fb3fe91d6a3005d7 +Author: Stefan Dirsch +Date: Thu May 19 17:35:57 2016 +0200 + +conf: rename to 70-synaptics.conf + +Bump up the synaptics driver to 70, so it get's preferred over libinput, which +was dropped down to 60. The synaptics driver is more of a leaf package +than libinput (which covers a multitude of device types) and can be removed by +default. When specifically installed by the user, the synaptics driver should +override the system default. + +Similar to what was done for wacom configura
xserver-xorg-input-synaptics: Changes to 'upstream-experimental'
conf/50-synaptics.conf | 46 ---
conf/70-synaptics.conf | 46 +++
conf/Makefile.am |2
configure.ac |9
docs/tapndrag.dia | 522 +++--
include/synaptics-properties.h |2
man/synaptics.man |5
src/eventcomm.c| 140 --
src/eventcomm.h|2
src/properties.c |1
src/ps2comm.c |3
src/ps2comm.h |2
src/synaptics.c| 237 ++
src/synapticsstr.h |9
src/synproto.h |2
tools/synclient.c |1
tools/syndaemon.c | 50 ++-
17 files changed, 596 insertions(+), 483 deletions(-)
New commits:
commit a7d76f4275a88d98b18eed29a1ee94a70e7fa367
Author: Peter Hutterer
Date: Sun Oct 9 19:27:47 2016 +1000
synaptics 1.8.99.2
Signed-off-by: Peter Hutterer
diff --git a/configure.ac b/configure.ac
index b3d0545..970dd5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
-[1.8.99.1],
+[1.8.99.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 35b9472a189c88415fed137fb4c62a5081caaea5
Author: Peter Hutterer
Date: Thu Sep 15 13:47:09 2016 +1000
Remove unused fraction calculations
hw.x and the motion history are integers so our deltas are always integers.
It's a bit pointless to split them into the fractional and integral part.
obsolete since defc1d008e5674306a or so
Signed-off-by: Peter Hutterer
diff --git a/src/synaptics.c b/src/synaptics.c
index bdc9605..c7ba9ad 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2198,28 +2198,8 @@ static void
get_delta(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
enum EdgeType edge, double *dx, double *dy)
{
-double integral;
-double tmpf;
-
*dx = hw->x - HIST(0).x;
*dy = hw->y - HIST(0).y;
-
-/* report edge speed as synthetic motion. Of course, it would be
- * cooler to report floats than to buffer, but anyway. */
-
-/* FIXME: When these values go NaN, bad things happen. Root cause is
unknown
- * thus far though. */
-if (isnan(priv->frac_x))
-priv->frac_x = 0;
-if (isnan(priv->frac_y))
-priv->frac_y = 0;
-
-tmpf = *dx + priv->frac_x;
-priv->frac_x = modf(tmpf, &integral);
-*dx = integral;
-tmpf = *dy + priv->frac_y;
-priv->frac_y = modf(tmpf, &integral);
-*dy = integral;
}
/* Vector length, but not sqrt'ed, we only need it for comparison */
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 905b78b..33524e5 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -288,7 +288,6 @@ struct _SynapticsPrivateRec {
Bool circ_scroll_on;/* Keeps track of currently active scroll
modes */
Bool circ_scroll_vert; /* True: Generate vertical scroll events
False: Generate horizontal events */
-double frac_x, frac_y; /* absolute -> relative fraction */
enum MidButtonEmulation mid_emu_state; /* emulated 3rd button */
int repeatButtons; /* buttons for repeat */
int nextRepeat; /* Time when to trigger next auto repeat event
*/
commit 486322116d70365c2e2a1d9f45830057fa03153e
Author: Peter Hutterer
Date: Wed Aug 17 11:32:12 2016 +1000
eventcomm: don't ever probe if a device is set
If opening the fd fails we still need to fail the device. This is
particularly
the case when a device disappears before we can open it - the current code
wouldn't exit but instead switch to auto-probe touchpad devices on the
system.
Signed-off-by: Peter Hutterer
Reviewed-by: Hans de Goede
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 9c9a036..f65d532 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -1009,13 +1009,13 @@ EventAutoDevProbe(InputInfoPtr pInfo, const char
*device)
if (!(pInfo->flags & XI86_SERVER_FD))
SYSCALL(close(fd));
-
-/* if a device is set and not a touchpad (or already grabbed),
- * we must return FALSE. Otherwise, we'll add a device that
- * wasn't requested for and repeat
- * f5687a6741a19ef3081e7fd83ac55f6df8bcd5c2. */
-return touchpad_found;
}
+
+/* if a device is set and not a touchpad (or already grabbed),
+ * we must return FALSE. Otherwise, we'll add a device that
+ * wasn't requested for and repeat
+ * f5687a6741a19ef3081e7fd83ac55f6df8bcd5c2. */
+return touchpad_found;
}
i = scandir(DEV_INPUT_EVENT, &namelist, EventDevOnly, alphasort);
commit cd9f9799235aefff1ec1a0af9ec6b4596911965
xserver-xorg-input-evdev: Changes to 'debian-unstable'
configure.ac |2 +-
debian/changelog |6 ++
src/emuMB.c | 21 -
src/emuThird.c | 13 ++---
src/evdev.c |5 -
src/evdev.h | 16 ++--
6 files changed, 47 insertions(+), 16 deletions(-)
New commits:
commit 7e3d7270e6579c6c4dd41d08090c89dc71fdad79
Author: Emilio Pozuelo Monfort
Date: Sun Oct 9 21:50:12 2016 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 733212e..ec51e23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.10.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Emilio Pozuelo Monfort Sun, 09 Oct 2016 21:50:02 +0200
+
xserver-xorg-input-evdev (1:2.10.3-1) unstable; urgency=medium
* Team upload.
commit 551db5b86e2a19e027e57571b8e5405dacb8bd67
Author: Peter Hutterer
Date: Sat Oct 1 17:48:30 2016 +1000
evdev 2.10.4
Signed-off-by: Peter Hutterer
diff --git a/configure.ac b/configure.ac
index 920154d..e4887a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
-[2.10.3],
+[2.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
commit bb8bde7456def4186f9a4a0a9f98d53c949e1450
Author: Keith Packard
Date: Tue May 31 17:52:43 2016 -0700
Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)
The evdev driver wasn't using the select mask arguments, so this
change just involves adjusting the argument lists.
Signed-off-by: Keith Packard
Signed-off-by: Peter Hutterer
diff --git a/src/emuMB.c b/src/emuMB.c
index 94e50c4..d1777aa 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -268,9 +268,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL
press)
}
-void EvdevMBEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
@@ -284,9 +282,7 @@ void EvdevMBEmuWakeupHandler(pointer data,
}
}
-void EvdevMBEmuBlockHandler(pointer data,
-struct timeval **waitTime,
-pointer LastSelectMask)
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
{
InputInfoPtrpInfo = (InputInfoPtr) data;
EvdevPtrpEvdev= (EvdevPtr) pInfo->private;
diff --git a/src/evdev.h b/src/evdev.h
index 0ebcfa0..c506296 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -71,6 +71,14 @@
#define HAVE_THREADED_INPUT1
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24
+#define BLOCK_HANDLER_ARGS void *data, void *waitTime
+#define WAKEUP_HANDLER_ARGSvoid *data, int i
+#else
+#define BLOCK_HANDLER_ARGS pointer data, struct timeval **waitTime,
pointer LastSelectMask
+#define WAKEUP_HANDLER_ARGSvoid *data, int i, pointer LastSelectMask
+#endif
+
#define EVDEV_MAXBUTTONS 32
#define EVDEV_MAXQUEUE 32
@@ -264,8 +272,8 @@ unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr
pEvdev, int code);
/* Middle Button emulation */
int EvdevMBEmuTimer(InputInfoPtr);
BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
-void EvdevMBEmuWakeupHandler(pointer, int, pointer);
-void EvdevMBEmuBlockHandler(pointer, struct timeval**, pointer);
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS);
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS);
void EvdevMBEmuPreInit(InputInfoPtr);
void EvdevMBEmuOn(InputInfoPtr);
void EvdevMBEmuFinalize(InputInfoPtr);
commit 7b1267f7f18c478d3dc34a7668eaefa402815891
Author: Keith Packard
Date: Tue May 31 17:52:42 2016 -0700
Support XINPUT ABI version 23 (threaded input)
Use input_lock/input_unlock calls instead of SIGIO functions
Signed-off-by: Keith Packard
Signed-off-by: Peter Hutterer
diff --git a/src/emuMB.c b/src/emuMB.c
index b25eac8..94e50c4 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -184,10 +184,13 @@ int
EvdevMBEmuTimer(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
-intsigstate;
int id;
-sigstate = xf86BlockSIGIO ();
+#if HAVE_THREADED_INPUT
+input_lock();
+#else
+int sigstate = xf86BlockSIGIO();
+#endif
pEvdev->emulateMB.pending = FALSE;
if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) {
@@ -200,7 +203,11 @@ EvdevMBEmuTimer(InputInfoPtr pInfo)
pEvdev->emulateMB.state);
}
-xf86UnblockSIGIO (sigstate);
+#if HAVE_THREADED_INPUT
+input_unlock();
+#else
+xf86UnblockSIGIO(sigstate);
+#endif
return 0;
}
diff --git a/src/emuThird.c b/src/emuThird.c
index 5f14d33..dd49a84 100644
--- a/src/emuThird.c
+++ b/src/emuThird.c
@@ -89,12 +89,19 @@ Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg)
xserver-xorg-input-evdev: Changes to 'upstream-unstable'
configure.ac |2 +-
src/emuMB.c| 21 -
src/emuThird.c | 13 ++---
src/evdev.c|5 -
src/evdev.h| 16 ++--
5 files changed, 41 insertions(+), 16 deletions(-)
New commits:
commit 551db5b86e2a19e027e57571b8e5405dacb8bd67
Author: Peter Hutterer
Date: Sat Oct 1 17:48:30 2016 +1000
evdev 2.10.4
Signed-off-by: Peter Hutterer
diff --git a/configure.ac b/configure.ac
index 920154d..e4887a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
-[2.10.3],
+[2.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
commit bb8bde7456def4186f9a4a0a9f98d53c949e1450
Author: Keith Packard
Date: Tue May 31 17:52:43 2016 -0700
Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)
The evdev driver wasn't using the select mask arguments, so this
change just involves adjusting the argument lists.
Signed-off-by: Keith Packard
Signed-off-by: Peter Hutterer
diff --git a/src/emuMB.c b/src/emuMB.c
index 94e50c4..d1777aa 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -268,9 +268,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL
press)
}
-void EvdevMBEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
@@ -284,9 +282,7 @@ void EvdevMBEmuWakeupHandler(pointer data,
}
}
-void EvdevMBEmuBlockHandler(pointer data,
-struct timeval **waitTime,
-pointer LastSelectMask)
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
{
InputInfoPtrpInfo = (InputInfoPtr) data;
EvdevPtrpEvdev= (EvdevPtr) pInfo->private;
diff --git a/src/evdev.h b/src/evdev.h
index 0ebcfa0..c506296 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -71,6 +71,14 @@
#define HAVE_THREADED_INPUT1
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24
+#define BLOCK_HANDLER_ARGS void *data, void *waitTime
+#define WAKEUP_HANDLER_ARGSvoid *data, int i
+#else
+#define BLOCK_HANDLER_ARGS pointer data, struct timeval **waitTime,
pointer LastSelectMask
+#define WAKEUP_HANDLER_ARGSvoid *data, int i, pointer LastSelectMask
+#endif
+
#define EVDEV_MAXBUTTONS 32
#define EVDEV_MAXQUEUE 32
@@ -264,8 +272,8 @@ unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr
pEvdev, int code);
/* Middle Button emulation */
int EvdevMBEmuTimer(InputInfoPtr);
BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
-void EvdevMBEmuWakeupHandler(pointer, int, pointer);
-void EvdevMBEmuBlockHandler(pointer, struct timeval**, pointer);
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS);
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS);
void EvdevMBEmuPreInit(InputInfoPtr);
void EvdevMBEmuOn(InputInfoPtr);
void EvdevMBEmuFinalize(InputInfoPtr);
commit 7b1267f7f18c478d3dc34a7668eaefa402815891
Author: Keith Packard
Date: Tue May 31 17:52:42 2016 -0700
Support XINPUT ABI version 23 (threaded input)
Use input_lock/input_unlock calls instead of SIGIO functions
Signed-off-by: Keith Packard
Signed-off-by: Peter Hutterer
diff --git a/src/emuMB.c b/src/emuMB.c
index b25eac8..94e50c4 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -184,10 +184,13 @@ int
EvdevMBEmuTimer(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
-intsigstate;
int id;
-sigstate = xf86BlockSIGIO ();
+#if HAVE_THREADED_INPUT
+input_lock();
+#else
+int sigstate = xf86BlockSIGIO();
+#endif
pEvdev->emulateMB.pending = FALSE;
if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) {
@@ -200,7 +203,11 @@ EvdevMBEmuTimer(InputInfoPtr pInfo)
pEvdev->emulateMB.state);
}
-xf86UnblockSIGIO (sigstate);
+#if HAVE_THREADED_INPUT
+input_unlock();
+#else
+xf86UnblockSIGIO(sigstate);
+#endif
return 0;
}
diff --git a/src/emuThird.c b/src/emuThird.c
index 5f14d33..dd49a84 100644
--- a/src/emuThird.c
+++ b/src/emuThird.c
@@ -89,12 +89,19 @@ Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg)
InputInfoPtr pInfo= (InputInfoPtr)arg;
EvdevPtr pEvdev = pInfo->private;
struct emulate3B *emu3B= &pEvdev->emulate3B;
-int sigstate = 0;
-sigstate = xf86BlockSIGIO ();
+#if HAVE_THREADED_INPUT
+input_lock();
+#else
+int sigstate = xf86BlockSIGIO();
+#endif
emu3B->state = EM3B_EMULATING;
Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS);
-xf86UnblockSIGIO (sigstate);
+#if HAVE_THREADED_INPUT
+input_unlock();
+#else
+xf86UnblockSIGIO(sigstate);
+#endif
return 0;
x11proto-core: Changes to 'debian-unstable'
ChangeLog | 61 ++ Xfuncproto.h.in | 21 +++ configure.ac|2 debian/changelog|9 + debian/control |6 debian/copyright|2 debian/upstream/signing-key.asc | 241 debian/watch|2 8 files changed, 338 insertions(+), 6 deletions(-) New commits: commit 31355ea76a52a9abcd9db5a1f6a2e894c4a4a3bc Author: Andreas Boll Date: Thu Oct 13 13:35:21 2016 +0200 Bump Standards-Version to 3.9.8, no changes needed. diff --git a/debian/changelog b/debian/changelog index bdf0e69..805b74d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11proto-core (7.0.31-1) UNRELEASED; urgency=medium * New upstream release. * Update d/upstream/signing-key.asc with Keith Packard's key. * Update a bunch of URLs in packaging to https. + * Bump Standards-Version to 3.9.8, no changes needed. -- Andreas Boll Thu, 13 Oct 2016 13:31:30 +0200 diff --git a/debian/control b/debian/control index d4a57ac..69b313e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: w3m, xsltproc, fop, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-core.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-core.git commit 93478bd291db6672eab4955b285b5f6560db4d9f Author: Andreas Boll Date: Thu Oct 13 13:35:01 2016 +0200 Update a bunch of URLs in packaging to https. diff --git a/debian/changelog b/debian/changelog index 4c56dc6..bdf0e69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11proto-core (7.0.31-1) UNRELEASED; urgency=medium * New upstream release. * Update d/upstream/signing-key.asc with Keith Packard's key. + * Update a bunch of URLs in packaging to https. -- Andreas Boll Thu, 13 Oct 2016 13:31:30 +0200 diff --git a/debian/control b/debian/control index e2f985d..d4a57ac 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: xsltproc, fop, Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/proto/x11proto-core +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-core.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-core.git Package: x11proto-core-dev @@ -31,6 +31,6 @@ Description: X11 core wire protocol and auxiliary headers used to abstract OS-specific functions. . More information about X.Org can be found at: - http://www.X.org> + https://www.X.org> . This package is built from the X.org xproto proto module. diff --git a/debian/copyright b/debian/copyright index 325dd6f..ca27f41 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was downloaded from -http://xorg.freedesktop.org/releases/individual/proto/ +https://xorg.freedesktop.org/releases/individual/proto/ Debianised by Daniel Stone . diff --git a/debian/watch b/debian/watch index 4f66143..670d179 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/proto/xproto version=3 opts=pgpsigurlmangle=s/$/.sig/ \ -http://xorg.freedesktop.org/releases/individual/proto/ xproto-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/proto/ xproto-(.*)\.tar\.gz commit 547ad6e8997ceb10100c4b63b33aa263f491e11d Author: Andreas Boll Date: Thu Oct 13 13:33:42 2016 +0200 Update d/upstream/signing-key.asc with Keith Packard's key. diff --git a/debian/changelog b/debian/changelog index 13a987f..4c56dc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-core (7.0.31-1) UNRELEASED; urgency=medium * New upstream release. + * Update d/upstream/signing-key.asc with Keith Packard's key. -- Andreas Boll Thu, 13 Oct 2016 13:31:30 +0200 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 9daf656..6d871be 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -237,3 +237,244 @@ p+wud/eWrFQvnxls5hB78UTAMXgsnQhFZeba24UM76ruHWX1aJl1j7YtZrKkSB5D RFczHk65xOzyEL2QBacv2vfoakwE =NonH -END PGP PUBLIC KEY BLOCK- +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBE9iNskBEAC4ZlqFgnzmpGeN2MOk6dvxs3UQFEHycoNVxCb+KPF3R0q4ZTt/ +Qdmjg5ut3I6D+LshJoPPIajOp3Csm8Jjue8xWNY0HVN7/d+Nhok+6FAtD+H22hUz +rGxWfUTCmga1oLwxRjptSZeAUb/EFRzvaALB9JUt///VerzDUuuMttJ6gPNMo7+f +EOknT8fmRuxTT8Fa9o8/XJ0nDVKnEZfXMq+kaxFwRl7D/PfFSxzjOVvLDZYJ5gNT +qW/2e4YJCTAQWhWAOWYpUjuG+UsYc2m1xyt8Xoe1JOz0uD9sVypQgNt6iRKGG4QZ +R43SlKvJnp5LJVemiQAJydxb3Yh3aU64GT5p/nV9lU26+iycFVwpxWEpH4z/3lUj +HaaI2dM9JvTrcjeBmsLRUC32SwI2MjFiLwKa22Kzfp02w02s2XSw9m8jYkwUzHln +UAesFIwYXivckAf6ULSaMe8x22XtvXRmHdOy/q/uTC7i2JR33VEm0zNxSZRWTsX/ +sv0BETjNE525iz9sLAGmt60vThkO6zt8ke0A6lCekLUsi3rzok21oFqSnasJNXUY +eVOAW3LisGRrPBXHUPoztyB9n7OpC2xbBep2ce/Y4zBjHZZUngBZXxXj92X2CRSo +qezlP2c
x11proto-core: Changes to 'upstream-unstable'
Xfuncproto.h.in | 21 + configure.ac|2 +- 2 files changed, 22 insertions(+), 1 deletion(-) New commits: commit f3b7b856777500113cee524dbd295fcbbce11fab Author: Keith Packard Date: Fri Sep 23 09:49:36 2016 +0300 xproto 7.0.31 Signed-off-by: Keith Packard diff --git a/configure.ac b/configure.ac index 0b002fd..2b91a9d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.30], +AC_INIT([Xproto], [7.0.31], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit d59bd3ade1a8430282c3395d5f5b22ebaa339976 Author: Keith Packard Date: Fri Sep 23 02:35:36 2016 +0300 Fix typo __has_extenstion -> __has_extension Signed-off-by: Keith Packard Reviewed-by: Jeremy Huddleston Sequoia diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 8715c9d..b88493d 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -83,7 +83,7 @@ in this Software without prior written authorization from The Open Group. # define __has_feature(x) 0/* Compatibility with non-clang compilers. */ #endif #ifndef __has_extension -# define __has_extenstion(x) 0 /* Compatibility with non-clang compilers. */ +# define __has_extension(x) 0 /* Compatibility with non-clang compilers. */ #endif /* Added in X11R6.9, so available in any version of modular xproto */ commit bd3832a988c34304b54ba3bbab5befb3dbcae90d Author: Jeremy Huddleston Sequoia Date: Thu Sep 22 14:31:11 2016 -0700 xproto 7.0.30 Signed-off-by: Jeremy Huddleston Sequoia diff --git a/configure.ac b/configure.ac index bc6409a..0b002fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.29], +AC_INIT([Xproto], [7.0.30], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit ad959de4f4fd821cf95522994395ad668eb6756f Author: Jeremy Huddleston Sequoia Date: Mon Sep 19 13:17:39 2016 -0700 Xfuncproto: Add support for _X_NOTSAN macro Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Keith Packard diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 8a9530a..8715c9d 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -210,4 +210,11 @@ in this Software without prior written authorization from The Open Group. # endif #endif +/* requires xproto >= 7.0.30 */ +#if __has_attribute(no_sanitize_thread) +# define _X_NOTSAN __attribute__((no_sanitize_thread)) +#else +# define _X_NOTSAN +#endif + #endif /* _XFUNCPROTO_H_ */ commit 9a9382de9036fc0f3bee4d340c7dd234c424 Author: Jeremy Huddleston Sequoia Date: Mon Sep 19 13:14:34 2016 -0700 Xfuncproto: Add support for _X_DEPRECATED_MSG() macro Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Keith Packard diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 7f06e99..8a9530a 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -137,6 +137,14 @@ in this Software without prior written authorization from The Open Group. # define _X_DEPRECATED #endif +/* requires xproto >= 7.0.30 */ +#if __has_extension(attribute_deprecated_with_message) || \ +(defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5 +# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg))) +#else +# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED +#endif + /* requires xproto >= 7.0.17 */ #if __has_attribute(noreturn) \ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ commit 34a95f725c200b9aedc8c634851474d9bcce712e Author: Jeremy Huddleston Sequoia Date: Mon Sep 19 13:12:35 2016 -0700 Xfuncproto.h: Define __has_extension() if it isn't already Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Keith Packard diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 8556c27..7f06e99 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -82,6 +82,9 @@ in this Software without prior written authorization from The Open Group. #ifndef __has_feature # define __has_feature(x) 0/* Compatibility with non-clang compilers. */ #endif +#ifndef __has_extension +# define __has_extenstion(x) 0 /* Compatibility with non-clang compilers. */ +#endif /* Added in X11R6.9, so available in any version of modular xproto */ #if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4)) commit 4855c9229f00927a343f563db58e261db8a187fa Author: Jeremy Huddleston Sequoia Date: Mon Sep 19 13:10:34 2016 -0700 Xfuncproto.h: Define __has_feature() if it isn't already Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Keith Packard diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 5daa83e..8556c27 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -79,6 +79,9 @@ in this Software without prior written authorization from The Open Group. #ifndef __has_attribute # define __has_attribute(
xserver-xorg-video-freedreno: Changes to 'debian-unstable'
debian/changelog |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit ffc000e60af0f2ef5f42778c44fedad939e7a73f Author: Maarten Lankhorst Date: Mon Feb 8 14:57:54 2016 +0100 release to unstable diff --git a/debian/changelog b/debian/changelog index f818ed0..5bedcc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -xserver-xorg-video-freedreno (1.4.0-1) UNRELEASED; urgency=medium +xserver-xorg-video-freedreno (1.4.0-1) unstable; urgency=medium - * Non-maintainer upload. * New upstream release. (Closes: #812384) * Build on arm64. (Closes: #812385)
