Last snapshot before switching to the new driver (x11-drivers/xf86-input-synaptics) with the new xorg.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

8 files changed, 222 insertions, 12 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 7c4df65436cc..ca080305ae87 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.37 2008/07/30 13:13:24 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.38 2008/08/29 20:01:49 calchan Exp $
+
+*synaptics-0.14.6_p20070706 (29 Aug 2008)
+
+  29 Aug 2008; Denis Dupeyron <calchan@gentoo.org>
+  +files/synaptics-0.14.6_p20070706-fixeventgrab.patch,
+  +files/synaptics-0.14.6_p20070706-input_api.patch,
+  +synaptics-0.14.6_p20070706.ebuild:
+  Last snapshot before switching to the new driver
+  (x11-drivers/xf86-input-synaptics) with the new xorg.
 
 *synaptics-0.14.6-r3 (30 Jul 2008)
 
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index d5ff5eafc7ac..eef4a876537a 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -6,6 +6,8 @@ AUX synaptics-0.14.4-r2-makefile.patch 531 RMD160 64ac6a8bd06befe99f126a1cad0802
 AUX synaptics-0.14.5-makefile-fpic.patch 604 RMD160 610b6f52382cab61d669c7ed126796a7ba0c96f2 SHA1 ff235d5ea1b20a4b19a5339fc31afeb88750f8d3 SHA256 bfe89f8ecae8a0af6e8b478ed29f5fe652bf3aa6016d6c41a7a678fc25f92c36
 AUX synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249 RMD160 639955f8ae5162d4c3b4f527a6e6bb1cf4c0bb26 SHA1 0d59b2d11dbb94127ee843310e3badcaff6b61e1 SHA256 0de534613bd1df8b0b36f0387fcea858e463833bb6f4248b71c0975d7effae19
 AUX synaptics-0.14.6-configurable_polling_interval.patch 1880 RMD160 ca90cd33992df42c573547645633b30e377a146e SHA1 e3abb85af87ee6b3c356be635898840d42819c74 SHA256 f4ed2db4c2e20f703cebea778f8605187be0a84ba77fde0b69512c15462d697e
+AUX synaptics-0.14.6_p20070706-fixeventgrab.patch 3036 RMD160 c6b40e5e8827060a39e0dc64ac125f9b7306d7c1 SHA1 a4fcb3e8c3376f1fa0eab4e83a2f0a1994107555 SHA256 28640f58d83d5bdeadb713541e0ad521c2f705211a352bf1078c4f5f2509d416
+AUX synaptics-0.14.6_p20070706-input_api.patch 686 RMD160 67ecdecc01f255b4fec693e4237976a23a4e6a7a SHA1 7acb718d19a4870833dc86b6810f2af33aac56cd SHA256 829a3355fdd935ee6861687bfabe96d12efb37f13ccdc525c515dee43dc2e1f9
 AUX synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f SHA1 985ee12c3b61cdb89c97d150a52da4df85e2f236 SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c
 AUX synaptics-fix-xinerama.patch 602 RMD160 128bc48024c04d789cc1393462e81c2dbe6bae5c SHA1 225993afe0f2ec6be5df7e132f60a92db0c54815 SHA256 8feb3ca55e1c476b068dda6b411ad6a317ac8fa4d3569fe38a0e5af14b8cb1c7
 AUX synaptics-fixeventgrab.diff 2826 RMD160 0888ceb9cb2847d336be4c267ee8a4f6aee76a1d SHA1 38de7f5c4c94f89e5170b4ff6306cc6b1d7fac84 SHA256 90f49ad2885202a23ad70e3630d712dc26249c4d3035cff2e0094de2f806dab8
@@ -13,10 +15,12 @@ AUX synaptics-install-so-exec.patch 337 RMD160 e9111545b7c04ab66bd1ff36d116d25ba
 AUX synaptics_input_api.diff 2181 RMD160 c7adda057b1591721abb4e2cba73e5fca1442361 SHA1 e0ac5c149a4a2899feacc1eaea27b78fa3c4a97b SHA256 0f415142a67a1a2cac51d9e67a33e7cadd9a20846b3f187db1ab5ff280b9c1f8
 DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 SHA1 54788ea58ff0c07b3ae492e8dae9a2253b586af5 SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796
 DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 SHA1 41443e253e73546657b40435c8c9bfa0a91662bc SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
-EBUILD synaptics-0.14.5-r1.ebuild 1353 RMD160 d3071d9aae10467cef885a291afe2d53bda4ed48 SHA1 c49b2b5d9053d8ea415d3cf27cf58927d9a8c87f SHA256 d51a03799fe941502ac0431976c543462e19983e9b8eb5d601b1d51131361929
-EBUILD synaptics-0.14.6-r1.ebuild 1496 RMD160 fc1ea964251ff6d90b36cac0ce18a7947cdf75ff SHA1 6c36eeedd7f42d6bf392679dcc6e0819b2b98d7d SHA256 3a7954671361955aa9bb6ed3432350a7959b2fb9be80b15a945de5cebfcf796b
+DIST synaptics-0.14.6_p20070706.tar.bz2 129509 RMD160 bacf7f08c04a9164af2883133d479ace59f7a3ce SHA1 55077ecf4bba3ced44702aa516af7a23c5172c03 SHA256 a22e3995756ce2050832a9ee1a8b300dfa18101e00e940399e329e4f9e78cb90
+EBUILD synaptics-0.14.5-r1.ebuild 1343 RMD160 c7f963ed6ddcb094b96fff26e1a07e87a5e0a9a0 SHA1 53fa6ec7f012f3fd8ab77cfd61ef3d3de69eeba2 SHA256 2dd35c45a2626795240ece1b9250b7bae082fddc8ff970381ce080654110b121
+EBUILD synaptics-0.14.6-r1.ebuild 1489 RMD160 c3557e675525529556820e080e4405ab8df82fd3 SHA1 19c178feb284d1cf328694b1a79fcd6d0cd110b8 SHA256 0890650b349dfcced8a99d3a2f60c35d64299b51601a932d1f9cc38b807fbeb8
 EBUILD synaptics-0.14.6-r2.ebuild 2668 RMD160 c9522389758831bff4a04ff378fd86a72b3fe224 SHA1 f2dbc5ffb0cee371e6a3e0f3f2f817ec48f1f0cf SHA256 8def1f5a331ebf7dda383fa8128d09879f7b27c700668f44577c6e7c4022d67d
 EBUILD synaptics-0.14.6-r3.ebuild 2801 RMD160 048a6e21e4e457bd532557588da70d46f44e0390 SHA1 941605c80fd23dbb91e59774f8047ecfbbe14431 SHA256 c42b7f6e0156383cd3c88cf1346a40ab041230b5739204980644fe8805c3c24b
-EBUILD synaptics-0.14.6.ebuild 1286 RMD160 5001b92fda3d0acf80d325611ebcc65f179b6028 SHA1 9364cda9afc70e1e2d6ce593c6bcf2b364fd155f SHA256 8a14d65bfdbb6f5b9ecae840ed5f6c2cd41c1821b8a5f35e2e9fb085ee2b3222
-MISC ChangeLog 17197 RMD160 846544f04fb88310adf3f74e3ee1f2ca2bd481cd SHA1 1ed3c40ee205ba431fa549e0342c8b0d69e01825 SHA256 aaf94bac99f9df2b341f06bc0755cf0174003af1d042f273a954db1b4b52f095
+EBUILD synaptics-0.14.6.ebuild 1279 RMD160 1fa2942ca32f97267d9faf57c84db995865aa9a7 SHA1 5d7aa9963e43411d9945b5fb74bf55605eaa69f0 SHA256 a957b171c46d85b4dff88eba3a912d462bdad238510534cbd873131e242dfdfb
+EBUILD synaptics-0.14.6_p20070706.ebuild 2802 RMD160 f1bc4e3c8b90a7ad8ffbed3f5458fdfd4115b6ab SHA1 698152e81b157a21da3c32327bc05232bc0dfd5b SHA256 e8c1d9c20be9ba8790ef56a83015059234ae3c67715e21a4bc5820e9d0056b44
+MISC ChangeLog 17549 RMD160 2acdd6bf83963becd5cdde4876dcebd4654637db SHA1 35fb83b67f71e9f2e18b6378527b247c04f85044 SHA256 6d04592d3c38e785f4b300d258f01aad8bacda3c3ae704e2f2730805c00f1352
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-fixeventgrab.patch b/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-fixeventgrab.patch
new file mode 100644
index 000000000000..6ed8e68f8999
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-fixeventgrab.patch
@@ -0,0 +1,82 @@
+diff -urN synaptics-0.14.6_p20070706.orig/eventcomm.c synaptics-0.14.6_p20070706/eventcomm.c
+--- synaptics-0.14.6_p20070706.orig/eventcomm.c	2008-08-29 09:34:11.000000000 +0200
++++ synaptics-0.14.6_p20070706/eventcomm.c	2008-08-29 10:23:04.000000000 +0200
+@@ -41,17 +41,25 @@
+  *	Function Definitions
+  ****************************************************************************/
+ 
+-static void
++static Bool
++grab_event_device(int fd)
++{
++    int ret;
++    SYSCALL(ret = ioctl(fd, EVIOCGRAB, (pointer)1));
++    return !(ret < 0);
++}
++
++static Bool
+ EventDeviceOnHook(LocalDevicePtr local, SynapticsSHM *para)
+ {
+     if (para->grab_event_device) {
+ 	/* Try to grab the event device so that data don't leak to /dev/input/mice */
+-	int ret;
+-	SYSCALL(ret = ioctl(local->fd, EVIOCGRAB, (pointer)1));
+-	if (ret < 0) {
++	if(!grab_event_device(local->fd)) {
+ 	    xf86Msg(X_WARNING, "%s can't grab event device, errno=%d\n",
+ 		    local->name, errno);
++	return FALSE;
+ 	}
++    return TRUE;
+     }
+ }
+ 
+@@ -273,6 +281,7 @@
+ 	char fname[64];
+ 	int fd = -1;
+ 	Bool is_touchpad;
++	Bool is_grabbable;
+ 
+ 	sprintf(fname, "%s/%s%d", DEV_INPUT_EVENT, EVENT_DEV_NAME, i);
+ 	SYSCALL(fd = open(fname, O_RDONLY));
+@@ -289,7 +298,14 @@
+ 	noent_cnt = 0;
+ 	have_evdev = TRUE;
+ 	is_touchpad = event_query_is_touchpad(fd);
+-	if (is_touchpad) {
++	/** 
++	* Check whether device can be grabbed. This means there is a race 
++	* condition with EventDeviceOnHook, which can't be solved cleanly
++	* the way things are done with the current design. One possible 
++	* solution would be to keep the file descriptor open.
++	*/
++	is_grabbable = grab_event_device(fd);
++	if (is_touchpad && is_grabbable) {
+ 	    xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
+ 		    local->name, fname);
+ 	    xf86ReplaceStrOption(local->options, "Device", fname);
+diff -urN synaptics-0.14.6_p20070706.orig/synaptics.c synaptics-0.14.6_p20070706/synaptics.c
+--- synaptics-0.14.6_p20070706.orig/synaptics.c	2008-08-29 09:34:11.000000000 +0200
++++ synaptics-0.14.6_p20070706/synaptics.c	2008-08-29 10:26:01.000000000 +0200
+@@ -595,7 +595,8 @@
+ 	return !Success;
+     }
+ 
+-    priv->proto_ops->DeviceOnHook(local, priv->synpara);
++    if(!priv->proto_ops->DeviceOnHook(local, priv->synpara))
++	return !Success;
+ 
+     priv->comm.buffer = XisbNew(local->fd, 64);
+     if (!priv->comm.buffer) {
+diff -urN synaptics-0.14.6_p20070706.orig/synproto.h synaptics-0.14.6_p20070706/synproto.h
+--- synaptics-0.14.6_p20070706.orig/synproto.h	2008-08-29 09:34:11.000000000 +0200
++++ synaptics-0.14.6_p20070706/synproto.h	2008-08-29 10:28:34.000000000 +0200
+@@ -77,7 +77,7 @@
+ struct CommData;
+ 
+ struct SynapticsProtocolOperations {
+-    void (*DeviceOnHook)(LocalDevicePtr local, struct _SynapticsSHM *para);
++    Bool (*DeviceOnHook)(LocalDevicePtr local, struct _SynapticsSHM *para);
+     void (*DeviceOffHook)(LocalDevicePtr local);
+     Bool (*QueryHardware)(LocalDevicePtr local, struct SynapticsHwInfo *synhw);
+     Bool (*ReadHwState)(LocalDevicePtr local, struct SynapticsHwInfo *synhw,
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-input_api.patch b/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-input_api.patch
new file mode 100644
index 000000000000..036147a4cd46
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.6_p20070706-input_api.patch
@@ -0,0 +1,15 @@
+diff -urN synaptics-0.14.6_p20070706.orig/Makefile synaptics-0.14.6_p20070706/Makefile
+--- synaptics-0.14.6_p20070706.orig/Makefile	2008-08-29 09:34:11.000000000 +0200
++++ synaptics-0.14.6_p20070706/Makefile	2008-08-29 10:40:29.000000000 +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 --git a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild
index 0710949eeae4..291f7e9343b4 100644
--- a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r1.ebuild,v 1.8 2007/10/09 07:57:35 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild,v 1.9 2008/08/29 20:01:49 calchan Exp $
 
 inherit toolchain-funcs eutils
 
@@ -46,7 +46,7 @@ src_install() {
 		install || die
 
 	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
-	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+	dodoc COMPATIBILITY FILES INSTALL* NEWS TODO README*
 
 	# Stupid new daemon, didn't work for me because of shm issues
 	newinitd "${FILESDIR}"/rc.init syndaemon
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild
index c0c23d55a5b0..376ffcee88d2 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild,v 1.3 2008/04/07 15:17:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild,v 1.4 2008/08/29 20:01:49 calchan Exp $
 
 inherit toolchain-funcs eutils
 
@@ -48,7 +48,7 @@ src_install() {
 		install || die
 
 	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
-	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+	dodoc COMPATIBILITY FILES INSTALL* NEWS TODO README*
 
 	# Stupid new daemon, didn't work for me because of shm issues
 	newinitd "${FILESDIR}"/rc.init syndaemon
diff --git a/x11-drivers/synaptics/synaptics-0.14.6.ebuild b/x11-drivers/synaptics/synaptics-0.14.6.ebuild
index 8395519edb6f..2f6c93589021 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.10 2008/04/07 15:17:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.11 2008/08/29 20:01:49 calchan Exp $
 
 inherit toolchain-funcs eutils
 
@@ -43,7 +43,7 @@ src_install() {
 		install || die
 
 	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
-	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+	dodoc COMPATIBILITY FILES INSTALL* NEWS TODO README*
 
 	# Stupid new daemon, didn't work for me because of shm issues
 	newinitd "${FILESDIR}"/rc.init syndaemon
diff --git a/x11-drivers/synaptics/synaptics-0.14.6_p20070706.ebuild b/x11-drivers/synaptics/synaptics-0.14.6_p20070706.ebuild
new file mode 100644
index 000000000000..54fb480c3367
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.6_p20070706.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6_p20070706.ebuild,v 1.1 2008/08/29 20:01:49 calchan Exp $
+
+inherit toolchain-funcs eutils linux-info
+
+IUSE="hal"
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
+SRC_URI="http://dev.gentoo.org/~calchan/distfiles/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-server
+	x11-proto/inputproto
+	>=sys-apps/sed-4"
+
+evdev-input_check() {
+	# Check kernel config for required event interface support (either
+	# built-in or as a module. Bug #134309.
+
+	ebegin "Checking kernel config for event device support"
+	linux_chkconfig_present INPUT_EVDEV
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "Synaptics driver requires event interface support."
+		ewarn "Please enable the event interface in your kernel config."
+		ewarn "The option can be found at:"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      -*- Generic input layer"
+		ewarn "        <*> Event interface"
+		ewarn
+		ewarn "Then rebuild the kernel or install the module."
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	evdev-input_check
+}
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	# 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
+
+	# Fix grabbing of event devices so it will not stop working together with
+	# packages which grab their devices at their own like sys-apps/inputd does.
+	epatch "${FILESDIR}"/${P}-fixeventgrab.patch
+
+	epatch "${FILESDIR}"/${P}-input_api.patch
+
+	# Patch the Makefile to install the library as executable. Bug #215323.
+	epatch "${FILESDIR}"/synaptics-install-so-exec.patch
+
+	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
+	epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+
+	# Adds configurable polling interval. Patch from Novell. Bug #216679.
+	epatch "${FILESDIR}"/${PN}-0.14.6-configurable_polling_interval.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		MANDIR="${D}"/usr/share/man \
+		install || die
+
+	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
+	dodoc COMPATIBILITY FILES INSTALL* 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
+
+	if use hal ; then
+		# Have HAL assign this driver to supported touchpads.
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		doins "${FILESDIR}"/11-x11-synaptics.fdi
+	fi
+}