rpms/synaptics/F-8 synaptics-0.14.6-delibcwrap.patch, NONE, 1.1 synaptics-0.14.6-newx.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 synaptics.spec, 1.26, 1.27 synaptics-0.14.4-delibcwrap.patch, 1.1, NONE synaptics-0.14.4-modularx.patch, 1.4, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/synaptics/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29186

Modified Files:
	.cvsignore sources synaptics.spec 
Added Files:
	synaptics-0.14.6-delibcwrap.patch synaptics-0.14.6-newx.patch 
Removed Files:
	synaptics-0.14.4-delibcwrap.patch 
	synaptics-0.14.4-modularx.patch 
Log Message:
* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 0.14.6-1
- Update to 0.14.6 w/permission from krh
- Adds two-finger scrolling capability on supported hardware


synaptics-0.14.6-delibcwrap.patch:

--- NEW FILE synaptics-0.14.6-delibcwrap.patch ---
diff -Naurp synaptics-0.14.6/synaptics.c synaptics-0.14.6.delibc/synaptics.c
--- synaptics-0.14.6/synaptics.c	2006-07-15 11:54:29.000000000 -0400
+++ synaptics-0.14.6.delibc/synaptics.c	2008-01-07 11:07:02.000000000 -0500
@@ -64,7 +64,6 @@
 #include <misc.h>
 #include <xf86.h>
 #define NEED_XF86_TYPES
-#include <xf86_ansic.h>
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>
 #include "mipointer.h"
@@ -224,14 +223,14 @@ alloc_param_data(LocalDevicePtr local)
 	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;
 	}
@@ -257,8 +256,8 @@ free_param_data(SynapticsPrivate *priv)
 	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);
     }
@@ -272,7 +271,7 @@ synSetFloatOption(pointer options, const
     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;
 }
@@ -437,8 +436,8 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     priv->fifofd = -1;
     if (repeater) {
 	/* create repeater fifo */
-	if ((xf86mknod(repeater, 666, XF86_S_IFIFO) != 0) &&
-	    (xf86errno != xf86_EEXIST)) {
+	if ((mknod(repeater, 666, S_IFIFO) != 0) &&
+	    (errno != EEXIST)) {
 	    xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name);
 	} else {
 	    /* open the repeater fifo */
@@ -447,7 +446,7 @@ SynapticsPreInit(InputDriverPtr drv, IDe
 		xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
 	    }
 	}
-	xf86free(repeater);
+	free(repeater);
     }
 
     if (!QueryHardware(local)) {
@@ -634,7 +633,7 @@ DeviceInit(DeviceIntPtr dev)
 static int
 move_distance(int dx, int dy)
 {
-    return xf86sqrt((dx * dx) + (dy * dy));
+    return sqrt((dx * dx) + (dy * dy));
 }
 
 /*
@@ -669,14 +668,14 @@ angle(SynapticsPrivate *priv, int x, int
     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)
@@ -784,7 +783,7 @@ SynapticsGetHwState(LocalDevicePtr local
 	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;
 	}
@@ -1280,10 +1279,10 @@ ComputeDeltas(SynapticsPrivate *priv, st
 
 	    /* 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;
 	}
 
diff -Naurp synaptics-0.14.6/synaptics.h synaptics-0.14.6.delibc/synaptics.h
--- synaptics-0.14.6/synaptics.h	2006-07-15 11:54:29.000000000 -0400
+++ synaptics-0.14.6.delibc/synaptics.h	2008-01-07 11:03:30.000000000 -0500
@@ -1,6 +1,18 @@
 #ifndef	_SYNAPTICS_H_
 #define _SYNAPTICS_H_
 
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <math.h>
+#include <stdlib.h>
+
 #include <X11/Xdefs.h>
 
 /******************************************************************************

synaptics-0.14.6-newx.patch:

--- NEW FILE synaptics-0.14.6-newx.patch ---
diff -Naurp synaptics-0.14.6/Makefile synaptics-0.14.6.newx/Makefile
--- synaptics-0.14.6/Makefile	2006-07-15 11:58:26.000000000 -0400
+++ synaptics-0.14.6.newx/Makefile	2008-01-07 11:14:12.000000000 -0500
@@ -37,7 +37,7 @@ ifeq ($(BUILD_MODULAR),y)
   SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
   ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
 		-I$(INSTALLED_X)/include/X11/extensions \
-		-I$(SDKDIR)
+		-I$(SDKDIR) `pkg-config --cflags pixman-1`
 else
   INSTALLED_X = /usr/X11R6
   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
diff -Naurp synaptics-0.14.6/ps2comm.c synaptics-0.14.6.newx/ps2comm.c
--- synaptics-0.14.6/ps2comm.c	2006-04-16 18:20:10.000000000 -0400
+++ synaptics-0.14.6.newx/ps2comm.c	2008-01-07 11:11:12.000000000 -0500
@@ -60,6 +60,8 @@
 #define PS2DBG(x)
 #endif
 
+#define DBG(lvl, f)
+
 /*****************************************************************************
  *	PS/2 Utility functions.
  *     Many parts adapted from tpconfig.c by C. Scott Ananian
diff -Naurp synaptics-0.14.6/synaptics.c synaptics-0.14.6.newx/synaptics.c
--- synaptics-0.14.6/synaptics.c	2008-01-07 11:10:42.000000000 -0500
+++ synaptics-0.14.6.newx/synaptics.c	2008-01-07 11:15:18.000000000 -0500
@@ -71,6 +71,8 @@
 #include <xf86Optrec.h>  		/* needed for Options */
 #endif
 
+#define DBG(lvl, f)
+
 
 /*****************************************************************************
  *	Local Headers
@@ -320,8 +322,10 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     local->private_flags           = 0;
     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
     local->conf_idev               = dev;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     local->motion_history_proc     = xf86GetMotionEvents;
     local->history_size            = 0;
+#endif
     local->always_core_feedback    = 0;
 
     xf86Msg(X_INFO, "Synaptics touchpad driver version %s (%d)\n", VERSION, VERSION_ID);
@@ -454,7 +458,9 @@ SynapticsPreInit(InputDriverPtr drv, IDe
 	goto SetupProc_fail;
     }
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     local->history_size = xf86SetIntOption(opts, "HistorySize", 0);
+#endif
 
     xf86ProcessCommonOptions(local, opts);
     local->flags |= XI86_CONFIGURED;
@@ -612,8 +618,18 @@ DeviceInit(DeviceIntPtr dev)
 
     InitPointerDeviceStruct((DevicePtr)dev, map,
 			    SYN_MAX_BUTTONS,
-			    miPointerGetMotionEvents, SynapticsCtrl,
-			    miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+			    miPointerGetMotionEvents,
+#else
+			    GetMotionHistory,
+#endif
+			    SynapticsCtrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+			    miPointerGetMotionBufferSize()
+#else
+			    GetMotionHistorySize(), 2
+#endif
+                           );
 
     /* X valuator */
     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
@@ -622,7 +638,9 @@ DeviceInit(DeviceIntPtr dev)
     xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
     xf86InitValuatorDefaults(dev, 1);
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     xf86MotionHistoryAllocate(local);
+#endif
 
     if (!alloc_param_data(local))
 	return !Success;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 18:44:23 -0000	1.9
+++ .cvsignore	7 Jan 2008 16:42:39 -0000	1.10
@@ -1 +1,2 @@
 synaptics-0.14.4.tar.bz2
+synaptics-0.14.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Nov 2005 23:35:30 -0000	1.8
+++ sources	7 Jan 2008 16:42:39 -0000	1.9
@@ -1 +1 @@
-ae9aef7a146346fbfc7edfdd63cdd273  synaptics-0.14.4.tar.bz2
+1102cd575045640a064ab6f9b1e391af  synaptics-0.14.6.tar.bz2


Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/F-8/synaptics.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- synaptics.spec	15 Oct 2007 21:06:35 -0000	1.26
+++ synaptics.spec	7 Jan 2008 16:42:39 -0000	1.27
@@ -1,16 +1,16 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 
 Name:           synaptics
-Version:        0.14.4
-Release:	11%{?dist}
+Version:        0.14.6
+Release:	1%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
 License:        GPL
 URL:            http://w1.894.telia.com/~u89404340/touchpad/
-Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-0.14.4.tar.bz2
-Patch0: synaptics-0.14.4-modularx.patch
-Patch1: synaptics-0.14.4-delibcwrap.patch
+Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/%{name}-%{version}.tar.bz2
+Patch0: synaptics-0.14.6-delibcwrap.patch
+Patch1: synaptics-0.14.6-newx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
@@ -42,9 +42,11 @@
     * Run-time configuration using shared memory. This means you can change parameter settings without restarting the X server.
 
 %prep
-%setup -q 
-%patch0 -p1 -b .modx
-%patch1 -p1 -b .delibcwrap
+%setup -q
+%patch0 -p1 -b .delibcwrap
+%if "%{?fedora}" >= "9"
+%patch1 -p1 -b .newx
+%endif
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -62,7 +64,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR LICENSE README README.alps TODO
 %{moduledir}/input/*
@@ -71,6 +73,13 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 0.14.6-1
+- Update to 0.14.6 w/permission from krh
+- Adds two-finger scrolling capability on supported hardware
+
+* Fri Nov 30 2007 Caolan McNamara <caolanm at redhat.com> 0.14.4-12
+- Resolves: rhbz#396891 patch it to at least work
+
 * Mon Oct 15 2007 Adam Jackson <ajax at redhat.com> 0.14.4-11
 - Back to ExclusiveArch, buildsystem is a disaster.
 


--- synaptics-0.14.4-delibcwrap.patch DELETED ---


--- synaptics-0.14.4-modularx.patch DELETED ---