Hello community,
here is the log from the commit of package x11-input-synaptics
checked in at Sat Jul 5 02:05:38 CEST 2008.
--------
--- x11-input-synaptics/x11-input-synaptics.changes 2008-06-13 10:35:16.000000000 +0200
+++ x11-input-synaptics/x11-input-synaptics.changes 2008-07-04 22:20:12.752500000 +0200
@@ -1,0 +2,27 @@
+Fri Jul 4 22:20:01 CEST 2008 - sndirsch@suse.de
+
+- fixed build for xorg-server 1.5
+
+-------------------------------------------------------------------
+Fri Jul 4 11:48:07 CEST 2008 - sndirsch@suse.de
+
+- added alternative synaptics driver 0.99.3 by Paul Vojta
+ * This is to announce version 0.99.3 of my (alternate) Synaptics
+ touchpad driver. This driver differs from the standard one in
+ that it has only one author (so far), and hence no copyright
+ issues. Also, it uses an extension for configuration instead
+ of shared memory.
+ This version features an up-to-date man page, an up-to-date
+ configuration utility (command line only, sorry), and support
+ for the Linux INPUT driver (as provided with recent 2.6
+ kernels).
+ * Not functional at the moment ("(EE) No Input driver matching
+ `synapticsalt'), which seems to be related to the renaming
+ from "synaptics" to "synapticsalt". Even when it isn't renamed
+ it doesn't work for me. Tested on "SynPS/2 Synaptics TouchPad"
+ (VID: 0x0002, DID: 0x0007):
+ "(--) Synaptics touchpad not in use
+ failing module startup (--) Reason for the above: 4, 53
+ couldn't enable device 3"
+
+-------------------------------------------------------------------
New:
----
synapticsalt.diff
xf86-input-synaptics-0.99.3.tar.bz2
xorg-server-1_5.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-synaptics.spec ++++++
--- /var/tmp/diff_new_pack.i23788/_old 2008-07-05 02:03:50.000000000 +0200
+++ /var/tmp/diff_new_pack.i23788/_new 2008-07-05 02:03:50.000000000 +0200
@@ -22,17 +22,20 @@
AutoReqProv: on
%define driver_release 0.14.6
Version: 0.14.6
-Release: 181
+Release: 183
Summary: X11 input module for synaptics touchpad
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/synaptics_drv.o
Source: synaptics-20070706-cd6a122.tar.bz2
Source1: xorg_gunze.tgz
Source2: gunze-tools.tgz
+Source3: xf86-input-synaptics-0.99.3.tar.bz2
Patch: synaptics-%{version}.diff
Patch1: xorg_gunze.diff
Patch2: gunze-tools.diff
Patch3: wait.diff
Patch4: synaptics-0.14.6-poll-delay.patch
+Patch5: synapticsalt.diff
+Patch6: xorg-server-1_5.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -68,7 +71,7 @@
Group: System/X11/Servers/XF86_4
AutoReqProv: on
Version: 031126
-Release: 217
+Release: 219
%description -n x11-input-gunze
X11 input module for gunze touchscreen
@@ -87,7 +90,7 @@
Requires: x11-input-gunze = %{version}-%{release}
AutoReqProv: on
Version: 031126
-Release: 217
+Release: 219
%description -n x11-input-gunze-tools
Tools to configure and calibrate gunze X11 input driver.
@@ -100,10 +103,11 @@
Chris Howe
%prep
-%setup -n synaptics -b1 -b2
+%setup -n synaptics -b1 -b2 -b3
%patch
%patch3
%patch4
+%patch6 -p1
major=$(echo %driver_release | cut -d "." -f 1)
minor=$(echo %driver_release | cut -d "." -f 2)
patch=$(echo %driver_release | cut -d "." -f 3)
@@ -115,6 +119,11 @@
pushd ../gunze-tools
patch -p1 -s < $RPM_SOURCE_DIR/gunze-tools.diff
popd
+pushd ../xf86-input-synaptics-0.99.3
+ patch -p0 -s < $RPM_SOURCE_DIR/synapticsalt.diff
+ ln -s synaptics.man man/synapticsalt.man
+ ln -s synclient.man man/synclientalt.man
+popd
%build
%ifnarch s390 s390x
@@ -130,6 +139,12 @@
sed -i -e 's/-nostdlib//g' -e 's/-lgcc//g' Makefile
make CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/include/pixman-1"
popd
+pushd ../xf86-input-synaptics-0.99.3
+ autoreconf -fi
+ %configure
+ make
+ gcc -Wall -o src/synclientalt src/synclient.c -lXext -lX11
+popd
%endif
pushd ../gunze-tools
make
@@ -143,6 +158,12 @@
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/x11-input-gunze
install -m 644 README $RPM_BUILD_ROOT/%{_defaultdocdir}/x11-input-gunze
popd
+pushd ../xf86-input-synaptics-0.99.3
+ make install DESTDIR=$RPM_BUILD_ROOT
+ rm $RPM_BUILD_ROOT//usr/%{_lib}/xorg/modules/input/synapticsalt_drv.*a
+ mkdir -p $RPM_BUILD_ROOT/usr/bin
+ install -m 755 src/synclientalt $RPM_BUILD_ROOT/usr/bin
+popd
%endif
pushd ../gunze-tools
make install DESTDIR=$RPM_BUILD_ROOT \
@@ -173,12 +194,14 @@
%doc README NEWS
%ifnarch s390 s390x
%attr(444,root,root) %doc %{_mandir}/man1/*
+%attr(444,root,root) %doc %{_mandir}/man4/*
%attr(444,root,root) %doc %{_mandir}/man5/*
%doc sample
%dir /usr/%{_lib}/xorg
%dir /usr/%{_lib}/xorg/modules
%dir /usr/%{_lib}/xorg/modules/input
/usr/%{_lib}/xorg/modules/input/synaptics_drv.so
+/usr/%{_lib}/xorg/modules/input/synapticsalt_drv.so
/usr/bin/syn*
%endif
%ifnarch s390 s390x
@@ -200,6 +223,27 @@
/usr/bin/gunzets_calib
%changelog
+* Sat Jul 05 2008 sndirsch@suse.de
+- fixed build for xorg-server 1.5
+* Fri Jul 04 2008 sndirsch@suse.de
+- added alternative synaptics driver 0.99.3 by Paul Vojta
+ * This is to announce version 0.99.3 of my (alternate) Synaptics
+ touchpad driver. This driver differs from the standard one in
+ that it has only one author (so far), and hence no copyright
+ issues. Also, it uses an extension for configuration instead
+ of shared memory.
+ This version features an up-to-date man page, an up-to-date
+ configuration utility (command line only, sorry), and support
+ for the Linux INPUT driver (as provided with recent 2.6
+ kernels).
+ * Not functional at the moment ("(EE) No Input driver matching
+ `synapticsalt'), which seems to be related to the renaming
+ from "synaptics" to "synapticsalt". Even when it isn't renamed
+ it doesn't work for me. Tested on "SynPS/2 Synaptics TouchPad"
+ (VID: 0x0002, DID: 0x0007):
+ "(--) Synaptics touchpad not in use
+ failing module startup (--) Reason for the above: 4, 53
+ couldn't enable device 3"
* Fri Jun 13 2008 sndirsch@suse.de
- updated synaptics driver from 0.14.6 (2006-07-15) to git commit
cd6a122 (2007-07-06)
++++++ synapticsalt.diff ++++++
--- ../xf86-input-synaptics-0.99.3.orig/configure.ac 2008-07-04 09:48:27.818514000 +0200
+++ configure.ac 2008-07-04 10:02:50.962528000 +0200
@@ -32,7 +32,7 @@
AM_MAINTAINER_MODE
-DRIVER_NAME=synaptics
+DRIVER_NAME=synapticsalt
AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
--- ../xf86-input-synaptics-0.99.3.orig/src/Makefile.am 2008-07-04 09:48:27.737598000 +0200
+++ src/Makefile.am 2008-07-04 10:04:00.565855000 +0200
@@ -28,7 +28,7 @@
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c
+@DRIVER_NAME@_drv_la_SOURCES = synaptics.c
# Not sure if this is right
EXTRA_DIST = synclient.c synpt.h
--- ../xf86-input-synaptics-0.99.3.orig/man/Makefile.am 2008-07-04 09:48:27.640692000 +0200
+++ man/Makefile.am 2008-07-04 10:09:28.001090000 +0200
@@ -27,11 +27,11 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man synclient.man
+driverman_PRE = @DRIVER_NAME@.man synclientalt.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man synclient.man
+EXTRA_DIST = synaptics.man synclient.man
CLEANFILES = $(driverman_DATA)
--- ../xf86-input-synaptics-0.99.3.orig/src/synaptics.c 2008-07-04 09:48:27.726611000 +0200
+++ src/synaptics.c 2008-07-04 11:02:44.686936000 +0200
@@ -229,7 +229,7 @@
static XF86ModuleVersionInfo VersionRec =
{
- "synaptics",
+ "synapticsalt",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
@@ -241,7 +241,7 @@
{0, 0, 0, 0} /* signature, to be patched into the file by a tool */
};
-XF86ModuleData synapticsModuleData = {
+XF86ModuleData synapticsaltModuleData = {
/* vers */ &VersionRec,
/* setup */ module_setup,
/* teardown */ module_teardown,
++++++ xorg-server-1_5.diff ++++++
diff -x 'Makefile*' -u -r synaptics.old//Imakefile synaptics/Imakefile
--- synaptics.old//Imakefile 2008-07-04 16:07:26.000000000 +0000
+++ synaptics/Imakefile 2008-07-04 16:20:28.000000000 +0000
@@ -12,7 +12,8 @@
INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \
-I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) \
- -I$(EXTINCSRC) -I/usr/include/X11 -I/usr/include/xorg
+ -I$(EXTINCSRC) -I/usr/include/X11 -I/usr/include/xorg \
+ -I/usr/include/pixman-1
#if MakeHasPosixVariableSubstitutions
SubdirLibraryRule($(OBJS))
diff -x 'Makefile*' -u -r synaptics.old//synaptics.c synaptics/synaptics.c
--- synaptics.old//synaptics.c 2008-07-04 16:07:26.000000000 +0000
+++ synaptics/synaptics.c 2008-07-04 16:35:43.000000000 +0000
@@ -70,7 +70,13 @@
#include
#include
#define NEED_XF86_TYPES
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include
#include "mipointer.h"
@@ -236,14 +242,14 @@
return TRUE; /* Already allocated */
if (priv->shm_config) {
- if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
- xf86shmctl(shmid, XF86IPC_RMID, NULL);
- if ((shmid = xf86shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM),
- 0777 | XF86IPC_CREAT)) == -1) {
+ if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+ shmctl(shmid, IPC_RMID, NULL);
+ if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM),
+ 0777 | IPC_CREAT)) == -1) {
xf86Msg(X_ERROR, "%s error shmget\n", local->name);
return FALSE;
}
- if ((priv->synpara = (SynapticsSHM*)xf86shmat(shmid, NULL, 0)) == NULL) {
+ if ((priv->synpara = (SynapticsSHM*)shmat(shmid, NULL, 0)) == NULL) {
xf86Msg(X_ERROR, "%s error shmat\n", local->name);
return FALSE;
}
@@ -269,8 +275,8 @@
return;
if (priv->shm_config) {
- if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
- xf86shmctl(shmid, XF86IPC_RMID, NULL);
+ if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+ shmctl(shmid, IPC_RMID, NULL);
} else {
xfree(priv->synpara);
}
@@ -284,7 +290,7 @@
char *str_par;
double value;
str_par = xf86FindOptionValue(options, optname);
- if ((!str_par) || (xf86sscanf(str_par, "%lf", &value) != 1))
+ if ((!str_par) || (sscanf(str_par, "%lf", &value) != 1))
return default_value;
return value;
}
@@ -491,8 +497,8 @@
priv->fifofd = -1;
if (repeater) {
/* create repeater fifo */
- if ((xf86mknod(repeater, 666, XF86_S_IFIFO) != 0) &&
- (xf86errno != xf86_EEXIST)) {
+ if ((mknod(repeater, 666, 0100000) != 0) &&
+ (errno != 1004)) {
xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name);
} else {
/* open the repeater fifo */
@@ -501,7 +507,7 @@
xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
}
}
- xf86free(repeater);
+ free(repeater);
}
if (!QueryHardware(local)) {
@@ -694,7 +700,7 @@
static int
move_distance(int dx, int dy)
{
- return xf86sqrt(SQR(dx) + SQR(dy));
+ return sqrt(SQR(dx) + SQR(dy));
}
/*
@@ -729,14 +735,14 @@
double xCenter = (priv->synpara->left_edge + priv->synpara->right_edge) / 2.0;
double yCenter = (priv->synpara->top_edge + priv->synpara->bottom_edge) / 2.0;
- return xf86atan2(-(y - yCenter), x - xCenter);
+ return atan2(-(y - yCenter), x - xCenter);
}
/* return angle difference */
static double
diffa(double a1, double a2)
{
- double da = xf86fmod(a2 - a1, 2 * M_PI);
+ double da = fmod(a2 - a1, 2 * M_PI);
if (da < 0)
da += 2 * M_PI;
if (da > M_PI)
@@ -844,7 +850,7 @@
int c;
while ((c = XisbRead(priv->comm.buffer)) >= 0) {
unsigned char u = (unsigned char)c;
- xf86write(priv->fifofd, &u, 1);
+ write(priv->fifofd, &u, 1);
if (++count >= 3)
break;
}
@@ -1402,10 +1408,10 @@
/* save the fraction, report the integer part */
tmpf = dx * speed + x_edge_speed * dtime + priv->frac_x;
- priv->frac_x = xf86modf(tmpf, &integral);
+ priv->frac_x = modf(tmpf, &integral);
dx = integral;
tmpf = dy * speed + y_edge_speed * dtime + priv->frac_y;
- priv->frac_y = xf86modf(tmpf, &integral);
+ priv->frac_y = modf(tmpf, &integral);
dy = integral;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org