From c3441e3800086362666065a990a0fd86d095e3c2 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 19 Aug 2016 11:10:18 +0100 Subject: [PATCH 1/3] Update to 370.23 beta --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d2e4697..6657b94 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-367.35.run /NVIDIA-Linux-x86-367.35.run /NVIDIA-Linux-x86_64-367.35.run +/NVIDIA-Linux-armv7l-gnueabihf-370.23.run +/NVIDIA-Linux-x86-370.23.run +/NVIDIA-Linux-x86_64-370.23.run diff --git a/sources b/sources index ce3c206..485115a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0ddfd2f9ce7c2c1f1949bf22569c4dd1 NVIDIA-Linux-armv7l-gnueabihf-367.35.run -42db6f6485c3c337c7c756380ec64b7a NVIDIA-Linux-x86-367.35.run -04c35b49507ced02f4e9dd08a1796c87 NVIDIA-Linux-x86_64-367.35.run +a8b1b04e5947105f3273e129a1b65d0b NVIDIA-Linux-armv7l-gnueabihf-370.23.run +7b7466e23ae6ffa97106c9749aee2628 NVIDIA-Linux-x86-370.23.run +65b99201ca894ea9a878593fbb19f0a3 NVIDIA-Linux-x86_64-370.23.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ee37334..df14cd7 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 367.35 -Release: 3%{?dist} +Version: 370.23 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -541,6 +541,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Fri Aug 19 2016 Leigh Scott - 1:370.23-1 +- Update to 370.23 beta + * Wed Aug 10 2016 Leigh Scott - 1:367.35-3 - Revert last commit - add ldconfig in %%post and %%postun for main package rfbz#3998 From 78f133dff2109b4e5010988c9834803d1ac57942 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Sep 2016 09:39:58 +0100 Subject: [PATCH 2/3] Update to 370.28 --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 21 ++++++++++++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6657b94..c9a0fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-370.23.run /NVIDIA-Linux-x86-370.23.run /NVIDIA-Linux-x86_64-370.23.run +/NVIDIA-Linux-armv7l-gnueabihf-370.28.run +/NVIDIA-Linux-x86-370.28.run +/NVIDIA-Linux-x86_64-370.28.run diff --git a/sources b/sources index 485115a..d79d988 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a8b1b04e5947105f3273e129a1b65d0b NVIDIA-Linux-armv7l-gnueabihf-370.23.run -7b7466e23ae6ffa97106c9749aee2628 NVIDIA-Linux-x86-370.23.run -65b99201ca894ea9a878593fbb19f0a3 NVIDIA-Linux-x86_64-370.23.run +6cbd700d92e702923a332bff9491592a NVIDIA-Linux-armv7l-gnueabihf-370.28.run +7d3e1c691cd53852f422a93169268178 NVIDIA-Linux-x86-370.28.run +95a6401db6576eaeea6ba4bc06fb61d2 NVIDIA-Linux-x86_64-370.28.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index df14cd7..75be761 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 370.23 +Version: 370.28 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -124,6 +124,8 @@ Summary: Libraries for %{name} Group: User Interface/X Hardware Support Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.5 +# GlVND +#Requires: libglvnd %description libs This package provides the shared libraries for %{name}. @@ -164,6 +166,7 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} +# GLVND note: If kwizart doesn't add a ld.so.conf.d file to glvnd we will need to add it here # ld.so.conf.d file install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf @@ -172,6 +175,9 @@ echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ +# GLVND +#rm libGL.so.%{version} + # Simple wildcard install of libs install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir} install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ @@ -183,9 +189,9 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so -install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ -install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ -ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so + +# GlVND +#ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 %ifarch x86_64 i686 # OpenCL config @@ -536,11 +542,16 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-glsi.so +# GlVND note: remove libGL.so %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libGLX_nvidia.so -%{_nvidia_libdir}/libOpenGL.so %changelog +* Fri Sep 09 2016 Leigh Scott - 1:370.28-1 +- Update to 370.28 +- Remove surplus glvnd libs (not used) +- Prepare for fedora glvnd package + * Fri Aug 19 2016 Leigh Scott - 1:370.23-1 - Update to 370.23 beta From 0890182399d3ba80992816fa11c64984e5f1f330 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 13 Sep 2016 16:53:07 +0100 Subject: [PATCH 3/3] glvnd lib needed for non-glvnd setup --- xorg-x11-drv-nvidia.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 75be761..2e4e5f6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -189,9 +189,10 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so +install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ # GlVND -#ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 +ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 %ifarch x86_64 i686 # OpenCL config @@ -547,6 +548,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Tue Sep 13 2016 Leigh Scott - 1:370.28-2 +- readd libGLdispatch.so.0 + * Fri Sep 09 2016 Leigh Scott - 1:370.28-1 - Update to 370.28 - Remove surplus glvnd libs (not used)