[xorg-x11-drv-nvidia/el7] Do not create the /usr/lib64/xorg/modules/nvidia-%{version} symlink and remove redundant Optimus con
commit 5b9e8ffd69628b80e89c9883e73765e4bc84766c
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Apr 10 10:05:25 2017 +0200
Do not create the /usr/lib64/xorg/modules/nvidia-%{version} symlink and remove
redundant Optimus configuration.
On systems prior to Fedora 25 the modules directory is specified in the file
/etc/X11/xorg.conf.d/99-nvidia.conf, which is always loaded even if a user has a custom
xorg.conf. On Fedora 25+, if the driver is installed and is not actually used (fallback
scenario) this makes the X server to always load the Nvidia extension.
On Fedora 25+ the OutputClass configuration for the i915 driver is alreay at this
default for Intel gen4+ systems, on Intel gen3 systems it prevents the usage of Glamor and
there are no gen3 Optimus laptops.
nvidia.conf | 6 ------
xorg-x11-drv-nvidia.spec | 8 --------
2 files changed, 14 deletions(-)
---
diff --git a/nvidia.conf b/nvidia.conf
index b2d9a85..d19ec75 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -11,9 +11,3 @@ Section "OutputClass"
Option "BaseMosaic" "on"
ModulePath "@LIBDIR@/nvidia/xorg"
EndSection
-
-Section "OutputClass"
- Identifier "intel"
- MatchDriver "i915"
- Driver "modesetting"
-EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ba1d1fd..b503d70 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -324,11 +324,6 @@ desktop-file-install --vendor "" \
--dir %{buildroot}%{_datadir}/applications/ \
nvidia-settings.desktop
-%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
-#Workaround for self made xorg.conf using a Files section.
-ln -fs ../../%{_nvidia_serie}/xorg
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
-%endif
-
#Alternate-install-present is checked by the nvidia .run
install -p -m 0644 %{SOURCE7} %{buildroot}%{_nvidia_libdir}
@@ -473,9 +468,6 @@ fi ||:
%{_nvidia_xorgdir}/libglx.so
%{_nvidia_xorgdir}/libglx.so.%{version}
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
-%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
-%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
-%endif
%ifarch %{arm}
%{_libdir}/libnvidia-gtk2.so.%{version}
%endif