Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=beb2b784430a0594ab76c3c20dcf59bd0befdfaf
commit beb2b784430a0594ab76c3c20dcf59bd0befdfaf Author: bouleetbil <[email protected]> Date: Thu Nov 3 20:34:08 2011 +0100 xf86-input-synaptics-1.4.1-2-x86_64 *fix config close #4617 *move 20-synaptics.conf to xf86-input-synaptics *remove useless readme diff --git a/source/x11/xf86-input-synaptics/20-synaptics.conf b/source/x11/xf86-input-synaptics/20-synaptics.conf new file mode 100644 index 0000000..13b3b11 --- /dev/null +++ b/source/x11/xf86-input-synaptics/20-synaptics.conf @@ -0,0 +1,21 @@ +Section "InputClass" + Identifier "Touchpad" + Driver "synaptics" + MatchIsTouchpad "on" + Option "MinSpeed" "0.5" + Option "MaxSpeed" "1.0" + Option "AccelFactor" "0.075" + Option "TapButton1" "1" + Option "TapButton2" "2" # multitouch + Option "TapButton3" "3" # multitouch + Option "VertTwoFingerScroll" "1" # multitouch + Option "HorizTwoFingerScroll" "1" # multitouch + Option "VertEdgeScroll" "1" + Option "CoastingSpeed" "8" + Option "CornerCoasting" "1" + Option "CircularScrolling" "1" + Option "CircScrollTrigger" "7" + Option "EdgeMotionUseAlways" "1" + Option "LBCornerButton" "8" # browser "back" btn + Option "RBCornerButton" "9" # browser "forward" btn +EndSection diff --git a/source/x11/xf86-input-synaptics/FrugalBuild b/source/x11/xf86-input-synaptics/FrugalBuild index 68befb8..e0da712 100644 --- a/source/x11/xf86-input-synaptics/FrugalBuild +++ b/source/x11/xf86-input-synaptics/FrugalBuild @@ -9,20 +9,24 @@ Fuse $USE_DEVEL && pkgver=1.1.99.31.gc9527bdc Finclude xorg replaces=('synaptics') _F_cd_path="$pkgname-$pkgver" -source=($source README.Frugalware) +source=($source 20-synaptics.conf) sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae' \ - 'fcc70fb810074bfdc9a89cc1211fc8d75c1c964b') + '6ef139705d61c570172873ac3cfe35c90485d554') if Fuse $USE_DEVEL; then unset source sha1sums _F_scm_type="git" _F_scm_url="git://anongit.freedesktop.org/xorg/driver/xf86-input-synaptics" Finclude scm - source=($source README.Frugalware) + source=($source 20-synaptics.conf) fi archs=(${archs[@]} 'ppc' 'arm') makedepends=(${makedepends[@]} 'util-macros') -pkgrel=1 +#remove after 1.6 (fix conflicts) +depends=(${depends[@]} 'xorg-server>=1.10.4-3') + +pkgrel=2 +backup=('etc/X11/xorg.conf.d/20-synaptics.conf') build() { @@ -33,6 +37,8 @@ build() Fpatchall Fmake Fmakeinstall + Fmkdir etc/X11/xorg.conf.d/ + Fcp 20-synaptics.conf etc/X11/xorg.conf.d/ } # optimization OK diff --git a/source/x11/xf86-input-synaptics/README.Frugalware b/source/x11/xf86-input-synaptics/README.Frugalware deleted file mode 100644 index ad38d35..0000000 --- a/source/x11/xf86-input-synaptics/README.Frugalware +++ /dev/null @@ -1,45 +0,0 @@ -First of all, read the INSTALL file for the instructions. - -For lazy users, here's what i had to do to get the driver working: - -1. Make sure you have the 'evdev' kernel module loaded _before_ the x server -started (or restart it after you loaded the module). - -2. Now open your '/etc/X11/xorg.conf' and add the following: -+ ----------------- -Load "synaptics" ----------------- -+ -to the "Module" section. - -3. Replace the content of your "InputDevice" section to the followings: -+ ------------------------------------------------ -Section "InputDevice" - Identifier "Synaptics Mouse" - Driver "synaptics" - Option "Device" "/dev/psaux" - Option "Protocol" "auto-dev" - 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 "MinSpeed" "0.09" - Option "MaxSpeed" "0.18" - Option "AccelFactor" "0.0015" - Option "SHMConfig" "on" -# Option "Repeater" "/dev/ps2mouse" -EndSection ------------------------------------------------ - -4. Add this line to the "ServerLayout" Section: -+ --------------------------------------------- -InputDevice "Synaptics Mouse" "CorePointer" --------------------------------------------- _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
