jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg-server:

Browse Source 
- dont install and run native acpid package
- more logging in debugmode
- support for xorg-nvidia.conf if found
This commit is contained in:
Stephan Raue 2009-12-10 16:08:24 +01:00
parent 543a81d71a
commit 6966a4c47c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/x11/xserver/xorg-server/conf.d/xorg
View File

@ -9,6 +9,7 @@
# X environment variables. # X environment variables.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
DISPLAY=':0.0' DISPLAY=':0.0'
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor" XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
export DISPLAY export DISPLAY
@ -17,23 +18,27 @@ export DISPLAY
# do not change anything below # do not change anything below
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
[ $DEBUG = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
start_xorg() { start_xorg() {
if lspci -n | grep 0300 | grep -q 10de; then if lspci -n | grep 0300 | grep -q 10de; then
progress "Found nVidia card, enabling binary driver as requested" progress "Found nVidia card, enabling binary driver as requested"
[ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
mkdir -p /var/lib mkdir -p /var/lib
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
else else
progress "Not found nVidia card, enabling OSS driver as requested" progress "Not found nVidia card, enabling OSS driver as requested"
mkdir -p /var/lib mkdir -p /var/lib
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
fi fi
mkdir -p /var/run
acpid 2>&1 > /dev/null
mkdir -p /var/cache/xkb mkdir -p /var/cache/xkb
exec /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 & exec /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
} }

1
packages/x11/xserver/xorg-server/install
View File

@ -75,5 +75,4 @@ get_graphicdrivers
done done
# Tools # Tools
$SCRIPTS/install acpid
$SCRIPTS/install pciutils $SCRIPTS/install pciutils