Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-drivers/synaptics
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/synaptics')
-rw-r--r--x11-drivers/synaptics/ChangeLog13
-rw-r--r--x11-drivers/synaptics/Manifest6
-rw-r--r--x11-drivers/synaptics/files/digest-synaptics-0.14.4-r21
-rw-r--r--x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile-fpic.patch14
-rw-r--r--x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile.patch16
-rw-r--r--x11-drivers/synaptics/synaptics-0.14.4-r2.ebuild65
6 files changed, 113 insertions, 2 deletions
diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index b57531d0a947..ce6d344047d3 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for x11-drivers/synaptics
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.5 2005/12/16 19:15:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.6 2005/12/16 21:51:34 seemant Exp $
+
+*synaptics-0.14.4-r2 (16 Dec 2005)
+
+ 16 Dec 2005; Seemant Kulleen <seemant@gentoo.org>
+ +files/synaptics-0.14.4-r2-makefile.patch,
+ +files/synaptics-0.14.4-r2-makefile-fpic.patch,
+ +synaptics-0.14.4-r2.ebuild:
+ ok, this should finally fix those bugs -- thanks to: Pierre Poissinger for
+ the split patch and for testing. Thanks to Donnie and Bryan for hanging in
+ there with me. Thanks to everyone on those bugs for their patience. Also,
+ I'd like to thank the academy...
16 Dec 2005; Seemant Kulleen <seemant@gentoo.org>
synaptics-0.14.4-r1.ebuild:
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index d450ae4c5885..45b4dd82e0d5 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -1,12 +1,16 @@
-MD5 fc9623f8d6b5da8fa62afa619231b734 ChangeLog 10778
+MD5 4f56b6e4338169fb6ed2ee204c65f855 ChangeLog 11258
MD5 b18951d106b4ce580ac6177b199cf712 files/digest-synaptics-0.14.2 69
MD5 f2c16c935f2447340a41eb72bb137f57 files/digest-synaptics-0.14.3 69
MD5 7a7d3c5180f7a18b8b19bc2221017874 files/digest-synaptics-0.14.4-r1 69
+MD5 7a7d3c5180f7a18b8b19bc2221017874 files/digest-synaptics-0.14.4-r2 69
MD5 31817e2d99f1b5c23a2bb0594627752b files/rc.conf 330
MD5 4ef0a2fcc08eef0bc884af9f20117702 files/rc.init 446
MD5 505b504efec01c7e2e529606db762098 files/synaptics-0.14.4-r1-makefile.patch 1109
+MD5 9c394639aca08200943f5b0216cf7714 files/synaptics-0.14.4-r2-makefile-fpic.patch 681
+MD5 7916241c4f3c3337cc1af96d450195b7 files/synaptics-0.14.4-r2-makefile.patch 531
MD5 f2c484f02a746852ee1295ca1f092e8d files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
MD5 1cb923bfa5e7e99ae6804f147a1c730c metadata.xml 164
MD5 2a4687edaec022b5305d3ec2b019acc0 synaptics-0.14.2.ebuild 2028
MD5 cbce8427827b5b3fc38fe018192422af synaptics-0.14.3.ebuild 2029
MD5 01d50b881f1d2ba1eac4c98b6fd56e5f synaptics-0.14.4-r1.ebuild 1741
+MD5 c1ebf89e88cc436ff6cc89368d164110 synaptics-0.14.4-r2.ebuild 1999
diff --git a/x11-drivers/synaptics/files/digest-synaptics-0.14.4-r2 b/x11-drivers/synaptics/files/digest-synaptics-0.14.4-r2
new file mode 100644
index 000000000000..e4c6cde43e5b
--- /dev/null
+++ b/x11-drivers/synaptics/files/digest-synaptics-0.14.4-r2
@@ -0,0 +1 @@
+MD5 ae9aef7a146346fbfc7edfdd63cdd273 synaptics-0.14.4.tar.bz2 125524
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile-fpic.patch b/x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile-fpic.patch
new file mode 100644
index 000000000000..09ad34030b40
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile-fpic.patch
@@ -0,0 +1,14 @@
+--- Makefile.orig 2005-12-15 16:07:36.000000000 -0500
++++ Makefile 2005-12-15 16:08:45.000000000 -0500
+@@ -62,9 +62,9 @@
+
+ CCOPTIONS := -pedantic -Wall -Wpointer-arith
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+-CCOPTIONS += $(call check_gcc,-fno-pic,)
++CCOPTIONS += $(call check_gcc,)
+ 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.4-r2-makefile.patch b/x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile.patch
new file mode 100644
index 000000000000..ba385cd25d35
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.4-r2-makefile.patch
@@ -0,0 +1,16 @@
+--- Makefile.orig 2005-12-15 16:07:36.000000000 -0500
++++ Makefile 2005-12-15 16:08:45.000000000 -0500
+@@ -7,10 +7,10 @@
+ # Define the TOP variable to build using include files from a local source tree.
+ #TOP = /usr/src/redhat/BUILD/XFree86-4.3.0/xc
+
+-INSTALLED_X = $(DESTDIR)/usr/X11R6
++INSTALLED_X = $(DESTDIR)/usr
+ LOCAL_X = Xincludes/usr/X11R6
+-BINDIR = $(DESTDIR)/usr/local/bin
+-MANDIR = $(DESTDIR)/usr/local/man
++BINDIR = $(DESTDIR)/usr/bin
++MANDIR = $(DESTDIR)/usr/share/man
+
+ ifeq ($(ARCH),)
+ ARCH = $(shell /bin/arch)
diff --git a/x11-drivers/synaptics/synaptics-0.14.4-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.4-r2.ebuild
new file mode 100644
index 000000000000..30923de674d7
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.4-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.4-r2.ebuild,v 1.1 2005/12/16 21:51:34 seemant Exp $
+
+inherit toolchain-funcs eutils
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dlloader"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( x11-base/xorg-server virtual/x11 )
+ >=sys-apps/sed-4"
+
+src_unpack() {
+ unpack ${A} ; cd ${S}
+
+ epatch ${FILESDIR}/${PF}-makefile.patch
+
+ 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
+
+ # 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
+ if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
+ then
+ $(tc-getCC) -shared -nostdlib -o synaptics_drv.so synaptics_drv.o -Bstatic -lgcc
+ fi
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+ if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
+ then
+ if has_version ">=x11-base/xorg-x11-7.0" || has_version ">=x11-base/xorg-server-0.99"
+ then
+ exeinto /usr/$(get_libdir)/xorg/modules/input
+ doexe synaptics_drv.so
+ else
+ exeinto /usr/$(get_libdir)/modules/input
+ doexe synaptics_drv.so
+ fi
+ rm ${D}/usr/$(get_libdir)/modules/input/synaptics_drv.o
+ fi
+
+ dodoc script/usbmouse alps.patch
+ 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
+}