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

xorg-server: allow using multiple nvidia drivers

Browse Source
This commit is contained in:
Lukas Rusak 2015-12-09 15:19:50 -08:00
parent bae6dcc1cd
commit 390da478ac
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/x11/xserver/xorg-server/package.mk
View File

@ -148,6 +148,11 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/xorg mkdir -p $INSTALL/usr/lib/xorg
cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg
. $ROOT/packages/x11/driver/xf86-video-nvidia/package.mk
sed -i -e "s|@NVIDIA_VERSION@|${PKG_VERSION}|g" $INSTALL/usr/lib/xorg/xorg-configure
. $ROOT/packages/x11/driver/xf86-video-nvidia-legacy/package.mk
sed -i -e "s|@NVIDIA_LEGACY_VERSION@|${PKG_VERSION}|g" $INSTALL/usr/lib/xorg/xorg-configure
. $ROOT/packages/x11/xserver/xorg-server/package.mk
if [ ! "$OPENGL" = "no" ]; then if [ ! "$OPENGL" = "no" ]; then
if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then

20
packages/x11/xserver/xorg-server/scripts/xorg-configure
View File

@ -73,6 +73,26 @@ logger -t Xorg "### creating needed directories and symlinks ###"
if [ "$1" = "nvidia" ]; then if [ "$1" = "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
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko
XORG_ARGS="$XORG_ARGS -ignoreABI"
elif [ "$1" = "nvidia-legacy" ]; then
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko
XORG_ARGS="$XORG_ARGS -ignoreABI" XORG_ARGS="$XORG_ARGS -ignoreABI"
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

4
packages/x11/xserver/xorg-server/system.d/xorg-configure@.service
View File

@ -1,9 +1,9 @@
[Unit] [Unit]
Description=configure Xorg Server for %I Description=configure Xorg Server for %i
ConditionKernelCommandLine=!installer ConditionKernelCommandLine=!installer
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/lib/xorg/xorg-configure %I ExecStart=/usr/lib/xorg/xorg-configure %i
RemainAfterExit=yes RemainAfterExit=yes

6
packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
View File

@ -20,12 +20,6 @@ ACTION!="add|change", GOTO="end_video"
# xorg_start only does something for subsystem "pci" and "video" class. # xorg_start only does something for subsystem "pci" and "video" class.
SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci" SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci"
SUBSYSTEM=="drivers", GOTO="subsystem_drivers"
GOTO="end_video"
# check for drivers dont use the pci substem
LABEL="subsystem_drivers"
KERNEL=="nvidia", ENV{xorg_driver}="nvidia", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nvidia.service"
GOTO="end_video" GOTO="end_video"
# check for drivers using the pci substem # check for drivers using the pci substem