[xorg-x11-drv-nvidia] Use different output class for rhel as it chokes on options
commit d0fb7e09eefe1380c193ade7ba2d438f21749eec
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 11 12:45:15 2018 +0000
Use different output class for rhel as it chokes on options
rhel_nvidia.conf | 8 ++++++++
xorg-x11-drv-nvidia.spec | 10 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/rhel_nvidia.conf b/rhel_nvidia.conf
new file mode 100644
index 0000000..9c5e953
--- /dev/null
+++ b/rhel_nvidia.conf
@@ -0,0 +1,8 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "OutputClass"
+ Identifier "nvidia"
+ MatchDriver "nvidia-drm"
+ Driver "nvidia"
+EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 747d928..4b4bacd 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 410.73
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -37,6 +37,7 @@ Source11: nvidia-uvm.conf
Source12: 99-nvidia-dracut.conf
Source13: 10-nvidia.rules
Source14: nvidia-fallback.service
+Source15: rhel_nvidia.conf
ExclusiveArch: x86_64 i686
@@ -288,7 +289,11 @@ install -p -m 0644
nvidia-application-profiles-%{version}-{rc,key-documentation}
#Install the Xorg configuration files
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
+%if 0%{?fedora}
install -pm 0644 %{SOURCE6} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%else
+install -pm 0644 %{SOURCE15} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%endif
#Ghost Xorg nvidia.conf files
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
@@ -475,6 +480,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Sun Nov 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:410.73-2
+- Use different output class for rhel as it chokes on options
+
* Thu Oct 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:410.73-1
- Update to 410.73 release