xserver-xorg-input-jamstudio: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
man/Makefile.am | 1 -
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/js_x.c | 24 +++++++++++-------------
9 files changed, 40 insertions(+), 42 deletions(-)
New commits:
commit 1467dbc393eb61ae26b3f65722e0397c020c3d27
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 30 19:43:29 2008 +0930
Fix compiler warning: don't use deprecated calls for newer XInput ABIS.
diff --git a/src/js_x.c b/src/js_x.c
index 3b6997f..c27a0da 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -148,8 +148,13 @@ xf86JS_XConvert(LocalDevicePtr local, int first, int num, int v0, int v1,
int width, height;
int deltaX, deltaY;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
width = miPointerCurrentScreen()->width;
height = miPointerCurrentScreen()->height;
+#else
+ width = miPointerGetScreen(local->dev)->width;
+ height = miPointerGetScreen(local->dev)->height;
+#endif
/*
deltaX=(float)width/priv->jsxMaxX; deltaY=(float)height/priv->jsxMaxY;
*/
commit c0f13a2490f7fcb8a742affb15f1beeb0259d0f8
Author: Julien Christau <jcristau@debian.org>
Date: Fri May 30 19:38:17 2008 +0930
Remove XFREE86_V4 ifdefs. #16152
Wasn't getting defined since the server started reporting 1.x as
XORG_VERSION_CURRENT, so no code was actually built.
Patch is untested.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
X.Org Bug 16152 <http://bugs.freedesktop.org/show_bug.cgi?id=16152>
diff --git a/src/js_x.c b/src/js_x.c
index 623f35a..3b6997f 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -28,9 +28,6 @@
#include <sys/types.h>
#include "xf86Version.h"
-#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
-#define XFREE86_V4 1
-#endif
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -38,11 +35,10 @@
#include "exevents.h" /* Needed for InitValuator/Proximity stuff */
#include "mipointer.h"
-#ifdef XFree86LOADER
#include "xf86Module.h"
-#endif
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#define JSX_XCOORD 65584
#define JSX_YCOORD 65585
@@ -51,8 +47,6 @@
#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
-#ifdef XFREE86_V4
-
struct hiddev_event
{
unsigned hid;
@@ -333,8 +327,6 @@ xf86JS_XInit(InputDriverPtr drv, IDevPtr dev, int flags)
_X_EXPORT InputDriverRec JAMSTUDIO =
{ 1, "js_x", NULL, xf86JS_XInit, xf86JS_XUnInit, NULL, 0 };
-#ifdef XFree86LOADER
-
static void
xf86JS_XUnplug(pointer p)
{
@@ -366,5 +358,3 @@ _X_EXPORT XF86ModuleData js_xModuleData = {
xf86JS_XPlug,
xf86JS_XUnplug
};
-#endif
-#endif
commit cd09dd2b4f861ebc9674bdede1d1c1a09cefcec2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 22:08:56 2008 +0930
Check for XINPUT ABI 3.
diff --git a/src/js_x.c b/src/js_x.c
index be6b6fa..623f35a 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -192,7 +192,10 @@ xf86JS_XProc(DeviceIntPtr pJS_X, int operation)
return !Success;
if (InitProximityClassDeviceStruct(pJS_X) == FALSE)
return !Success;
- if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct(pJS_X, nbaxes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
local->history_size,
Absolute | OutOfProximity) == FALSE)
return !Success;
commit becf2d28fc4946b04cd6486427d885a989710533
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 15:55:26 2008 -0400
jamstudio 1.2.0
diff --git a/configure.ac b/configure.ac
index 5737181..17e34c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-jamstudio],
- 1.1.0,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-jamstudio)
commit 62b0242fb09ad7c1728755da7004fa5d4969eaf6
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:00:34 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit f0aa623a98d08c162b53fef18262aaf1c23a606d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:12 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 3eff06c2d5fdc2541cdf4aee561ee0639e85e8c2
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:29 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit e3e3f57312ce0ab51023249efb34fff29be82a4b
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 23:33:33 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in xf86JS_XVersionRec
diff --git a/src/js_x.c b/src/js_x.c
index 184025c..be6b6fa 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -351,7 +351,7 @@ static XF86ModuleVersionInfo xf86JS_XVersionRec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
Reply to: