Processed: jessie
Processing commands for cont...@bugs.debian.org: tags 715278 + sid jessie Bug #715278 [intel-gpu-tools] intel-gpu-tools: Couldn't map MMIO region: Resource temporarily unavailable on intel_reg_read, after dist-upgrade Added tag(s) sid and jessie. thanks Stopping processing here. Please contact me if you need assistance. -- 715278: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715278 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.13744004246714.transcr...@bugs.debian.org
xserver-xorg-input-keyboard: Changes to 'debian-unstable'
ChangeLog | 100 ++ autogen.sh|4 +- configure.ac |5 +- debian/changelog |8 debian/control|4 +- man/kbd.man |2 - src/Makefile.am |1 src/at_scancode.c |4 +- src/kbd.c | 23 +++- src/sun_kbd.c | 30 +--- src/xf86OSKbd.h |4 ++ 11 files changed, 162 insertions(+), 23 deletions(-) New commits: commit 8149603e5bef33a876e85b93014fde78a5892191 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 14:59:29 2013 +0200 Build against Xserver 1.14 diff --git a/debian/changelog b/debian/changelog index ccb8391..648530e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-keyboard (1:1.7.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14 -- Michele Cane michele.c...@gmail.com Wed, 10 Jul 2013 10:42:00 +0200 diff --git a/debian/control b/debian/control index 6aa98af..0c86f10 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (= 2:1.9.99.902), + xserver-xorg-dev (= 2:1.14), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, commit 5a683a485c3dea27cb808553ec76e913d7a0ac7c Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 09:44:27 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 5a303da..ccb8391 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-keyboard (1:1.7.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Wed, 10 Jul 2013 10:42:00 +0200 diff --git a/debian/control b/debian/control index 2907da9..6aa98af 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: x11proto-randr-dev, quilt, xutils-dev (= 1:7.5+4) -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-keyboard Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyboard.git commit 1bdb1ce5a829b97eb7c5f304701b9d2a05a4c44d Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 10 15:21:56 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index c87d775..f64b918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,103 @@ +commit ec3ccb22d4e7348ac537100fcb1b7ddc07df57b8 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Mar 27 11:13:18 2013 +1000 + +keyboard 1.7.0 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit ad2a1dd1aa1eb777f330242d46254b29b9cb +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Fri Aug 17 14:07:12 2012 +1000 + +Use sigsafe logging for keyboard debug messages + +This changes the log format to simple hex display, the server's signal-safe +printf implementation doesn't handle %2.2x. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 4a954bc6a8fbc4aa50dfcabec011274252713204 +Author: Colin Walters walt...@verbum.org +Date: Wed Jan 4 17:37:06 2012 -0500 + +autogen.sh: Implement GNOME Build API + +http://people.gnome.org/~walters/docs/build-api.txt + +Signed-off-by: Adam Jackson a...@redhat.com + +commit 9522f28a8f90680942e42902678c963c6981b0d1 +Author: Adam Jackson a...@redhat.com +Date: Wed Jan 16 13:11:11 2013 -0500 + +configure: Drop AM_MAINTAINER_MODE + +Signed-off-by: Adam Jackson a...@redhat.com + +commit 6e51df6dd4255cbe311ec98e21a1cc94975271a1 +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Mon Jul 23 22:04:45 2012 -0700 + +xf86-input-keyboard 1.6.2 + +Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit 8d3edb688115d3100d7ac6fa9ed407494e435c43 +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Thu May 24 21:36:17 2012 -0700 + +Link with $(XORG_LIBS) to support no-undefined linking + +Will be empty on most platforms, set to the -z parent=Xorg flag on +Solaris if building with the support for enforcing no undefined symbols. + +Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit dd6f110c4568dc0922bae47530906b01396e2d41 +Author: François Tigeot ftig...@wolfpond.org +Date: Sat May 5 13:12:10 2012 +0200 + +Recognize DragonFly as a BSD system. + +This patch has actually been present for more than 4 years in the +pkgsrc tree. + +Originally-from: Jörg Sonnenberger +Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit da5ccb256acf6cbb817d68499e0d9f533f750628 +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Mon Apr 30 19:34:44 2012 -0700 + +Solaris: ensure
xserver-xorg-input-keyboard: Changes to 'upstream-unstable'
autogen.sh|4 +++-
configure.ac |5 ++---
man/kbd.man |2 +-
src/Makefile.am |1 +
src/at_scancode.c |4 ++--
src/kbd.c | 23 +--
src/sun_kbd.c | 30 ++
src/xf86OSKbd.h |4
8 files changed, 52 insertions(+), 21 deletions(-)
New commits:
commit ec3ccb22d4e7348ac537100fcb1b7ddc07df57b8
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Mar 27 11:13:18 2013 +1000
keyboard 1.7.0
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 68b1b9e..c699f6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-keyboard],
-[1.6.2],
+[1.7.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-keyboard])
AC_CONFIG_SRCDIR([Makefile.am])
commit ad2a1dd1aa1eb777f330242d46254b29b9cb
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Fri Aug 17 14:07:12 2012 +1000
Use sigsafe logging for keyboard debug messages
This changes the log format to simple hex display, the server's signal-safe
printf implementation doesn't handle %2.2x.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/at_scancode.c b/src/at_scancode.c
index 7209c20..a519a6c 100644
--- a/src/at_scancode.c
+++ b/src/at_scancode.c
@@ -112,8 +112,8 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
case 0x36:
return TRUE;
default:
- xf86MsgVerb(X_INFO, 4, Unreported Prefix0 scancode:
0x%02x\n,
-*scanCode);
+ LogMessageVerbSigSafe(X_INFO, 4, Unreported Prefix0
scancode: 0x%x\n,
+ *scanCode);
*scanCode += 0x78;
}
break;
diff --git a/src/kbd.c b/src/kbd.c
index 94523aa..9a013b7 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -410,9 +410,9 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode,
Bool down)
int state;
#ifdef DEBUG
- ErrorF(kbd driver rec scancode: 0x02%x %s\n, scanCode, down?down:up);
+ LogMessageVerbSigSafe(X_INFO, -1, kbd driver rec scancode: 0x%x %s\n,
scanCode, down ? down : up);
#endif
-
+
/*
* First do some special scancode remapping ...
*/
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index f1e530e..2e7add6 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -459,20 +459,22 @@ ReadInput(InputInfoPtr pInfo)
case EINTR: /* Interrupted, try again */
break;
case ENODEV: /* May happen when USB kbd is unplugged */
- /* We use X_NONE here because it doesn't alloc since we
- may be called from SIGIO handler */
- xf86MsgVerb(X_NONE, 0,
- %s: Device no longer present - removing.\n,
- pInfo-name);
+ /* We use X_NONE here because it didn't alloc since we
+ may be called from SIGIO handler. No longer true for
+ sigsafe logging, but matters for older servers */
+ LogMessageVerbSigSafe(X_NONE, 0,
+ %s: Device no longer present -
removing.\n,
+ pInfo-name);
xf86RemoveEnabledDevice(pInfo);
priv-remove_timer = TimerSet(priv-remove_timer, 0, 1,
RemoveKeyboard, pInfo);
return;
default: /* All other errors */
- /* We use X_NONE here because it doesn't alloc since we
- may be called from SIGIO handler */
- xf86MsgVerb(X_NONE, 0, %s: Read error: %s\n, pInfo-name,
- strerror(errno));
+ /* We use X_NONE here because it didn't alloc since we
+ may be called from SIGIO handler. No longer true for
+ sigsafe logging, but matters for older servers */
+ LogMessageVerbSigSafe(X_NONE, 0, %s: Read error: %s\n,
pInfo-name,
+ strerror(errno));
return;
}
} else { /* nBytes == 0, so nothing more to read */
diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
index cba049f..0d8792d 100644
--- a/src/xf86OSKbd.h
+++ b/src/xf86OSKbd.h
@@ -29,6 +29,10 @@
#include xf86Xinput.h
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) 18
+#define LogMessageVerbSigSafe xf86MsgVerb
+#endif
+
Bool ATScancode(InputInfoPtr pInfo, int *scanCode);
/* Public interface to OS-specific keyboard support. */
commit 4a954bc6a8fbc4aa50dfcabec011274252713204
Author: Colin Walters walt...@verbum.org
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement
xserver-xorg-input-mouse: Changes to 'upstream-unstable'
COPYING |1
Makefile.am |8
autogen.sh |4
configure.ac| 17
include/Makefile.am |1
include/xf86-mouse-properties.h | 33
man/mousedrv.man| 25
src/Makefile.am |5
src/bsd_mouse.c | 536 ++--
src/compat-api.h| 98
src/hurd_mouse.c| 118 -
src/lnx_mouse.c | 180 -
src/mouse.c | 4372
src/mouse.h | 255 +-
src/mousePriv.h | 50
src/pnp.c | 566 ++---
src/sun_mouse.c | 627 ++---
xorg-mouse.pc.in|6
18 files changed, 3598 insertions(+), 3304 deletions(-)
New commits:
commit 35cae8f4352002c8dce85dbc86cebb50e915a478
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Mar 27 10:59:05 2013 +1000
mouse 1.9.0
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 110ee32..ee6a345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
-[1.8.1],
+[1.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])
commit 585f4030d77accf2a4ba115729ca08da82217863
Author: Colin Walters walt...@verbum.org
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode $@
+if test -z $NOCONFIGURE; then
+$srcdir/configure $@
+fi
commit 8e74b1db7b32a2a2bb668a8edc6757cc5b77157a
Author: Adam Jackson a...@redhat.com
Date: Wed Jan 16 13:11:11 2013 -0500
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/configure.ac b/configure.ac
index 6576c8e..110ee32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Initialize libtool
AC_DISABLE_STATIC
commit 3b199a175da8485c216b68df4cf539899619
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Aug 15 14:38:28 2012 +1000
Use signal-safe logging if available
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@ubuntu.com
diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index 441066f..ca4c9d0 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -435,8 +435,9 @@ wsconsReadInput(InputInfoPtr pInfo)
break;
#endif
default:
-xf86Msg(X_WARNING, %s: bad wsmouse event type=%d\n, pInfo-name,
-event-type);
+LogMessageVerbSigSafe(X_WARNING, -1,
+ %s: bad wsmouse event type=%d\n,
pInfo-name,
+ event-type);
++event;
continue;
}
@@ -584,8 +585,9 @@ usbReadInput(InputInfoPtr pInfo)
if (n == 0)
return;
if (n != pUsbMse-packetSize) {
-xf86Msg(X_WARNING, %s: incomplete packet, size %d\n, pInfo-name,
-n);
+LogMessageVerbSigSafe(X_WARNING, -1,
+ %s: incomplete packet, size %d\n,
+ pInfo-name, n);
}
/* discard packets with an id that don't match the mouse */
/* XXX this is probably not the right thing */
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index 16ae945..2b0d786 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -122,7 +122,7 @@ OsMouseReadInput(InputInfoPtr pInfo)
dy = - event-value.mmotion.mm_deltaY;
break;
default:
-ErrorF(Bad mouse event (%d)\n,event-type);
+LogMessageVerbSigSafe(X_ERROR, -1, Bad mouse event
(%d)\n,event-type);
continue;
}
pMse-PostEvent(pInfo, buttons, dx, dy, 0, 0);
diff --git a/src/mouse.c b/src/mouse.c
index b65ea0e..0487067 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1167,7 +1167,7 @@ MouseReadInput(InputInfoPtr pInfo)
u = (unsigned char)c;
#if defined (EXTMOUSEDEBUG) || defined (MOUSEDATADEBUG)
-ErrorF(mouse byte: %2.2x\n,u);
+LogMessageVerbSigSafe(X_INFO, -1, mouse byte: %x\n,u);
#endif
/* if we do autoprobing collect the data */
@@ -1225,7 +1225,7 @@ MouseReadInput(InputInfoPtr pInfo)
* preceeding the byte.
*/
#ifdef EXTMOUSEDEBUG
-ErrorF(mouse 4th byte
xserver-xorg-input-mouse: Changes to 'debian-unstable'
COPYING |1 ChangeLog | 223 ++ Makefile.am |8 autogen.sh |4 configure.ac| 17 debian/changelog|8 debian/control |4 include/Makefile.am |1 include/xf86-mouse-properties.h | 33 man/mousedrv.man| 25 src/Makefile.am |5 src/bsd_mouse.c | 536 ++-- src/compat-api.h| 98 src/hurd_mouse.c| 118 - src/lnx_mouse.c | 180 - src/mouse.c | 4372 src/mouse.h | 255 +- src/mousePriv.h | 50 src/pnp.c | 566 ++--- src/sun_mouse.c | 627 ++--- xorg-mouse.pc.in|6 21 files changed, 3831 insertions(+), 3306 deletions(-) New commits: commit df5e971676a3644997ada3ac96e8b07b1656cfcb Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 15:06:49 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index de32faf..760f5f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Michele Cane michele.c...@gmail.com Wed, 10 Jul 2013 22:24:42 +0200 diff --git a/debian/control b/debian/control index 9d12366..519f292 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (= 2:1.9.99.902), + xserver-xorg-dev (= 2:1.14), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 743ca446251e89b23821a2728bd0f9a2b01d9214 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 14:24:39 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 00f52ab..de32faf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Wed, 10 Jul 2013 22:24:42 +0200 diff --git a/debian/control b/debian/control index a40be49..9d12366 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: x11proto-randr-dev, quilt, xutils-dev (= 1:7.5+4) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git commit d9a720498034cfb27ceb7d4c9caee512e3d6f4f2 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 10 22:25:35 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index f632888..6ea53e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,226 @@ +commit 35cae8f4352002c8dce85dbc86cebb50e915a478 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Mar 27 10:59:05 2013 +1000 + +mouse 1.9.0 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 585f4030d77accf2a4ba115729ca08da82217863 +Author: Colin Walters walt...@verbum.org +Date: Wed Jan 4 17:37:06 2012 -0500 + +autogen.sh: Implement GNOME Build API + +http://people.gnome.org/~walters/docs/build-api.txt + +Signed-off-by: Adam Jackson a...@redhat.com + +commit 8e74b1db7b32a2a2bb668a8edc6757cc5b77157a +Author: Adam Jackson a...@redhat.com +Date: Wed Jan 16 13:11:11 2013 -0500 + +configure: Drop AM_MAINTAINER_MODE + +Signed-off-by: Adam Jackson a...@redhat.com + +commit 3b199a175da8485c216b68df4cf539899619 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Aug 15 14:38:28 2012 +1000 + +Use signal-safe logging if available + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Chase Douglas chase.doug...@ubuntu.com + +commit cb1f60930bdc8121e5d7b9210f9491d1116d6aef +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Aug 15 14:43:14 2012 +1000 + +Fix compilation error with EXTMOUSEDEBUG on + +pInfo-atom was removed in xorg-server-1.9.0-26-g9802cca + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com + +commit 29dbd85c4617a062d2003e0673806b92f8397492 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Tue Jul 31 09:39:38 2012 +1000 + +xf86-input-mouse 1.8.1 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 5a5f41659d4e43330407fa8895710c865d2b5328 +Author: Alan Coopersmith alan.coopersm...@oracle.com +Date: Mon Jul 30 15:56:18 2012 -0700 + +Fix compiler warning in sun_mouse.c
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog | 168 config/50-joystick-all.conf |7 + configure.ac|8 +- debian/changelog|9 ++ debian/control |4 - man/joystick.man| 153 +--- src/Makefile.am |2 src/backend_evdev.c | 36 +++-- src/jstk.c |4 - src/jstk_axis.c | 57 ++ src/jstk_properties.c |6 - 11 files changed, 377 insertions(+), 77 deletions(-) New commits: commit 17542d5523b284df0cbfb97b9f1a62c2e40ce5af Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 15:03:39 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index 2cf1b41..d70d91a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. * Update dependencies. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index f77f7cc..eaa6964 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, pkg-config, xutils-dev, - xserver-xorg-dev (= 2:1.9.99.2), + xserver-xorg-dev (= 2:1.14), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 08ba6478a987143aa25a68260ff5f9d22914876c Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 10:31:25 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index cb43009..2cf1b41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. * Update dependencies. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index 2e03c2c..f77f7cc 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-any], -Standards-Version: 3.9.2 +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 commit 33dbd746a572a306fc74a1fdba9d7af4990a10c0 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 10:29:02 2013 +0200 debian/control: update dependencies diff --git a/debian/changelog b/debian/changelog index 8765088..cb43009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. + * Update dependencies. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index 2746c2d..2e03c2c 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, pkg-config, xutils-dev, - xserver-xorg-dev (= 2:1.9.4), + xserver-xorg-dev (= 2:1.9.99.2), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit a70068188857b986a218ea8f4eee6f05a9807dec Author: Michele Cane michele.c...@gmail.com Date: Thu Jul 11 09:22:16 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 9270178..7a98074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,171 @@ +commit 426c3aa3c8a2385f17e37ae73c1e78f072656027 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Jan 16 10:52:12 2013 +0100 + +joystick 1.6.2 + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 8f9342484afbbd26296c627497cc278f600098ac +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Jan 16 11:06:39 2013 +0100 + +config: warning in default xorg.conf.d snippet: do not enable by default + +see discussion: https://bugs.gentoo.org/show_bug.cgi?id=403003 + +distributions should not ship the module enabled by default, because a lot +of users have the joystick module installed without knowing, resulting in +confusion and bad user experience when trying to play games, the more +likely usecase when plugging in a joystick. + +the default configuration only fits for a limited number of users. + +it does not make much sense to automatically enable hotplugging of the +module without explicit user consent and reviewing of the configuration. + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 819ba33c9d7440cd40e1e54a9b1e073ed89353a7 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sat Oct 6 18:28:53 2012 +0200 + +jast_axis: tune accelerated axis transformation to better work with circular axis fields + +reference:
xserver-xorg-input-joystick: Changes to 'upstream-unstable'
config/50-joystick-all.conf |7 ++ configure.ac|8 +- man/joystick.man| 153 +++- src/Makefile.am |2 src/backend_evdev.c | 36 -- src/jstk.c |4 - src/jstk_axis.c | 57 +++- src/jstk_properties.c |6 - 8 files changed, 198 insertions(+), 75 deletions(-) New commits: commit 426c3aa3c8a2385f17e37ae73c1e78f072656027 Author: Sascha Hlusiak saschahlus...@arcor.de Date: Wed Jan 16 10:52:12 2013 +0100 joystick 1.6.2 Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de diff --git a/configure.ac b/configure.ac index b8c8851..b5834a5 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-joystick], -[1.6.1], +[1.6.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-joystick]) AC_CONFIG_SRCDIR([Makefile.am]) commit 8f9342484afbbd26296c627497cc278f600098ac Author: Sascha Hlusiak saschahlus...@arcor.de Date: Wed Jan 16 11:06:39 2013 +0100 config: warning in default xorg.conf.d snippet: do not enable by default see discussion: https://bugs.gentoo.org/show_bug.cgi?id=403003 distributions should not ship the module enabled by default, because a lot of users have the joystick module installed without knowing, resulting in confusion and bad user experience when trying to play games, the more likely usecase when plugging in a joystick. the default configuration only fits for a limited number of users. it does not make much sense to automatically enable hotplugging of the module without explicit user consent and reviewing of the configuration. Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de diff --git a/config/50-joystick-all.conf b/config/50-joystick-all.conf index 6e780fd..0723086 100644 --- a/config/50-joystick-all.conf +++ b/config/50-joystick-all.conf @@ -11,6 +11,10 @@ Section InputClass Identifier joystick-all + # Note, that enabling this by default without explicit user + # consent might result in unexpected behaviour for those, + # that do not know that this module has been installed. + # UNCOMMENT TO ENABLE HOTPLUGGING OF JOYSTICKS # Driver joystick # MatchIsJoystick on commit 819ba33c9d7440cd40e1e54a9b1e073ed89353a7 Author: Sascha Hlusiak saschahlus...@arcor.de Date: Sat Oct 6 18:28:53 2012 +0200 jast_axis: tune accelerated axis transformation to better work with circular axis fields reference: https://bugs.freedesktop.org/show_bug.cgi?id=42399 joysticks with a rectangular field have a corner position of (32768,32768), joysticks with a circular field have (23170,23170). make sure that diagonal movement feels fast. either: 1) linear f(32768) ~= f(23170) + f(23170) f(32768) ~= a * f(23170) a = 2.0 on circular joysticks, the time needed for xy movement is exactly the time needed for x + the time for y separately. absolute diagonal travel speed (in cm/s) is 0.707 times as fast, which feels pretty slow. on square joysticks, diagonal travel speed is always 1.41 times faster than orthogonal travel speed. time needed for diagonal movement is always 0.5 times as long as for orthogonal movement. the value of a = 2.0 results in a nice, non-linear acceleration. or 2) trigonometric f(32768) ~= sqrt(f(23170)^2 + f(23170)^2)) f(32768) ~= a * f(23170) a = 1.414 on circular joysticks, the absolute pointer travel speed (in cm/s) is now the same for both linear and diagonal movement, which feels natural. moving diagonally takes 0.707 times the time of moving orthogonally. on square joysticks, values are as in 1) the value of a = 1.414 results in linear acceleration, which feels too slow. to maintain non-linear acceleration, make sure that: a = 1.414 the following formula achieves results inbetween, so it should feel natural on both devices while maintaining a nice acceleration: f(32768) ~= 1.620 * f(23170) diff --git a/src/jstk_axis.c b/src/jstk_axis.c index 95ebfe9..cb4a004 100644 --- a/src/jstk_axis.c +++ b/src/jstk_axis.c @@ -82,9 +82,62 @@ jstkAxisTimer(OsTimerPtrtimer, /* Calculate scale value, so we get a range from 0 to 32768 */ scale = (32768.0f / (float)(32768 - axis-deadzone)); + /* NOTE: joysticks with a rectangular field have a +* corner position of (32768,32768), joysticks with a +* circular field have (23170,23170). +* +* make sure that diagonal movement feels fast. either: +* 1) linear +* +*
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
Makefile.am |3 ++-
configure.ac | 19 +--
src/vmmouse.c | 24 +++-
tools/Makefile.am |1 -
4 files changed, 14 insertions(+), 33 deletions(-)
New commits:
commit a2e4aa9d2002dad6e976d9e4d3f129ad3127be81
Author: Zack Rusin za...@vmware.com
Date: Tue Jan 15 12:03:28 2013 -0800
vmmouse release 13.0.0
Signed-off-by: Zack Rusin za...@vmware.com
diff --git a/configure.ac b/configure.ac
index eb8ece1..1ffc219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.9.99.901],
+[13.0.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 1b40f1e1f61b5f44836ba5cd5d487cf57f6608ac
Author: Zack Rusin za...@vmware.com
Date: Thu Dec 6 16:37:19 2012 -0500
vmmouse 12.9.99.901
Internal release for QE testing
Signed-off-by: Zack Rusin za...@vmware.com
diff --git a/configure.ac b/configure.ac
index 2e1e021..eb8ece1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.9.0],
+[12.9.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit cabf4cb7c0ba3e535068ebb1d80108a26daa
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Tue Aug 21 14:03:55 2012 +1000
Fix compiler warnings about unused variables
vmmouse.c: In function 'MouseCommonOptions':
vmmouse.c:732:16: warning: variable 'from' set but not used
[-Wunused-but-set-variable]
vmmouse.c: In function 'MouseCommonOptions':
vmmouse.c:733:8: warning: variable 'origButtons' set but not used
[-Wunused-but-set-variable]
vmmouse.c: In function 'VMMouseDeviceControl':
vmmouse.c:838:19: warning: variable 'mPriv' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index d841771..bb450ff 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -729,19 +729,14 @@ static void
MouseCommonOptions(InputInfoPtr pInfo)
{
MouseDevPtr pMse;
- MessageType from = X_DEFAULT;
char *s;
- int origButtons;
pMse = pInfo-private;
pMse-buttons = xf86SetIntOption(pInfo-options, Buttons, 0);
- from = X_CONFIG;
if (!pMse-buttons) {
pMse-buttons = MSE_DFLTBUTTONS;
- from = X_DEFAULT;
}
- origButtons = pMse-buttons;
/*
* emulate3Buttons and Drag Lock is not supported
@@ -790,13 +785,6 @@ MouseCommonOptions(InputInfoPtr pInfo)
pInfo-name, s);
}
}
-
- /*
-* Emulatewheel is not supported
-*/
- if (origButtons != pMse-buttons)
- from = X_CONFIG;
-
}
@@ -847,7 +835,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
{
InputInfoPtr pInfo;
MouseDevPtr pMse;
- VMMousePrivPtr mPriv;
unsigned char map[MSE_MAXBUTTONS + 1];
int i;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
@@ -858,7 +845,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
pInfo = device-public.devicePrivate;
pMse = pInfo-private;
pMse-device = device;
- mPriv = (VMMousePrivPtr)pMse-mousePriv;
switch (mode){
case DEVICE_INIT:
commit 393880d2e6fe7f744e6c701a4fde6116a7278325
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Tue Aug 21 14:03:54 2012 +1000
Use sigsafe logging in ReadInput path
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 590144f..d841771 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -73,6 +73,10 @@
#include exevents.h
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) 18
+#define LogMessageVerbSigSafe xf86MsgVerb
+#endif
+
#include xisb.h
#include mipointer.h
@@ -1063,7 +1067,7 @@ VMMouseReadInput(InputInfoPtr pInfo)
*/
VMMouseClient_RequestAbsolute();
mPriv-absoluteRequested = TRUE;
- xf86Msg(X_INFO, VMWARE(0): vmmouse enable absolute mode\n);
+ LogMessageVerbSigSafe(X_INFO, -1, VMWARE(0): vmmouse enable absolute
mode\n);
}
/*
@@ -1130,7 +1134,7 @@ GetVMMouseMotionEvent(InputInfoPtr pInfo){
VMMouseClient_Disable();
VMMouseClient_Enable();
VMMouseClient_RequestAbsolute();
- xf86Msg(X_INFO, VMWARE(0): re-requesting absolute mode after
reset\n);
+ LogMessageVerbSigSafe(X_INFO, -1, VMWARE(0): re-requesting absolute
mode after reset\n);
break;
}
commit dba73cebb527bb36a3d17d67b1e8e1892852b240
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Sun Aug 5 08:12:15 2012 +1000
Fetch the udev dir from udev.pc instead of guessing based on prefix
Reviewed-by: Gaetan Nadonmems...@videotron.ca
Reviewed-by: Jakob Bornecrantz
xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
ChangeLog | 70 ++ Makefile.am |3 +- configure.ac | 19 +++--- debian/changelog |8 ++ debian/control|4 +-- src/vmmouse.c | 24 +- tools/Makefile.am |1 7 files changed, 94 insertions(+), 35 deletions(-) New commits: commit 1ef2ece02dc3fd9c9e8d73c1a270bc3e15d7004f Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 15:01:39 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index e128800..2965ded 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-vmmouse (1:13.0.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 10:45:03 +0200 diff --git a/debian/control b/debian/control index 8a07574..3a2139f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (= 2:1.9.4), + xserver-xorg-dev (= 2:1.14), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 13bb3547aeb433c481be22d01dd3d45fcd22c6fc Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 10:05:29 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 26ed551..e128800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-vmmouse (1:13.0.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 10:45:03 +0200 diff --git a/debian/control b/debian/control index d4086c9..8a07574 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: x11proto-randr-dev, quilt, xutils-dev (= 1:7.5+4), -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-vmmouse Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-vmmouse.git commit bdca3fda5ad23ce76a72811a84e0ea282bca696c Author: Michele Cane michele.c...@gmail.com Date: Thu Jul 11 10:46:04 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index b65c479..e2b272d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,73 @@ +commit a2e4aa9d2002dad6e976d9e4d3f129ad3127be81 +Author: Zack Rusin za...@vmware.com +Date: Tue Jan 15 12:03:28 2013 -0800 + +vmmouse release 13.0.0 + +Signed-off-by: Zack Rusin za...@vmware.com + +commit 1b40f1e1f61b5f44836ba5cd5d487cf57f6608ac +Author: Zack Rusin za...@vmware.com +Date: Thu Dec 6 16:37:19 2012 -0500 + +vmmouse 12.9.99.901 + +Internal release for QE testing + +Signed-off-by: Zack Rusin za...@vmware.com + +commit cabf4cb7c0ba3e535068ebb1d80108a26daa +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Tue Aug 21 14:03:55 2012 +1000 + +Fix compiler warnings about unused variables + +vmmouse.c: In function 'MouseCommonOptions': +vmmouse.c:732:16: warning: variable 'from' set but not used +[-Wunused-but-set-variable] + +vmmouse.c: In function 'MouseCommonOptions': +vmmouse.c:733:8: warning: variable 'origButtons' set but not used +[-Wunused-but-set-variable] + +vmmouse.c: In function 'VMMouseDeviceControl': +vmmouse.c:838:19: warning: variable 'mPriv' set but not used +[-Wunused-but-set-variable] + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Thomas Hellstrom thellst...@vmware.com + +commit 393880d2e6fe7f744e6c701a4fde6116a7278325 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Tue Aug 21 14:03:54 2012 +1000 + +Use sigsafe logging in ReadInput path + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Thomas Hellstrom thellst...@vmware.com + +commit dba73cebb527bb36a3d17d67b1e8e1892852b240 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Sun Aug 5 08:12:15 2012 +1000 + +Fetch the udev dir from udev.pc instead of guessing based on prefix + +Reviewed-by: Gaetan Nadonmems...@videotron.ca +Reviewed-by: Jakob Bornecrantz ja...@vmware.com +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Signed-off-by: Jakob Bornecrantz ja...@vmware.com + +commit 3c8ccf5eec3177ed8976ed5ff04795a20287d2d8 +Author: Stephen Brooks nightbike...@gmail.com +Date: Wed May 18 22:48:34 2011 +0100 + +Reset ps2buttons to avoid button messages from being discarded. + +Reviewed-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Jakob Bornecrantz ja...@vmware.com +Signed-off-by: Jakob Bornecrantz ja...@vmware.com +Signed-off-by: Stephen Brooks nightbike...@gmail.com + commit 3a828d876772d05577b9372e8f6dc068794f4704 Author: Jakob
xserver-xorg-input-evdev: Changes to 'upstream-unstable'
autogen.sh|4
configure.ac |3
man/evdev.man |6
src/Makefile.am |5
src/axis_labels.h | 198 +
src/emuMB.c |4
src/emuWheel.c|8
src/evdev.c | 782 +++---
src/evdev.h | 15 -
9 files changed, 628 insertions(+), 397 deletions(-)
New commits:
commit 8a9b1ec6b58a36910a03f3e8b1f9bc8d91f87204
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jul 11 11:09:24 2013 +1000
evdev 2.8.1
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 41d1017..b8a9c41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
-[2.8.0],
+[2.8.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
commit 356565111a6bb98f15fbaaf4f527aed8c87b477b
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jun 27 05:47:38 2013 +1000
Don't allow a wheel emulation inertia of 0 (#66125)
Inertia of 0 results in an infinite loop of events being sent to the server.
X.Org Bug 66125 http://bugs.freedesktop.org/show_bug.cgi?id=66125
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/emuWheel.c b/src/emuWheel.c
index 5774930..81b777f 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -392,7 +392,7 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom,
XIPropertyValuePtr val,
inertia = *((CARD16*)val-data);
-if (inertia 0)
+if (inertia = 0)
return BadValue;
if (!checkonly)
commit fff3a60fbf5c81b337ae4eaf160feacdfc8c2465
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed May 29 13:26:57 2013 +1000
Use EvdevBitIsSet, not the server's BitIsOn
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/evdev.c b/src/evdev.c
index 34cd3a1..ba2a98c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1267,7 +1267,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int
want_scroll_axes)
for (j = 0; j ArrayLength(mt_axis_mappings); j++)
{
if (mt_axis_mappings[j].mt_code == axis
-BitIsOn(pEvdev-abs_bitmask, mt_axis_mappings[j].code))
+EvdevBitIsSet(pEvdev-abs_bitmask,
mt_axis_mappings[j].code))
{
mt_axis_mappings[j].needs_mapping = TRUE;
skip = TRUE;
commit 8f209ac60d10ba61aa6ea2bec02dbfa54ebe8f17
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed May 29 07:18:19 2013 +1000
Drop cached name and led_bitmask - nothing reads this
Both fields are write-only as of xf86-input-evdev-2.5.99.902-1-g1ced7ec
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/evdev.c b/src/evdev.c
index 86af151..34cd3a1 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1983,12 +1983,10 @@ EvdevCache(InputInfoPtr pInfo)
int i, len;
struct input_id id;
-char name[1024] = {0};
unsigned long bitmask[NLONGS(EV_CNT)] = {0};
unsigned long key_bitmask[NLONGS(KEY_CNT)] = {0};
unsigned long rel_bitmask[NLONGS(REL_CNT)] = {0};
unsigned long abs_bitmask[NLONGS(ABS_CNT)] = {0};
-unsigned long led_bitmask[NLONGS(LED_CNT)] = {0};
if (ioctl(pInfo-fd, EVIOCGID, id) 0)
@@ -2000,13 +1998,6 @@ EvdevCache(InputInfoPtr pInfo)
pEvdev-id_vendor = id.vendor;
pEvdev-id_product = id.product;
-if (ioctl(pInfo-fd, EVIOCGNAME(sizeof(name) - 1), name) 0) {
-xf86IDrvMsg(pInfo, X_ERROR, ioctl EVIOCGNAME failed: %s\n,
strerror(errno));
-goto error;
-}
-
-strcpy(pEvdev-name, name);
-
len = ioctl(pInfo-fd, EVIOCGBIT(0, sizeof(bitmask)), bitmask);
if (len 0) {
xf86IDrvMsg(pInfo, X_ERROR, ioctl EVIOCGBIT for bitmask failed: %s\n,
@@ -2034,15 +2025,6 @@ EvdevCache(InputInfoPtr pInfo)
memcpy(pEvdev-abs_bitmask, abs_bitmask, len);
-len = ioctl(pInfo-fd, EVIOCGBIT(EV_LED, sizeof(led_bitmask)),
led_bitmask);
-if (len 0) {
-xf86IDrvMsg(pInfo, X_ERROR, ioctl EVIOCGBIT for EV_LED failed: %s\n,
-strerror(errno));
-goto error;
-}
-
-memcpy(pEvdev-led_bitmask, led_bitmask, len);
-
/*
* Do not try to validate absinfo data since it is not expected
* to be static, always refresh it in evdev structure.
diff --git a/src/evdev.h b/src/evdev.h
index 6ae389c..4742b43 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -235,12 +235,10 @@ typedef struct {
OsTimerPtr reopen_timer;
/* Cached info from device. */
-char name[1024];
unsigned long bitmask[NLONGS(EV_CNT)];
unsigned long key_bitmask[NLONGS(KEY_CNT)];
unsigned long rel_bitmask[NLONGS(REL_CNT)];
unsigned long
xserver-xorg-input-evdev: Changes to 'debian-unstable'
ChangeLog | 577 autogen.sh|4 configure.ac |3 debian/changelog | 40 ++ debian/control| 26 + debian/patches/series |1 debian/rules |4 man/evdev.man |6 src/Makefile.am |5 src/axis_labels.h | 198 src/emuMB.c |4 src/emuWheel.c|8 src/evdev.c | 782 +- src/evdev.h | 15 14 files changed, 1273 insertions(+), 400 deletions(-) New commits: commit 05c83cce3427845fd67652729a423513af3f93c0 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 14:57:58 2013 +0200 Build against Xserver 1.14 diff --git a/debian/changelog b/debian/changelog index 313e1fe..ea89d65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-input-evdev (1:2.8.1-1) UNRELEASED; urgency=low [ Michele Cane ] * New upstream release. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14 -- Michele Cane michele.c...@gmail.com Sun, 14 Jul 2013 20:29:16 +0200 diff --git a/debian/control b/debian/control index 719859d..ccf5783 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, pkg-config, quilt, - xserver-xorg-dev (= 2:1.11.99.901), + xserver-xorg-dev (= 2:1.14), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev (= 2.1.99.3), commit 2c93d3468ac7110c465d46c2fce6f0e86b9377fd Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 09:38:11 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 11ebfc5..313e1fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-input-evdev (1:2.8.1-1) UNRELEASED; urgency=low [ Michele Cane ] * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Sun, 14 Jul 2013 20:29:16 +0200 diff --git a/debian/control b/debian/control index 19708eb..719859d 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: xutils-dev (= 1:7.5+4), libudev-dev, libmtdev-dev, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git commit f73761006b15cf6016880517d6f064d223913217 Author: Michele Cane michele.c...@gmail.com Date: Sun Jul 14 20:30:16 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 89834ba..7366b9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,97 @@ +commit 8a9b1ec6b58a36910a03f3e8b1f9bc8d91f87204 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Jul 11 11:09:24 2013 +1000 + +evdev 2.8.1 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 356565111a6bb98f15fbaaf4f527aed8c87b477b +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Jun 27 05:47:38 2013 +1000 + +Don't allow a wheel emulation inertia of 0 (#66125) + +Inertia of 0 results in an infinite loop of events being sent to the server. + +X.Org Bug 66125 http://bugs.freedesktop.org/show_bug.cgi?id=66125 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit fff3a60fbf5c81b337ae4eaf160feacdfc8c2465 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed May 29 13:26:57 2013 +1000 + +Use EvdevBitIsSet, not the server's BitIsOn + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 8f209ac60d10ba61aa6ea2bec02dbfa54ebe8f17 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed May 29 07:18:19 2013 +1000 + +Drop cached name and led_bitmask - nothing reads this + +Both fields are write-only as of xf86-input-evdev-2.5.99.902-1-g1ced7ec + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit a0d41af8969b91ec51ebdfb966ccc47e5c40329a +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Mon May 27 10:19:15 2013 +1000 + +Switch default model to pc104. + +As of xkeyboard-config 1.9, the evdev model is hidden (c887d2876) +The server switched to pc105 with version 1.8 (1df4bd601). + +The evdev model resolves to pc104 anyway, so this commit has no real effect +other than to switch from a catch-all rule to explicit. +Use pc104 so this is easy to find for those investigating the code and +wondering why. pc104 is the 'correct' geometry for the us layout, which is +the default after all. Switching to pc105 would show keys missing if no +model is set (e.g. on uk/de layouts) but it would be the wrong layout for +the default. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Acked-by: Daniel Stone dan...@fooishbar.org + +commit
xserver-xorg-video-vesa: Changes to 'debian-unstable'
ChangeLog| 44 configure.ac |2 - debian/changelog | 12 ++ debian/control |4 +- src/Makefile.am |1 src/compat-api.h | 98 +++ src/vesa.c | 92 ++- 7 files changed, 205 insertions(+), 48 deletions(-) New commits: commit 5b8f68814e95a305be5bc7c765d705db6b7ddaf2 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 15:09:21 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index d123ea3..8c35048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low [ Michele Cane ] * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012 09:44:43 +0200 diff --git a/debian/control b/debian/control index f35f0b0..673aef5 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (= 2:1.11), + xserver-xorg-dev (= 2:1.14), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, commit 4316aa89b98af7d90814a222cfd10d25496531c1 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 14:48:40 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 98c6188..d123ea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low + [ Maarten Lankhorst ] * New upstream release. * Bump Standards-Version to 3.9.3 (no changes needed). + [ Michele Cane ] + * Bump Standards-Version to 3.9.4, no changes needed. + -- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012 09:44:43 +0200 xserver-xorg-video-vesa (1:2.3.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 88e9a9b..f35f0b0 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: xutils-dev (= 1:7.5+4), quilt, libpciaccess-dev (= 0.12.901), -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 7e5d4d96ec77b7a1396a6bc9d0877aae99317d81 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Thu Jul 19 09:46:24 2012 +0200 Bump Standards-Version to 3.9.3 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 2c4a40e..98c6188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.3 (no changes needed). -- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012 09:44:43 +0200 diff --git a/debian/control b/debian/control index 99a71a7..88e9a9b 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: xutils-dev (= 1:7.5+4), quilt, libpciaccess-dev (= 0.12.901), -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 6526371be953097a74b4211153b1925ca9fb2c04 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Thu Jul 19 09:45:03 2012 +0200 New upstream release. diff --git a/debian/changelog b/debian/changelog index 2fc5392..2c4a40e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012 09:44:43 +0200 + xserver-xorg-video-vesa (1:2.3.1-1) unstable; urgency=low * New upstream release. commit a456e0ebf79a38b76b06468408dc7b2e7bc39b4e Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Thu Jul 19 09:44:28 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index f7bd897..01da09e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit 0249d01a2623c4f7769914fc0a7b50657a50560f +Author: Dave Airlie airl...@gmail.com +Date: Wed Jul 18 20:02:49 2012 +1000 + +vesa: bump to 2.3.2 + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621 +Author: Dave Airlie airl...@redhat.com +Date: Fri Jun 1 12:55:19 2012 +0100 + +vesa: add api 13 compat layer. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 378e55e375cbb659d66d6739891553d7a83e6a65 +Author: Dave Airlie airl...@redhat.com +Date: Wed May 23 11:30:51 2012 +0100 + +vesa: fix make distcheck. + +Add missing compat-api header + +
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
configure.ac |2 -
src/Makefile.am |1
src/compat-api.h | 98 +++
src/vesa.c | 92 ++-
4 files changed, 147 insertions(+), 46 deletions(-)
New commits:
commit 0249d01a2623c4f7769914fc0a7b50657a50560f
Author: Dave Airlie airl...@gmail.com
Date: Wed Jul 18 20:02:49 2012 +1000
vesa: bump to 2.3.2
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index 4288bdd..6317acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
-[2.3.1],
+[2.3.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621
Author: Dave Airlie airl...@redhat.com
Date: Fri Jun 1 12:55:19 2012 +0100
vesa: add api 13 compat layer.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..d4d3882 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,61 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)-scrnIndex]
#endif
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout,
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)-scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)-scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn-scrnIndex, 0
+
+#define SCRN_OR_INDEX_ARG(x) ((x)-scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define SCRN_OR_INDEX_ARG(x) (x)
+
+#endif
+
#endif
diff --git a/src/vesa.c b/src/vesa.c
index ab64060..8ac77da 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -75,17 +75,16 @@ static Bool VESAPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
#endif
static Bool VESAPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool VESAScreenInit(int Index, ScreenPtr pScreen, int argc,
- char **argv);
-static Bool VESAEnterVT(int scrnIndex, int flags);
-static void VESALeaveVT(int scrnIndex, int flags);
-static Bool VESACloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool VESAScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool VESAEnterVT(VT_FUNC_ARGS_DECL);
+static void VESALeaveVT(VT_FUNC_ARGS_DECL);
+static Bool VESACloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool VESASaveScreen(ScreenPtr pScreen, int mode);
-static Bool VESASwitchMode(int scrnIndex, DisplayModePtr pMode, int flags);
+static Bool VESASwitchMode(SWITCH_MODE_ARGS_DECL);
static Bool VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode);
-static void VESAAdjustFrame(int scrnIndex, int x, int y, int flags);
-static void VESAFreeScreen(int scrnIndex, int flags);
+static void VESAAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static void VESAFreeScreen(FREE_SCREEN_ARGS_DECL);
static void VESAFreeRec(ScrnInfoPtr pScrn);
static VESAPtr VESAGetRec(ScrnInfoPtr pScrn);
@@ -342,11 +341,11 @@ vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr
vbe)
}
static ModeStatus
-VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+VESAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr p, Bool flag, int pass)
{
+SCRN_INFO_PTR(arg);
static int warned = 0;
int found = 0;
-ScrnInfoPtr pScrn = xf86Screens[scrn];
VESAPtr pVesa = VESAGetRec(pScrn);
MonPtr mon = pScrn-monitor;
Bug#717500: mesa: Please add support for OpenCL/GalliumCompute
Source: mesa Version: 9.1.4-1 Severity: wishlist Dear X Strike Force, Are there any plan to include support for OpenCL/GalliumCompute in the Debian build of Mesa ? There is some support for OpenCL on top of Gallium3D since Mesa 9.0, it would be nice to have it available in the Debian packages of Mesa. Regards, -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.10-1-amd64 (SMP w/2 CPU cores) Locale: LANG=C, LC_CTYPE=fr_FR@euro (charmap=ISO-8859-15) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130721143511.16499.56210.report...@drizzt.home
Bug#717500: mesa: Please add support for OpenCL/GalliumCompute
Hi kilobug, Gael Le Mignot (2013-07-21): Are there any plan to include support for OpenCL/GalliumCompute in the Debian build of Mesa? the odds of getting new stuff in are usually higher when a (tested) patch is attached. ;-) From a quick look, we'd need libclc, which doesn't appear to be packaged yet. Mraw, KiBi. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130721180807.ga12...@mraw.org
