rpms/synaptics/devel synaptics-0.14.4-delibcwrap.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 synaptics.spec, 1.18, 1.19 synaptics-0.13.5-makefile-sdk64.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25539/devel

Modified Files:
	.cvsignore synaptics.spec 
Added Files:
	synaptics-0.14.4-delibcwrap.patch 
Removed Files:
	synaptics-0.13.5-makefile-sdk64.patch 
Log Message:
auto-import synaptics-0.14.4-5 on branch devel from synaptics-0.14.4-5.src.rpm

synaptics-0.14.4-delibcwrap.patch:
 synaptics.c |   43 +++++++++++++++++++++----------------------
 synaptics.h |   12 ++++++++++++
 2 files changed, 33 insertions(+), 22 deletions(-)

--- NEW FILE synaptics-0.14.4-delibcwrap.patch ---
--- ./synaptics.c.delibcwrap	2005-11-05 15:59:23.000000000 -0500
+++ ./synaptics.c	2006-04-10 14:44:03.000000000 -0400
@@ -60,7 +60,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"
@@ -220,14 +219,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;
 	}
@@ -253,8 +252,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);
     }
@@ -386,19 +385,19 @@
     pars->palm_min_z         = xf86SetIntOption(local->options, "PalmMinZ", 200);
 
     str_par = xf86FindOptionValue(local->options, "MinSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->min_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->min_speed) != 1))
 	pars->min_speed=0.09;
     str_par = xf86FindOptionValue(local->options, "MaxSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->max_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->max_speed) != 1))
 	pars->max_speed=0.18;
     str_par = xf86FindOptionValue(local->options, "AccelFactor");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->accl) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->accl) != 1))
 	pars->accl=0.0015;
     str_par = xf86FindOptionValue(local->options, "CircScrollDelta");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->scroll_dist_circ) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->scroll_dist_circ) != 1))
 	pars->scroll_dist_circ = 0.1;
     str_par = xf86FindOptionValue(local->options, "CoastingSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->coasting_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->coasting_speed) != 1))
 	pars->coasting_speed = 0.0;
 
     if (pars->circular_trigger < 0 || pars->circular_trigger > 8) {
@@ -426,8 +425,8 @@
     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 */
@@ -436,7 +435,7 @@
 		xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
 	    }
 	}
-	xf86free(repeater);
+	free(repeater);
     }
 
     if (!QueryHardware(local)) {
@@ -623,7 +622,7 @@
 static int
 move_distance(int dx, int dy)
 {
-    return xf86sqrt((dx * dx) + (dy * dy));
+    return sqrt((dx * dx) + (dy * dy));
 }
 
 /*
@@ -658,14 +657,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)
@@ -773,7 +772,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;
 	}
@@ -1250,10 +1249,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;
 	}
 
--- ./synaptics.h.delibcwrap	2006-04-10 14:43:27.000000000 -0400
+++ ./synaptics.h	2006-04-10 14:43:41.000000000 -0400
@@ -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>
 
 /******************************************************************************


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Nov 2005 23:36:47 -0000	1.8
+++ .cvsignore	10 Apr 2006 18:44:23 -0000	1.9
@@ -1,6 +1 @@
-synaptics-0.13.5.tar.bz2
-synaptics-0.14.0.tar.bz2
-synaptics-0.14.1.tar.bz2
-synaptics-0.14.2.tar.bz2
-synaptics-0.14.3.tar.bz2
 synaptics-0.14.4.tar.bz2


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- synaptics.spec	11 Feb 2006 05:45:53 -0000	1.18
+++ synaptics.spec	10 Apr 2006 18:44:23 -0000	1.19
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release: 4.2.1
+Release:	5
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -11,11 +11,12 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
-BuildRequires:	xorg-x11-server-sdk
+BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires:  libX11-devel, libXi-devel
-Requires:       Xserver
+Requires:       xorg-x11-server-Xorg >= 1.0.99.901
 ExclusiveArch:	i386 x86_64 ppc
 
 %description
@@ -42,6 +43,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .modx
+%patch1 -p1 -b .delibcwrap
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -68,6 +70,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com 0:0.14.4-5
+- Delibcwrap and rebuild for 7.1RC1 ABI.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-4.2.1
 - bump again for double-long bug on ppc(64)
 


--- synaptics-0.13.5-makefile-sdk64.patch DELETED ---