From 13c1fa55b5e7b2aa56e1b3f925725ea1fb4d5e67 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:46:50 +0100 Subject: [PATCH] need to rename libGL etc. as libGL_nvidia or ldconfig will overwrite libglvnd library [release 340.108-9mamba;Sun Apr 25 2021] --- nvidia_340.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/nvidia_340.spec b/nvidia_340.spec index abb1e7b..5b70a6c 100644 --- a/nvidia_340.spec +++ b/nvidia_340.spec @@ -2,7 +2,7 @@ Name: nvidia_340 Version: 340.108 Epoch: 1 -Release: 8mamba +Release: 9mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -134,10 +134,10 @@ ln -s libglx.so.%{version} %{buildroot}%{_libdir}/nvidia/xorg/libglx.so.1 ln -s libglx.so.%{version} %{buildroot}%{_libdir}/nvidia/xorg/libglx.so # EGL and OpenGL ES libraries -install -D -m755 libGL.so.%{version} %{buildroot}%{_libdir}/libGL.so.%{version} -install -D -m755 libEGL.so.%{version} %{buildroot}%{_libdir}/libEGL.so.%{version} -install -D -m755 libGLESv1_CM.so.%{version} %{buildroot}%{_libdir}/libGLESv1_CM.so.%{version} -install -D -m755 libGLESv2.so.%{version} %{buildroot}%{_libdir}/libGLESv2.so.%{version} +install -D -m755 libGL.so.%{version} %{buildroot}%{_libdir}/nvidia/libGL.so.%{version} +install -D -m755 libEGL.so.%{version} %{buildroot}%{_libdir}/nvidia/libEGL.so.%{version} +install -D -m755 libGLESv1_CM.so.%{version} %{buildroot}%{_libdir}/nvidia/libGLESv1_CM.so.%{version} +install -D -m755 libGLESv2.so.%{version} %{buildroot}%{_libdir}/nvidia/libGLESv2.so.%{version} # OpenGL core library install -D -m755 libnvidia-glcore.so.%{version} %{buildroot}%{_libdir}/libnvidia-glcore.so.%{version} @@ -265,7 +265,7 @@ if [ $1 -eq 0 ]; then fi : -%triggerpostun -n xorg-drv-video-%{name} -- xorg-drv-video-%{name} < 1:340.108-8mamba +%triggerpostun -n xorg-drv-video-%{name} -- xorg-drv-video-%{name} < 1:340.108-9mamba # /bin and /sbin are removed during old filesystem postun # Fixes for removal of alternatives overwriting symlinks belonging to libglvnd [ "`readlink -f %{_libdir}/libGL.so.1`" = "%{_libdir}/libGL.so.340.108" ] && ln -sf libGL.so.1.7.0 %{_libdir}/libGL.so.1 @@ -282,10 +282,10 @@ fi %{_bindir}/nvidia-* %{_prefix}/lib/systemd/system/nvidia-persistenced.service %{_prefix}/lib/sysusers.d/nvidia.conf -%{_libdir}/libEGL.so.* -%{_libdir}/libGL.so.* -%{_libdir}/libGLESv1_CM.so.* -%{_libdir}/libGLESv2.so.* +%{_libdir}/nvidia/libEGL.so.* +%{_libdir}/nvidia/libGL.so.* +%{_libdir}/nvidia/libGLESv1_CM.so.* +%{_libdir}/nvidia/libGLESv2.so.* %{_libdir}/libcuda.so.* %{_libdir}/libnvcuvid.so.* %{_libdir}/libnvidia-*.so.* @@ -311,6 +311,9 @@ fi %doc current/{NVIDIA_Changelog,README.txt} current/html %changelog +* Sun Apr 25 2021 Silvan Calarco 340.108-9mamba +- need to rename libGL etc. as libGL_nvidia or ldconfig will overwrite libglvnd library + * Sun Apr 25 2021 Silvan Calarco 340.108-8mamba - fix for removal of alternatives overwriting symlinks belonging to libglvnd