8:40 a.m.
commit 78f133dff2109b4e5010988c9834803d1ac57942
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 9 09:39:58 2016 +0100
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 <leigh123linux(a)googlemail.com> - 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 <leigh123linux(a)googlemail.com> - 1:370.23-1
- Update to 370.23 beta