[arch-commits] Commit in xf86-input-synaptics/repos (3 files)

[Jan de Groot]

    Date: Sunday, March 15, 2009 @ 13:19:09
  Author: jgc
Revision: 29999

Merged revisions 29998 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-input-synaptics/trunk

........
  r29998 | jgc | 2009-03-15 17:18:58 +0000 (Sun, 15 Mar 2009) | 3 lines
  
  upgpkg: xf86-input-synaptics 1.1.0-1
      Use synaptics drivers for ETPS/2 touchpads also
  Enable tapping by default
........

Added:
  xf86-input-synaptics/repos/testing-x86_64/11-x11-synaptics.fdi
    (from rev 29998, xf86-input-synaptics/trunk/11-x11-synaptics.fdi)
Modified:
  xf86-input-synaptics/repos/testing-x86_64/	(properties)
  xf86-input-synaptics/repos/testing-x86_64/PKGBUILD

----------------------+
 11-x11-synaptics.fdi |   37 +++++++++++++++++++++++++++++++++++++
 PKGBUILD             |    9 +++++----
 2 files changed, 42 insertions(+), 4 deletions(-)


Property changes on: xf86-input-synaptics/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-input-synaptics/trunk:1-28741
   + /xf86-input-synaptics/trunk:1-29998

Copied: xf86-input-synaptics/repos/testing-x86_64/11-x11-synaptics.fdi (from rev 29998, xf86-input-synaptics/trunk/11-x11-synaptics.fdi)
===================================================================
--- testing-x86_64/11-x11-synaptics.fdi	                        (rev 0)
+++ testing-x86_64/11-x11-synaptics.fdi	2009-03-15 17:19:09 UTC (rev 29999)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.product" contains="ETPS/2 Elantech Touchpad">
+        <append key="info.capabilities" type="strlist">input.touchpad</append>
+    </match> 
+    <match key="info.capabilities" contains="input.touchpad">
+        <merge key="input.x11_driver" type="string">synaptics</merge>
+	<merge key="input.x11_options.TapButton1" type="string">1</merge>
+	<merge key="input.x11_options.TapButton2" type="string">3</merge>
+	<merge key="input.x11_options.TapButton3" type="string">2</merge>
+        <!-- Arbitrary options can be passed to the driver using
+             the input.x11_options property since xorg-server-1.5. -->
+        <!-- EXAMPLES:
+        Switch on shared memory, enables the driver to be configured at runtime
+	<merge key="input.x11_options.SHMConfig" type="string">true</merge>
+
+	Maximum movement of the finger for detecting a tap
+	<merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
+
+	Enable vertical scrolling when dragging along the right edge
+	<merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
+
+	Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
+	<merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
+
+	Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
+	<merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
+
+	If on, circular scrolling is used
+	<merge key="input.x11_options.CircularScrolling" type="string">true</merge>
+
+	For other possible options, check CONFIGURATION DETAILS in synaptics man page
+        -->
+    </match>
+  </device>
+</deviceinfo>

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-15 17:18:58 UTC (rev 29998)
+++ testing-x86_64/PKGBUILD	2009-03-15 17:19:09 UTC (rev 29999)
@@ -4,7 +4,7 @@
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-input-synaptics
-pkgver=1.0.99.2
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="synaptics driver for notebook touchpads"
 arch=(i686 x86_64)
@@ -17,8 +17,9 @@
 provides=('synaptics')
 conflicts=('synaptics')
 options=(!libtool)
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('baac9f27665b91958fb5fca270591316')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	11-x11-synaptics.fdi)
+md5sums=('d9a05d53c728400e00e6bc146758c6e5' '798099dd5f8ead6c5d002e33464ebb43')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,7 +27,7 @@
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   install -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
-  install -m644 fdi/*.fdi "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" || return 1
+  install -m644 ${srcdir}/11-x11-synaptics.fdi "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" || return 1
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }