[Midnightbsd-cvs] mports: mports/x11-drivers: synaptics does not work with recent xorg
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 15 16:45:59 EDT 2009
Log Message:
-----------
synaptics does not work with recent xorg versions.
Modified Files:
--------------
mports/x11-drivers:
Makefile (r1.2 -> r1.3)
Removed Files:
-------------
mports/x11-drivers/synaptics:
Makefile
distinfo
pkg-descr
pkg-message
pkg-plist
mports/x11-drivers/synaptics/files:
extra-xorg-server-1.4
patch-Makefile
patch-eventcomm.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-drivers/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-drivers/Makefile -L x11-drivers/Makefile -u -r1.2 -r1.3
--- x11-drivers/Makefile
+++ x11-drivers/Makefile
@@ -1,9 +1,7 @@
# $MidnightBSD$
-#
COMMENT = X11 drivers
- SUBDIR += synaptics
SUBDIR += xf86-input-acecad
SUBDIR += xf86-input-calcomp
SUBDIR += xf86-input-citron
--- x11-drivers/synaptics/pkg-message
+++ /dev/null
@@ -1,88 +0,0 @@
-===============================================================================
-
- * SETUP NOTE * SETUP NOTE *
-
-o Please remove ${X11BASE}/lib/modules/input/synaptics_drv.so
- manually, If you have installed synaptics-0.14.4_1. I forgot
- to chase pkg-plist on 0.14.4_1.
-
-o Add boot time tunable to /boot/loader.conf.
- Set hw.psm.synaptics_support=1 and shutdown -r now!
-
-/boot/loader.conf ---------------------------------
-hw.psm.synaptics_support=1
----------------------------------------------------
-
-o Don't run moused(8) daemon.
- Dont' set moused_enable="YES" in /etc/rc.conf.
-
-/etc/rc.conf --------------------------------------
-moused_enable="NO"
----------------------------------------------------
-
-o Set your /etc/xorg.conf (or /etc/XF86Config)
- Adopt your environment. This is a sample configration, and
- following setting is mine. You may want to change the
- values of *Edge and *Delta.
-
- *NOTE*
- Please disable your existing "CorePointer" in "ServerLayout"
- section, only use "Synaptics_Touchpad" CorePointer.
-
-/etc/xorg.conf (or /etc/XF86Config) ---------------
- :
-Section "Module"
- :
- Load "synaptics"
-EndSection
-
-Section "ServerLayout"
- :
-# InputDevice "Standard_PS/2_Mouse" "CorePointer"
- InputDevice "Synaptics_Touchpad" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "Synaptics_Touchpad"
- Driver "synaptics"
-
- Option "Device" "/dev/psm0"
- Option "Protocol" "psm"
-
- Option "LeftEdge" "1700"
- Option "RightEdge" "5300"
- Option "TopEdge" "1700"
- Option "BottomEdge" "4200"
-
- Option "FingerLow" "25"
- Option "FingerHigh" "30"
-
- Option "MaxTapTime" "180"
- Option "MaxTapMove" "220"
-
- Option "VertScrollDelta" "100"
- Option "HorizScrollDelta" "100"
-
- Option "MinSpeed" "0.06"
- Option "MaxSpeed" "0.06"
- Option "AccelFactor" "0.0010"
-
- Option "ScrollButtonRepeat" "100"
- Option "UpDownScrolling" "on"
- Option "UpDownRepeat" "on"
- Option "LeftRightScrolling" "on"
- Option "LeftRightRepeat" "on"
-
- # "SHMConfig on" seems good works with synclient(1). But this
- # options is insecure. I recommended "off" as default.
- Option "SHMConfig" "off"
-
- # If you use circular touchpad, uncomment them.
-# Option "CircularPad" "on"
-# Option "CircularScrolling" "on"
-# Option "CircScrollDelta" "0.5"
-EndSection
- :
-/etc/xorg.conf (or /etc/XF86Config) ---------------
-
-===============================================================================
--- x11-drivers/synaptics/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x.
-A Synaptics touchpad by default operates in compatibility mode by
-emulating a standard mouse. However, by using a dedicated driver,
-more advanced features of the touchpad becomes available.
-
-WWW: http://web.telia.com/~u89404340/touchpad/
--- x11-drivers/synaptics/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/synclient
- at comment bin/syndaemon
-lib/xorg/modules/input/synaptics_drv.so
- at dirrmtry lib/xorg/modules/input
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
--- x11-drivers/synaptics/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for: synaptics
-# Date created: 2004-01-02
-# Whom: nork at FreeBSD.org
-#
-# $FreeBSD: ports/x11-drivers/synaptics/Makefile,v 1.10 2007/10/07 10:36:14 erwin Exp $
-# $MidnightBSD: mports/x11-drivers/synaptics/Makefile,v 1.3 2008/08/04 13:51:47 laffer1 Exp $
-#
-
-PORTNAME= synaptics
-PORTVERSION= 0.14.6
-PORTREVISION= 1
-CATEGORIES= x11-drivers
-MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
- ${X_DISTFILES:C/$/:x11/}
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= The Synaptics touchpad X driver
-LICENSE= gpl
-
-BUILD_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT}
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_XORG= xorg-server xi xproto
-
-FAKE_OPTS= trueprefix
-
-.include <bsd.port.pre.mk>
-
-X11VERSION!= ${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \
- -VPORTVERSION
-
-MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
- http://xorg.freedesktop.org/releases/individual/xserver/:x11
-DIST_SUBDIR= xorg/xserver
-X_DISTFILES= xorg-server-1.4.2.tar.bz2
-PLIST_SUB+= XORG="" XFREE86="@comment "
-EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4
-
-post-patch:
- @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \
- ${WRKSRC}/Makefile
-
-MAKE_ENV= TOP=${WRKDIR}/xc CFLAGSCLIENT="${CFLAGS}"
-
-MAN1= synclient.1 # syndaemon.1
-MAN5= synaptics.5
-PORTDOCS= COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR \
- README README.alps TODO
-
-post-extract:
-.for FILE in ${X_DISTFILES}
- @cd ${WRKDIR} && \
- ${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf -
-.endfor
-
-
-pre-install:
- ${MKDIR} ${PREFIX}/lib/xorg/modules/input/
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for FILE in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
--- x11-drivers/synaptics/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
-SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
-SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833
-MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b
-SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
-SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638
--- x11-drivers/synaptics/files/patch-Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
---- Makefile.orig Sun Jul 16 00:58:26 2006
-+++ Makefile Sun Aug 13 10:47:35 2006
-@@ -12,14 +12,14 @@
- MANDIR = $(DESTDIR)$(PREFIX)/man
-
- ifeq ($(ARCH),)
-- ARCH = $(shell /bin/arch)
-+ ARCH = $(shell uname -m)
- endif
- ifeq ($(ARCH),amd64)
-- ARCH = x86_64
-+ override ARCH = x86_64
- endif
- ifeq ($(ARCH),x86_64)
- ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
-- LIBDIR = lib64
-+ LIBDIR = lib
- else
- ARCH_DEFINES = -D__i386__
- LIBDIR = lib
-@@ -39,7 +39,7 @@
- -I$(INSTALLED_X)/include/X11/extensions \
- -I$(SDKDIR)
- else
-- INSTALLED_X = /usr/X11R6
-+ INSTALLED_X = ${LOCALBASE}
- INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
- SYNAPTICS_DRV = synaptics_drv.o
- LDCOMBINEFLAGS = -r
-@@ -62,12 +62,16 @@
- else
- SERVERSRC = $(TOP)/programs/Xserver
- ALLINCLUDES = -I. \
-+ -I${LOCALBASE}/include \
-+ -I${LOCALBASE}/include/X11 \
-+ -I$(SERVERSRC)/hw/xfree86 \
- -I$(SERVERSRC)/hw/xfree86/common \
- -I$(SERVERSRC)/hw/xfree86/os-support \
-+ -I$(SERVERSRC)/hw/xfree86/os-support/bus \
- -I$(SERVERSRC)/mi \
- -I$(SERVERSRC)/include \
- -I$(TOP)/include
-- X_INCLUDES_ROOT = $(TOP)
-+ X_INCLUDES_ROOT = $(LOCALBASE)
- endif
- endif
-
-@@ -81,11 +85,11 @@
-
- CCOPTIONS := -pedantic -Wall -Wpointer-arith
- CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
--CDEBUGFLAGS = -O2
--CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
--CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
-+#CDEBUGFLAGS = -O2
-+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
-+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
-
--CC = gcc
-+#CC = gcc
-
- SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
- OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
-@@ -94,29 +98,29 @@
- $(RM) $@
- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
-
--all:: $(SYNAPTICS_DRV) synclient syndaemon
-+all:: $(SYNAPTICS_DRV) synclient
-
--install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
-+install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
-
--install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
-+install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5
-
- $(MANDIR)/man1/synclient.1: manpages/synclient.1
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_MAN} $< $@
-
- $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
- install --mode=0644 -D $< $@
-
- $(MANDIR)/man5/synaptics.5: manpages/synaptics.5
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_MAN} $< $@
-
- $(BINDIR)/synclient : synclient
-- install -D $< $@
-+ ${BSD_INSTALL_PROGRAM} $< $@
-
- $(BINDIR)/syndaemon : syndaemon
- install -D $< $@
-
- $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_DATA} $< $@
-
- $(SYNAPTICS_DRV): $(OBJS)
- $(RM) $@
--- x11-drivers/synaptics/files/extra-xorg-server-1.4
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -u Makefile.orig Makefile
---- Makefile.orig 2006-07-15 17:58:26.000000000 +0200
-+++ Makefile 2007-09-07 15:03:17.386179198 +0200
-@@ -34,10 +34,9 @@
- LDCOMBINEFLAGS = -shared -lc
- PICFLAG = $(call check_gcc,-fPIC,)
- X_INCLUDES_ROOT = $(INSTALLED_X)
-- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
- ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
- -I$(INSTALLED_X)/include/X11/extensions \
-- -I$(SDKDIR)
-+ `pkg-config xorg-server --cflags`
- else
- INSTALLED_X = /usr/X11R6
- INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
-diff -u synaptics.c.orig synaptics.c
---- synaptics.c.orig 2006-07-15 17:54:29.000000000 +0200
-+++ synaptics.c 2007-09-07 15:10:24.910542275 +0200
-@@ -321,7 +321,9 @@
- 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;
-+#endif
- local->history_size = 0;
- local->always_core_feedback = 0;
-
-@@ -613,8 +615,17 @@
-
- InitPointerDeviceStruct((DevicePtr)dev, map,
- SYN_MAX_BUTTONS,
-- miPointerGetMotionEvents, SynapticsCtrl,
-+#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);
-diff -u synaptics.h.orig synaptics.h
---- synaptics.h.orig 2006-07-15 17:54:29.000000000 +0200
-+++ synaptics.h 2007-09-07 15:10:12.409829887 +0200
-@@ -226,5 +226,11 @@
-
- #endif /* SYNAPTICS_PRIVATE */
-
-+/* Previously found in xf86Xinput.h */
-+#ifdef DBG
-+#undef DBG
-+#endif
-+
-+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
-
- #endif /* _SYNAPTICS_H_ */
-
--- x11-drivers/synaptics/files/patch-eventcomm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- eventcomm.c.orig Mon Aug 8 04:44:04 2005
-+++ eventcomm.c Sat Mar 18 18:54:22 2006
-@@ -55,6 +55,7 @@
- static Bool
- event_query_is_touchpad(int fd)
- {
-+#if 0
- int ret;
- unsigned long evbits[NBITS(KEY_MAX)];
-
-@@ -83,6 +84,9 @@
- return FALSE;
-
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- static Bool
More information about the Midnightbsd-cvs
mailing list