xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 8 ++++
debian/patches/02_calibration_1.6.patch | 41 +++++++++++++++++++++
debian/patches/03_server-1.6-ftbfs.diff | 61 ++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 6 +--
5 files changed, 115 insertions(+), 3 deletions(-)
New commits:
commit 910a1dd642805ad506af8f22c054bedb9feb9362
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 17 19:07:39 2009 +0200
debian/rules: fix some rule dependencies
diff --git a/debian/changelog b/debian/changelog
index 727f3fd..ff559e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low
with new xserver.
* Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6
(closes: #527711).
+ * debian/rules: fix some rule dependencies.
-- Mattia Dongili <malattia@debian.org> Mon, 19 Jan 2009 09:12:53 +0900
diff --git a/debian/rules b/debian/rules
index bb0581d..453f647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ else
endif
configure: configure-stamp
-configure-stamp: patch
+configure-stamp: $(STAMP_DIR)/patch
dh_testdir
# Add here commands to configure the package.
./configure --prefix=/usr --enable-evcalibrate
@@ -55,11 +55,11 @@ install: build
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install serverabi
+binary-arch: install serverabi
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=.a
commit 62f4be43aab54b254dd0f5a73ab81f32870c9b5c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 17 18:56:37 2009 +0200
Add patch 03_server-1.6-ftbfs.diff
Fixes build with server 1.6 (closes: #527711).
diff --git a/debian/changelog b/debian/changelog
index 5debace..727f3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add patch 02_calibration_1.6.patch stolen from Ubuntu to fix calibration
with new xserver.
+ * Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6
+ (closes: #527711).
-- Mattia Dongili <malattia@debian.org> Mon, 19 Jan 2009 09:12:53 +0900
diff --git a/debian/patches/03_server-1.6-ftbfs.diff b/debian/patches/03_server-1.6-ftbfs.diff
new file mode 100644
index 0000000..79192cb
--- /dev/null
+++ b/debian/patches/03_server-1.6-ftbfs.diff
@@ -0,0 +1,61 @@
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 17 May 2009 18:54:59 +0200
+Subject: Fix build with server 1.6
+
+* uninclude xf86Version.h
+* fix InitValuatorClassDeviceStruct usage
+* fix input ABI check
+
+Index: xserver-xorg-input-evtouch/evtouch.c
+===================================================================
+--- xserver-xorg-input-evtouch.orig/evtouch.c
++++ xserver-xorg-input-evtouch/evtouch.c
+@@ -30,10 +30,8 @@
+
+ #define _evdev_touch_C_
+
+-#include <xf86Version.h>
+-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
++#include <xorgVersion.h>
+ #define XFREE86_V4
+-#endif
+
+ /*****************************************************************************
+ * Standard Headers
+@@ -74,7 +72,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86Xinput.h"
+ #include "exevents.h"
+-#include "xf86OSmouse.h"
+ #include "randrstr.h"
+
+ #ifndef NEED_XF86_TYPES
+@@ -139,7 +136,7 @@
+ "Kenan Esau",
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+- XF86_VERSION_CURRENT,
++ XORG_VERSION_CURRENT,
+ 0, 8, 8,
+ ABI_CLASS_XINPUT,
+ ABI_XINPUT_VERSION,
+@@ -652,14 +649,17 @@
+ * Device reports motions on 2 axes in absolute coordinates.
+ * Axes min and max values are reported in raw coordinates.
+ */
+- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
++ if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++ xf86GetMotionEvents,
++#endif
+ local->history_size, Absolute) == FALSE)
+ {
+ ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n");
+ return !Success;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width,
+ 1024,
+ EV_AXIS_MIN_RES /* min_res */ ,
diff --git a/debian/patches/series b/debian/patches/series
index 7cb7bf1..dca9e11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_fix_warnings.patch
02_calibration_1.6.patch
+03_server-1.6-ftbfs.diff
commit 1d8d4de6a49c5bc660adb2e57810fc7eeb8ca1c7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 17 18:50:35 2009 +0200
Add patch 02_calibration_1.6.patch
Stolen from Ubuntu, fixes calibration with new xserver.
diff --git a/debian/changelog b/debian/changelog
index 6185316..5debace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low
+ [ Mattia Dongili ]
* New upstream release
+ [ Julien Cristau ]
+ * Add patch 02_calibration_1.6.patch stolen from Ubuntu to fix calibration
+ with new xserver.
+
-- Mattia Dongili <malattia@debian.org> Mon, 19 Jan 2009 09:12:53 +0900
xf86-input-evtouch (0.8.7-3) unstable; urgency=low
diff --git a/debian/patches/02_calibration_1.6.patch b/debian/patches/02_calibration_1.6.patch
new file mode 100644
index 0000000..c461758
--- /dev/null
+++ b/debian/patches/02_calibration_1.6.patch
@@ -0,0 +1,41 @@
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Sun, 22 Mar 2009 20:58:58 -0400
+Subject: Make calibration work on xserver-1.6
+
+Stolen from Ubuntu.
+
+Index: xserver-xorg-input-evtouch/ev_calibrate.c
+===================================================================
+--- xserver-xorg-input-evtouch.orig/ev_calibrate.c
++++ xserver-xorg-input-evtouch/ev_calibrate.c
+@@ -218,7 +218,7 @@
+ int cap_style = CapButt; /* style of the line's edje and */
+ int join_style = JoinBevel; /* joined lines. */
+
+- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
+
+ int depth;
+ int screen_num;
+Index: xserver-xorg-input-evtouch/evtouch.c
+===================================================================
+--- xserver-xorg-input-evtouch.orig/evtouch.c
++++ xserver-xorg-input-evtouch/evtouch.c
+@@ -306,7 +306,7 @@
+ }
+
+ if (pos_changed == 1) {
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ ConvertProc(priv->local, 0, 2,
+ priv->raw_x, priv->raw_y,
+ 0, 0, 0, 0,
+@@ -369,7 +369,7 @@
+ priv->raw_y = priv->min_y;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ ConvertProc(priv->local, 0, 2,
+ priv->raw_x, priv->raw_y,
+ 0, 0, 0, 0,
diff --git a/debian/patches/series b/debian/patches/series
index 3a0786b..7cb7bf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_fix_warnings.patch
+02_calibration_1.6.patch
Reply to: