jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg: setup xorg depending on loaded graphic driver, not on installed hardware

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-10-22 07:37:48 +02:00
parent 67bf0d9c3b
commit cbe3f5f73d
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/x11/xserver/xorg-server/init.d/15_xorg
View File

@ -26,6 +26,7 @@
. /etc/profile . /etc/profile
(
XORG_DEFAULT_CONF="/etc/X11/xorg.conf" XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_NVIDIA_CHD_CONF="/etc/X11/xorg-nvidia-chd.conf" XORG_NVIDIA_CHD_CONF="/etc/X11/xorg-nvidia-chd.conf"
@ -34,7 +35,17 @@
[ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6" [ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
( # find used graphic driver
if [ -d /sys/module/i915 ]; then
DRIVER="intel"
elif [ -d /sys/module/nouveau ]; then
DRIVER="nouveau"
elif [ -d /sys/module/nvidia ]; then
DRIVER="nvidia"
else
DRIVER="other"
fi
progress "creating directories needed for Xorg" progress "creating directories needed for Xorg"
mkdir -p /var/cache/xkb mkdir -p /var/cache/xkb
@ -42,26 +53,23 @@
mkdir -m 1777 -p /tmp/.ICE-unix mkdir -m 1777 -p /tmp/.ICE-unix
chown root:root /tmp/.ICE-unix chown root:root /tmp/.ICE-unix
if lspci -n | grep 0300 | grep -q 10de; then # test if nvidia kernel driver is loaded,
if [ "$DRIVER" = "nvidia" ]; then
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
XORG_ARGS="$XORG_ARGS -ignoreABI" XORG_ARGS="$XORG_ARGS -ignoreABI"
# check if we have an Broadcom CrystalHD card installed, so we can disable # check if we have an Broadcom CrystalHD card installed, so we can disable
# the use of shared memory # the use of shared memory
if lspci -n | grep 0480 | grep -q 14e4; then if lspci -n | grep 0480 | grep -q 14e4; then
XORG_CONF="$XORG_NVIDIA_CHD_CONF" XORG_CONF="$XORG_NVIDIA_CHD_CONF"
else else
XORG_CONF="$XORG_NVIDIA_CONF" XORG_CONF="$XORG_NVIDIA_CONF"
fi fi
else else
ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
XORG_CONF="$XORG_DEFAULT_CONF" XORG_CONF="$XORG_DEFAULT_CONF"
fi fi
[ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF" [ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"