Version bump -- now with two finger scrolling goodness. Thanks to fuoco for his patience and his resilience, and his help. Closes bug #135512

(Portage version: 2.1.1_pre2-r8)

5 files changed, 176 insertions, 1 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index f0b00f21b7c4..6ee2584d96d3 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.11 2006/07/01 00:19:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.12 2006/07/12 14:11:44 seemant Exp $
+
+*synaptics-0.14.5 (12 Jul 2006)
+
+  12 Jul 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/synaptics-0.14.5-makefile-fpic.patch,
+  +files/synaptics-0.14.5-xorg-7.1-compile-fix.patch,
+  +synaptics-0.14.5.ebuild:
+  Version bump -- now with two finger scrolling goodness. Thanks to fuoco for
+  his patience and his resilience, and his help. Closes bug #135512
 
   01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
   synaptics-0.14.4-r2.ebuild:
diff --git a/x11-drivers/synaptics/files/digest-synaptics-0.14.5 b/x11-drivers/synaptics/files/digest-synaptics-0.14.5
new file mode 100644
index 000000000000..9bc140596c4e
--- /dev/null
+++ b/x11-drivers/synaptics/files/digest-synaptics-0.14.5
@@ -0,0 +1,3 @@
+MD5 aab6dc3f18344cdac7ef16e441cdc2c7 synaptics-0.14.5.tar.bz2 126743
+RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 synaptics-0.14.5.tar.bz2 126743
+SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796 synaptics-0.14.5.tar.bz2 126743
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch b/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch
new file mode 100644
index 000000000000..edd36662bb58
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2006-06-04 09:50:43.000000000 +0100
++++ Makefile	2006-06-04 09:50:53.000000000 +0100
+@@ -81,7 +81,7 @@
+ CCOPTIONS := -pedantic -Wall -Wpointer-arith
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+ CDEBUGFLAGS = -O2
+-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
++CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -fPIC
+ CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+ 
+ CC = gcc
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch b/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch
new file mode 100644
index 000000000000..0c2d9d104ef9
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch
@@ -0,0 +1,97 @@
+                                                                     
+                                                                     
+                                                                     
+                                             
+Fix compile errors when using Xorg 7.1.
+
+From: Peter Osterlund <petero2@telia.com>
+
+Initial patch from VMiklos <vmiklos@frugalware.org>. Somewhat
+modified by me.
+---
+
+ eventcomm.c |    5 +++++
+ ps2comm.h   |    1 +
+ psmcomm.c   |    2 ++
+ psmcomm.h   |    1 +
+ synaptics.c |    1 +
+ synproto.h  |    1 +
+ 6 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/eventcomm.c b/eventcomm.c
+index 6f6de7f..1b0f8bc 100644
+--- a/eventcomm.c
++++ b/eventcomm.c
+@@ -18,6 +18,11 @@
+  */
+ 
+ #include "eventcomm.h"
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <stdio.h>
+ #include "synproto.h"
+ #include "synaptics.h"
+ #include <xf86.h>
+diff --git a/ps2comm.h b/ps2comm.h
+index d6f0a25..4a1a051 100644
+--- a/ps2comm.h
++++ b/ps2comm.h
+@@ -1,6 +1,7 @@
+ #ifndef _PS2COMM_H_
+ #define _PS2COMM_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "xf86_OSproc.h"
+ 
+diff --git a/psmcomm.c b/psmcomm.c
+index e4df42b..257ec13 100644
+--- a/psmcomm.c
++++ b/psmcomm.c
+@@ -29,6 +29,8 @@
+  */
+ 
+ #include "psmcomm.h"
++#include <errno.h>
++#include <string.h>
+ #include "synproto.h"
+ #include "synaptics.h"
+ #include "ps2comm.h"			    /* ps2_print_ident() */
+diff --git a/psmcomm.h b/psmcomm.h
+index 6d64df6..a3162a2 100644
+--- a/psmcomm.h
++++ b/psmcomm.h
+@@ -1,6 +1,7 @@
+ #ifndef _PSMCOMM_H_
+ #define _PSMCOMM_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "freebsd_mouse.h"
+ 
+diff --git a/synaptics.c b/synaptics.c
+index 2a17f81..63edebb 100644
+--- a/synaptics.c
++++ b/synaptics.c
+@@ -59,6 +59,7 @@
+  *	Standard Headers
+  ****************************************************************************/
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <misc.h>
+ #include <xf86.h>
+diff --git a/synproto.h b/synproto.h
+index 8562a75..ecc4357 100644
+--- a/synproto.h
++++ b/synproto.h
+@@ -19,6 +19,7 @@
+ #ifndef _SYNPROTO_H_
+ #define _SYNPROTO_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <xf86Xinput.h>
+ #include <xisb.h>
diff --git a/x11-drivers/synaptics/synaptics-0.14.5.ebuild b/x11-drivers/synaptics/synaptics-0.14.5.ebuild
new file mode 100644
index 000000000000..9135a294ba04
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5.ebuild,v 1.1 2006/07/12 14:11:44 seemant Exp $
+
+inherit toolchain-funcs eutils
+
+IUSE="dlloader"
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
+SRC_URI="http://w1.894.telia.com/~u89404340/touchpad/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-base/xorg-server virtual/x11 )
+	>=sys-apps/sed-4"
+
+PREFIX="${D}/usr"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
+	then
+		epatch ${FILESDIR}/${PF}-makefile-fpic.patch
+	fi
+
+	# Compilation fix for xorg-7.1
+	epatch ${FILESDIR}/${P}-xorg-7.1-compile-fix.patch
+
+	# Switch up the CC and CFLAGS stuff.
+	sed -i \
+		-e "s:CC = gcc:CC = $(tc-getCC):g" \
+		-e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" \
+		${S}/Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
+	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd ${FILESDIR}/rc.init syndaemon
+	newconfd ${FILESDIR}/rc.conf syndaemon
+}