* Even more fixes, for psmouse this time

This commit is contained in:
grimmlin 2009-02-14 16:40:39 +00:00
parent c281d0fbe7
commit 50c3b51c9c
3 changed files with 14 additions and 11 deletions

View file

@ -1,4 +1,4 @@
AUX mkxf86config-0.9.10.patch 10300 RMD160 e4847899a9542466eeb8c26550b7786ecbb6e130 SHA1 49fd51f734c36e5f111c3b0e024bdaff898d6c70 SHA256 79c2b76ecdcef977d40c2e1703c919b94679ff89d50a9442438258d0b50f7692
AUX mkxf86config-0.9.10.patch 10466 RMD160 da1b218403f0e0e79c6498141bd60b9729c932f1 SHA1 41d427b889c86aab5322b91fe9f77bce2e3a6cd0 SHA256 46333744d914f87b49fc2eeb782df9a89f4b9705334024848cb98950ecfd50cc
AUX mkxf86config.initd 145 RMD160 0246c54a139e3cbd72e53774d539e9c6beece255 SHA1 50588bf1ad9faf7ddd9d4134b52a9480be3c9a5b SHA256 471e7800547c76faae8c96b8e84343e67ea763db3eeab0850edb7675e231ff51
DIST mkxf86config-0.9.10.tar.bz2 6461 RMD160 28512dede6a8887c7cbdb31b83a2ffce082cc1db SHA1 3e9a16447f8f9b5994a34fee7de05285202efd97 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829
EBUILD mkxf86config-0.9.10-r4.ebuild 1047 RMD160 834e7e92a6abec7ded68e1aa22fac86dcfd8bb2a SHA1 c059c868aab6d219c7ba2e8499533c543fbf80e4 SHA256 2a27ade21a149cb57b17251baaab17f638641aa827b5885187368ae77f931932
EBUILD mkxf86config-0.9.10-r5.ebuild 1047 RMD160 834e7e92a6abec7ded68e1aa22fac86dcfd8bb2a SHA1 c059c868aab6d219c7ba2e8499533c543fbf80e4 SHA256 2a27ade21a149cb57b17251baaab17f638641aa827b5885187368ae77f931932

View file

@ -1,6 +1,6 @@
diff -Naur mkxf86config-0.9.10.orig/aticards mkxf86config-0.9.10/aticards
--- mkxf86config-0.9.10.orig/aticards 1970-01-01 01:00:00.000000000 +0100
+++ mkxf86config-0.9.10/aticards 2009-02-13 00:37:59.000000000 +0100
--- mkxf86config-0.9.10.orig/aticards 1970-01-01 00:00:00.000000000 +0000
+++ mkxf86config-0.9.10/aticards 2009-02-14 17:33:23.667693262 +0000
@@ -0,0 +1,21 @@
+Radeon.*HD.*2350
+Radeon.*HD.*2300
@ -24,8 +24,8 @@ diff -Naur mkxf86config-0.9.10.orig/aticards mkxf86config-0.9.10/aticards
+RV770
+RV670
diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86config.sh
--- mkxf86config-0.9.10.orig/mkxf86config.sh 2008-04-10 05:27:36.000000000 +0200
+++ mkxf86config-0.9.10/mkxf86config.sh 2009-02-13 00:43:52.000000000 +0100
--- mkxf86config-0.9.10.orig/mkxf86config.sh 2008-04-10 03:27:36.000000000 +0000
+++ mkxf86config-0.9.10/mkxf86config.sh 2009-02-14 17:38:21.914375716 +0000
@@ -80,6 +80,41 @@
# We create this link since hwsetup cannot properly detect serial mice
[ -e /dev/mouse ] || ln -sf /dev/ttyS0 /dev/mouse
@ -152,7 +152,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
SWCURSOR='s|^.*#Option.*"sw_cursor".*$|Option "sw_cursor"|g;'
MONITORLAYOUT='s|^.*#Option.*"MonitorLayout".*$|Option "MonitorLayout"|g;'
;;
@@ -249,14 +309,21 @@
@@ -249,14 +309,24 @@
NOPM=""
DPMS=""
@ -164,6 +164,9 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
+
#checkbootparam noapm && NOPM='Option "NoPM" "true"' || DPMS='Option "DPMS" "true"'
+# We are oin 2.6 let's remove PSMOUSE as it messes the xorg input
+PSMOUSE='s|^.*InputDevice.*"PS/2 Mouse".*$|# PS/2 Mouse using /dev/input/mice in Kernel 2.6|g;'
+
sed -e 's|@@PROTOCOL@@|'"${PROTO}"'|g;'"${NOEMU}" \
-e '/@@MONITOR@@/r '"${MONITORTMP}" \
-e 's|@@MONITOR@@||g' \
@ -176,8 +179,8 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
-e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"${XKEYBOARD}"'"|g;'"${DEADKEYS}" \
/etc/X11/xorg.conf.in >/etc/X11/xorg.conf
diff -Naur mkxf86config-0.9.10.orig/nvidiacards mkxf86config-0.9.10/nvidiacards
--- mkxf86config-0.9.10.orig/nvidiacards 1970-01-01 01:00:00.000000000 +0100
+++ mkxf86config-0.9.10/nvidiacards 2009-02-13 00:41:16.000000000 +0100
--- mkxf86config-0.9.10.orig/nvidiacards 1970-01-01 00:00:00.000000000 +0000
+++ mkxf86config-0.9.10/nvidiacards 2009-02-14 17:33:23.671026787 +0000
@@ -0,0 +1,83 @@
+GeForce.*GTX.*295
+GeForce.*GTX.*285
@ -263,8 +266,8 @@ diff -Naur mkxf86config-0.9.10.orig/nvidiacards mkxf86config-0.9.10/nvidiacards
+Quadro.*NVS.*130M
+
diff -Naur mkxf86config-0.9.10.orig/xorg.conf.in mkxf86config-0.9.10/xorg.conf.in
--- mkxf86config-0.9.10.orig/xorg.conf.in 2008-04-09 02:28:56.000000000 +0200
+++ mkxf86config-0.9.10/xorg.conf.in 2009-02-13 00:37:59.000000000 +0100
--- mkxf86config-0.9.10.orig/xorg.conf.in 2008-04-09 00:28:56.000000000 +0000
+++ mkxf86config-0.9.10/xorg.conf.in 2009-02-14 17:33:23.674359474 +0000
@@ -6,6 +6,7 @@
# InputDevice "Serial Mouse" "AlwaysCore"
InputDevice "USB Mouse" "AlwaysCore"