commit dc1a4efa6978ae8f16ef36cff8b93d1b83c19af9 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sun Sep 23 10:54:08 2018 +0100 Move the new glx server lib to it's correct location nvidia.conf | 1 - xorg-x11-drv-nvidia.spec | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) --- diff --git a/nvidia.conf b/nvidia.conf index d19ec75..c7fbc6c 100644 --- a/nvidia.conf +++ b/nvidia.conf @@ -9,5 +9,4 @@ Section "OutputClass" Option "PrimaryGPU" "yes" Option "SLI" "Auto" Option "BaseMosaic" "on" - ModulePath "@LIBDIR@/nvidia/xorg" EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 4bec158..6429ba6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -1,6 +1,4 @@ %global _nvidia_serie nvidia -%global _nvidia_libdir %{_libdir}/%{_nvidia_serie} -%global _nvidia_xorgdir %{_nvidia_libdir}/xorg # Unfortunately this is always hardcoded regardless of architecture: # https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2443 # https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2556-L2558 @@ -242,8 +240,7 @@ install -p -m 0644 nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d %ifarch x86_64 # X DDX driver and GLX extension -install -p -D -m 0755 libglxserver_nvidia.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglxserver_nvidia.so.%{version} -ln -sf libglxserver_nvidia.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglxserver_nvidia.so +install -p -D -m 0755 libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so install -D -p -m 0755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so # OpenCL config @@ -397,9 +394,7 @@ fi ||: %{_dracut_conf_d}/99-nvidia-dracut.conf %{_bindir}/nvidia-bug-report.sh # Xorg libs that do not need to be multilib -%dir %{_nvidia_xorgdir} -%{_nvidia_xorgdir}/libglxserver_nvidia.so -%{_nvidia_xorgdir}/libglxserver_nvidia.so.%{version} +%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so %{_libdir}/xorg/modules/drivers/nvidia_drv.so #/no_multilib %dir %{_datadir}/nvidia