Hello community,
here is the log from the commit of package x11-input-fujitsu for openSUSE:Factory
checked in at Wed Mar 10 17:18:49 CET 2010.
--------
--- x11-input-fujitsu/x11-input-fujitsu.changes 2009-03-03 04:56:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/x11-input-fujitsu/x11-input-fujitsu.changes 2010-03-09 15:42:24.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 9 15:41:35 CET 2010 - ro@suse.de
+
+- fixed build against xorg-server 1.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
fujitsu-xserver.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-fujitsu.spec ++++++
--- /var/tmp/diff_new_pack.uzPeyr/_old 2010-03-10 17:18:38.000000000 +0100
+++ /var/tmp/diff_new_pack.uzPeyr/_new 2010-03-10 17:18:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package x11-input-fujitsu (Version 0.6.5)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,8 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://stz-softwaretechnik.com/~ke/touchscreen/p-series.html
Version: 0.6.5
-Release: 27
-License: GPL v2 or later; Other uncritical OpenSource License
+Release: 28
+License: GPLv2+ ; Other uncritical OpenSource License
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Summary: X.Org fujitsu Touchscreen Input Driver
@@ -31,6 +31,7 @@
Source: xf86-input-fujitouch-%{version}.tar.bz2
Patch0: fujitsu-fix-includes.diff
Patch1: xorg-server-1.6.diff
+Patch2: fujitsu-xserver.diff
%description
This package contains the X.Org fujitsu input drivers for Fujitsu
@@ -48,6 +49,9 @@
%if %suse_version > 1110
%patch1
%endif
+%if %suse_version > 1120
+%patch2
+%endif
%build
autoreconf -fi
@@ -55,8 +59,7 @@
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/include/X11/ -DXFree86LOADER -DXFree86Server -DIN_MODULE -DXFree86Module $(LINUX_INPUT)" \
--prefix=/usr \
--libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --enable-evcalibrate
+ --mandir=%{_mandir}
make
%install
++++++ fujitsu-xserver.diff ++++++
--- fujitsu.c
+++ fujitsu.c
@@ -53,6 +53,7 @@
#define NEED_EVENTS
#include
#include
+#include
#include "xf86.h"
@@ -122,13 +122,6 @@
};
#ifdef XFree86LOADER
-ModuleInfoRec FujiInfo = {
- 1,
- "FUJITSU",
- NULL,
- 0,
- NULL,
-};
static XF86ModuleVersionInfo VersionRec =
@@ -153,7 +146,6 @@
int *errmaj,
int *errmin )
{
- xf86AddModuleInfo(&FujiInfo, module);
xf86AddInputDriver(&FUJITSU, module, 0);
return module;
}
@@ -258,7 +250,32 @@
return Success;
}
+static Atom *FujitouchInitButtonLabels(void)
+{
+ Atom *labels = xalloc(4 * sizeof(Atom));
+
+ /* initialize the 4 button labels used by this driver */
+ labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+ labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+ labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+ labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+
+ return labels;
+}
+
+static Atom *FujitouchInitAxisLabels(void)
+{
+ Atom *labels = xalloc(4 * sizeof(Atom));
+
+ /* initialize the 4 button labels used by this driver */
+ labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+ labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+ labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Z);
+ labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_WHEEL);
+
+ return labels;
+}
static Bool
@@ -266,6 +283,7 @@
{
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
FujiPrivatePtr priv = (FujiPrivatePtr) (local->private);
+ Atom *labels, *atoms;
unsigned char map[] = {0, 1, 2, 3};
@@ -315,7 +333,12 @@
/*
* Device reports button press for 3 buttons.
*/
- if (InitButtonClassDeviceStruct (dev, 3, map) == FALSE)
+ labels = FujitouchInitButtonLabels();
+ if (InitButtonClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ labels,
+#endif
+ map) == FALSE)
{
ErrorF("Unable to allocate Fuji touchscreen ButtonClassDeviceStruct\n");
return !Success;
@@ -330,9 +353,12 @@
* Device reports motions on 2 axes in absolute coordinates.
* Axes min and max values are reported in raw coordinates.
*/
+ atoms = FujitouchInitAxisLabels();
- if (InitValuatorClassDeviceStruct(dev, 2,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ if (InitValuatorClassDeviceStruct(dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86GetMotionEvents,
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ atoms,
#endif
local->history_size, Absolute) == FALSE)
{
@@ -341,11 +366,11 @@
}
else
{
- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
+ InitValuatorAxisStruct(dev, 0, 0, priv->min_x, priv->max_x,
1024,
FUJI_AXIS_MIN_RES /* min_res */ ,
FUJI_AXIS_MAX_RES /* max_res */ );
- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
+ InitValuatorAxisStruct(dev, 1, 0, priv->min_y, priv->max_y,
1024,
FUJI_AXIS_MIN_RES /* min_res */ ,
FUJI_AXIS_MAX_RES /* max_res */ );
@@ -923,8 +948,6 @@
priv->cur_y = (priv->max_y - priv->min_y) / 2;
libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
- xf86AlwaysCore(local, TRUE);
-
priv->buffer = XisbNew (local->fd, 200);
priv->packet_type = PACK_UNKNOWN;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org