mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-09 04:51:27 +02:00
mkxf86config: fixed ati/nvidia and workaroiund vbox
This commit is contained in:
grimmlin
parent
b886fdbc8f
commit
481eabebac
4 changed files with 147 additions and 1 deletions
|
|
@ -1,8 +1,10 @@
|
|||
AUX mkxf86config-0.9.10.patch 12413 RMD160 741d468551aeb3fb8cdc243ad833ac1e0257c3a6 SHA1 bffabd532bd73a841966b9bac375c24ed7c274b2 SHA256 e0f792ce74f4e1fd171142d31f7a6f0107406550959958081bc3bdf265d39f7f
|
||||
AUX mkxf86config-0.9.11.patch 3626 RMD160 02c94849b8ba6ac2e6df42ce96432b9fb2806868 SHA1 3b32ac20e8e7631291d1d8304db90a43a8964944 SHA256 05f575071af255c4c84d803667b2024f0066a94337a0559ea962752e8c273275
|
||||
AUX mkxf86config.initd 145 RMD160 0246c54a139e3cbd72e53774d539e9c6beece255 SHA1 50588bf1ad9faf7ddd9d4134b52a9480be3c9a5b SHA256 471e7800547c76faae8c96b8e84343e67ea763db3eeab0850edb7675e231ff51
|
||||
AUX virtualbox-workaround.patch 648 RMD160 737e9ee1a993b6a59bfab183db09e7fc85e8ce93 SHA1 c7ffc8296fe93fe277162a98a749d639324550bf SHA256 e3157a429779d74b61181846ac3536f2d234b9e3c05213a31a752bef0f3ce10c
|
||||
AUX xorg-1.9-kbd.patch 418 RMD160 587f38fe4909d14849a1c5302ad4a58d8ed99bab SHA1 a7644482829e90f61794a0ea7a68ae1a3451b041 SHA256 8ba29d875a8d0fecab6fb6f056418b8e9996b8b8bec6137b48a27c021e7b36b1
|
||||
DIST mkxf86config-0.9.10.tar.bz2 6461 RMD160 28512dede6a8887c7cbdb31b83a2ffce082cc1db SHA1 3e9a16447f8f9b5994a34fee7de05285202efd97 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829
|
||||
DIST mkxf86config-0.9.11.tar.bz2 11977 RMD160 2b3ebee81117fba15c2d4541851efa320f63eb6f SHA1 6f7972dd5ec9bf256a9e968c81c72848ba93d4a5 SHA256 5ea02b294236f5923986c4d7e17c3f0b23f917e503fe022c9e3edcdf5c3b918c
|
||||
EBUILD mkxf86config-0.9.10-r11.ebuild 1043 RMD160 809319fcc99a7dbdba66417fdbc22921cee70075 SHA1 df308361796e4c1e7755616ba09748493c8222b9 SHA256 0c55cbfc1307dd77513b2a679453356c8ba4f18a9bbeea9fcb54a8998ae8da57
|
||||
EBUILD mkxf86config-0.9.11-r1.ebuild 1045 RMD160 ce8f7f3d1cdfb5455531f42a86dcc13cd6e228ca SHA1 d4c90ee25b0f7c6908e3e1ff10219e4d977f6b90 SHA256 e077572ad84e0efbf32bc72115c3efbd6bffabe7bf8910c09a1200082cbcdac6
|
||||
EBUILD mkxf86config-0.9.11.ebuild 985 RMD160 747be72b119de832874b0e699821fce80d37715b SHA1 c4c562905f79739e47b6a51555d335230830e21b SHA256 d2fd1799e01401eaa424f92b5d20915440a1a9723e1f2392b2ab3454649d8fbf
|
||||
EBUILD mkxf86config-0.9.11-r2.ebuild 1087 RMD160 2ecf0ca5ba374df0ed6cd0add1f5f336ac69a4a6 SHA1 b6c32b44bc16fc22007f1f6e5164242b36c76d0b SHA256 545aec9b67a1999332d6b7eeefad8586ad089617ce43f25eac3e97884b60182b
|
||||
|
|
|
|||
125
x11-misc/mkxf86config/files/mkxf86config-0.9.11.patch
Normal file
125
x11-misc/mkxf86config/files/mkxf86config-0.9.11.patch
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
diff -Naur mkxf86config-0.9.11.orig/mkxf86config.sh mkxf86config-0.9.11/mkxf86config.sh
|
||||
--- mkxf86config-0.9.11.orig/mkxf86config.sh 2010-11-24 11:36:29.000000000 +0100
|
||||
+++ mkxf86config-0.9.11/mkxf86config.sh 2011-01-27 22:36:46.000000000 +0100
|
||||
@@ -1,7 +1,10 @@
|
||||
#!/bin/bash
|
||||
+# Some stuff got taken from mkxorgconfig made by
|
||||
+# (C) Klaus Knopper 2006
|
||||
+# License: GPL V2
|
||||
|
||||
source /etc/profile
|
||||
-source /sbin/functions.sh
|
||||
+source /lib/rc/sh/functions.sh
|
||||
|
||||
# First, get the command line
|
||||
CMDLINE="$(</proc/cmdline)"
|
||||
@@ -57,6 +60,12 @@
|
||||
esac
|
||||
done
|
||||
|
||||
+#Ripped from knoppix
|
||||
+checkbootparam(){
|
||||
+ case "$CMDLINE" in *\ $1*) return 0;; esac
|
||||
+ return 1
|
||||
+}
|
||||
+
|
||||
TMPFILE="/tmp/mkxf86config-$$"
|
||||
MONITORTMP="${TMPFILE}-monitor"
|
||||
|
||||
@@ -165,6 +174,8 @@
|
||||
eselect opengl set xorg-x11
|
||||
;;
|
||||
esac
|
||||
+else
|
||||
+ eselect opengl set xorg-x11
|
||||
fi
|
||||
|
||||
# We used to use ddcxinfo-knoppix for monitor information, now we will just let
|
||||
@@ -305,7 +316,7 @@
|
||||
MODES="Modes \"1024x768\" \"800x600\" \"640x480\""
|
||||
fi
|
||||
|
||||
-#VirtualPC special handline
|
||||
+#Vbox special handline
|
||||
VBOX="$(echo ${XDESC} | grep -oi virtualbox)"
|
||||
if [ -n "${VBOX}" ]
|
||||
then
|
||||
@@ -328,16 +339,12 @@
|
||||
SWCURSOR=""
|
||||
MONITORLAYOUT=""
|
||||
case "${XMODULE}" in
|
||||
- ati|nv|trident|nvidia)
|
||||
- SWCURSOR='s|^.*#Option.*"sw_cursor".*$|Option "sw_cursor"|g;'
|
||||
- ;;
|
||||
- radeon|fglrx)
|
||||
+ trident)
|
||||
SWCURSOR='s|^.*#Option.*"sw_cursor".*$|Option "sw_cursor"|g;'
|
||||
- MONITORLAYOUT='s|^.*#Option.*"MonitorLayout".*$|Option "MonitorLayout"|g;'
|
||||
;;
|
||||
esac
|
||||
|
||||
-# We must use NoPM, because some machines freeze if Power management is beingi
|
||||
+# We must use NoPM, because some machines freeze if Power management is being
|
||||
# activated.
|
||||
NOPM=""
|
||||
DPMS=""
|
||||
@@ -348,15 +355,16 @@
|
||||
NOCOMPOSITE=''
|
||||
fi
|
||||
|
||||
-#checkbootparam noapm && NOPM='Option "NoPM" "true"' || DPMS='Option "DPMS" "true"'
|
||||
+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
|
||||
+# We are in 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' \
|
||||
-e 's|@@NOPM@@|'"${NOPM}"'|g' \
|
||||
+ -e 's|@@DPMS@@|'"${DPMS}"'|g' \
|
||||
-e 's|@@XMODULE@@|'"${XMODULE}"'|g;'"${NOCOMPOSITE}""${VMWARE}""${VPC}""${SERIALMOUSE}""${USBMOUSE}""${PSMOUSE}""${SWCURSOR}""${MONITORLAYOUT}""${WHEEL}""${SYNMOUSE}""${ALPSMOUSE}""${MOUSEDRIVER}" \
|
||||
-e 's|@@SYNDEV@@|'"${SYNDEV}"'|g' \
|
||||
-e 's|@@ALPSDEV@@|'"${ALPSDEV}"'|g' \
|
||||
diff -Naur mkxf86config-0.9.11.orig/xorg.conf.in mkxf86config-0.9.11/xorg.conf.in
|
||||
--- mkxf86config-0.9.11.orig/xorg.conf.in 2010-11-24 11:14:51.000000000 +0100
|
||||
+++ mkxf86config-0.9.11/xorg.conf.in 2011-01-27 21:53:58.000000000 +0100
|
||||
@@ -11,8 +11,10 @@
|
||||
|
||||
Section "ServerFlags"
|
||||
Option "AllowMouseOpenFail" "true"
|
||||
+ # Prevent HAL from breaking this config
|
||||
Option "AutoAddDevices" "false"
|
||||
@@NOPM@@
|
||||
+ @@DPMS@@
|
||||
EndSection
|
||||
|
||||
Section "Extensions"
|
||||
@@ -207,10 +209,15 @@
|
||||
BoardName "All"
|
||||
# BusID "PCI:1:0:0"
|
||||
|
||||
+# compiz, beryl 3D-Support with DRI & Composite
|
||||
Option "XAANoOffscreenPixmaps"
|
||||
Option "AllowGLXWithComposite" "true"
|
||||
Option "EnablePageFlip" "true"
|
||||
Option "TripleBuffer" "true"
|
||||
+
|
||||
+# Tweaks for the xorg 7.4 (otherwise broken) "intel" driver
|
||||
+ Option "Tiling" "no"
|
||||
+ Option "Legacy3D" "false"
|
||||
EndSection
|
||||
|
||||
Section "Screen"
|
||||
@@ -253,3 +260,10 @@
|
||||
Section "DRI"
|
||||
Mode 0666
|
||||
EndSection
|
||||
+
|
||||
+Section "InputClass"
|
||||
+ Identifier "Keyboard Defaults"
|
||||
+ MatchIsKeyboard "yes"
|
||||
+ Option "XkbLayout" ""
|
||||
+EndSection
|
||||
+
|
||||
14
x11-misc/mkxf86config/files/virtualbox-workaround.patch
Normal file
14
x11-misc/mkxf86config/files/virtualbox-workaround.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff -Naur mkxf86config-0.9.11/mkxf86config.sh mkxf86config-0.9.11.vbox/mkxf86config.sh
|
||||
--- mkxf86config-0.9.11/mkxf86config.sh 2011-01-27 22:36:46.000000000 +0100
|
||||
+++ mkxf86config-0.9.11.vbox/mkxf86config.sh 2011-01-28 00:06:15.000000000 +0100
|
||||
@@ -320,8 +320,8 @@
|
||||
VBOX="$(echo ${XDESC} | grep -oi virtualbox)"
|
||||
if [ -n "${VBOX}" ]
|
||||
then
|
||||
- XMODULE="vboxvideo"
|
||||
- DEPTH='s|DefaultColorDepth 24|DefaultColorDepth 16|g;'
|
||||
+ XMODULE="vesa"
|
||||
+# DEPTH='s|DefaultColorDepth 24|DefaultColorDepth 16|g;'
|
||||
PSMOUSE='s|^.*InputDevice.*"PS/2 Mouse".*$|# PS/2 Mouse using /dev/input/mice in Kernel 2.6|g;'
|
||||
MODES="Modes \"1024x768\" \"800x600\" \"640x480\""
|
||||
fi
|
||||
|
|
@ -23,6 +23,11 @@ pkg_setup() {
|
|||
ewarn "YOU HAVE BEEN WARNED!!!"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}".patch
|
||||
epatch "${FILESDIR}"/virtualbox-workaround.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /etc/X11
|
||||
if use mips
|
||||
Loading…
Reference in a new issue