[nvidia-kmod] Update to 375.82 release
by Leigh Scott
commit 6944b5d43701959f330d718eafca039f2e2c3ec2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 25 00:01:17 2017 +0100
Update to 375.82 release
nvidia-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c16ba01..d5370f6 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-kmod
Epoch: 2
-Version: 375.66
+Version: 375.82
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -71,6 +71,9 @@ done
%changelog
+* Mon Jul 24 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.82-1
+- Update to 375.82 release
+
* Fri May 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
- Drop 4.11 kernel patch, 4.11.1 kernel fixes the GPL symbols issue
6 years, 9 months
[xorg-x11-drv-nvidia/f25] Update to 375.82 release
by Leigh Scott
commit 1a8f4a4d88123804d850b23306340369cbd21500
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Jul 24 19:57:25 2017 +0100
Update to 375.82 release
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index d20c4a9..ad4266d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d8f8bee37b237f76c533eb0c4dae9bbc NVIDIA-Linux-armv7l-gnueabihf-375.66.run
-47dddb796fe39497cf6ae374591f6eb9 NVIDIA-Linux-x86-375.66.run
-9cf2c0a342a088211f25c5d8137097e6 NVIDIA-Linux-x86_64-375.66.run
+5d233fc8464181df36db38d2fcd4bdc8 NVIDIA-Linux-armv7l-gnueabihf-375.82.run
+c8bf08d6258233eeb9aafbac3034aa12 NVIDIA-Linux-x86-375.82.run
+3d25c0429b30841e6497288de1af38fc NVIDIA-Linux-x86_64-375.82.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f04d234..55fea56 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -32,8 +32,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
-Version: 375.66
-Release: 9%{?dist}
+Version: 375.82
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -611,6 +611,10 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Mon Jul 24 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.82-1
+- Update to 375.82 release
+- Fix non-glvnd build
+
* Mon Jul 10 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-9
- Fixup for non-glvnd vulkan loader
6 years, 9 months
[xorg-x11-drv-nvidia/f25] Fix non-glvnd build
by Leigh Scott
commit d4f53586a2bf2325c3174e60f088368c08871431
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 23 12:37:35 2017 +0100
Fix non-glvnd build
xorg-x11-drv-nvidia.spec | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ddd1992..f04d234 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
+%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -227,6 +227,16 @@ cp -a \
libnvidia-ptxjitcompiler.so.%{version} \
%{buildroot}%{_libdir}/
+%if 0%{?rhel} || 0%{?fedora} == 24
+mkdir -p %{buildroot}%{_nvidia_libdir}
+cp -a \
+ libEGL.so.%{version} \
+ libGL.so.%{version} \
+ libGLdispatch.so.0 \
+ %{buildroot}%{_nvidia_libdir}/
+ldconfig -vn %{buildroot}%{_nvidia_libdir}/
+%endif
+
# Use the correct TLS implementation for x86_64/i686, already ok on ARM
# OpenCL is only available on x86_64/i686.
%ifarch x86_64 i686
@@ -259,7 +269,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
@@ -342,7 +352,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
@@ -526,6 +536,11 @@ fi ||:
%files libs
%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%{_nvidia_libdir}/libEGL.so.1
+%{_nvidia_libdir}/libEGL.so.%{version}
+%{_nvidia_libdir}/libGL.so.1
+%{_nvidia_libdir}/libGL.so.%{version}
+%{_nvidia_libdir}/libGLdispatch.so.0
%endif
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
6 years, 9 months
[xorg-x11-drv-nvidia/f25] fix up vulkan as there is no libGL.so.1 currently installad on epel7
by Leigh Scott
commit e19434ca452179e28f2a3ac75ee50439eaa262c8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:36:51 2017 +0100
fix up vulkan as there is no libGL.so.1 currently installad on epel7
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ef89af7..ddd1992 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -342,7 +342,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
6 years, 9 months
[xorg-x11-drv-nvidia/f25] fix up glvnd support for epel7
by Leigh Scott
commit 4ed950515d8ab22283e0420af443deb7c4c59b8a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:11:28 2017 +0100
fix up glvnd support for epel7
xorg-x11-drv-nvidia.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4ebedf2..ef89af7 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
+%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -259,7 +259,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
6 years, 9 months
[xorg-x11-drv-nvidia/f25] Fixup _target_cpu macro
by Leigh Scott
commit 0b22fa718cfc471950eeb79824c2d87d0fe63d36
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 10 17:44:54 2017 +0200
Fixup _target_cpu macro
xorg-x11-drv-nvidia.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a1d661d..4ebedf2 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -273,7 +273,7 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/OpenCL/vendors/
install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/
# Vulkan config
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/
-install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
+install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
# EGL config for libglvnd
@@ -342,8 +342,8 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
-touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
6 years, 9 months
[xorg-x11-drv-nvidia/f25] Fixup for non-glvnd vulkan loader
by Leigh Scott
commit d2435a3223dbd39eed5383c422486163cb900e02
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 10 13:25:30 2017 +0200
Fixup for non-glvnd vulkan loader
xorg-x11-drv-nvidia.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 6c69857..a1d661d 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -33,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -596,6 +596,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Mon Jul 10 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-9
+- Fixup for non-glvnd vulkan loader
+
* Wed Jul 05 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-8
- Make libglvnd optional on rhel
- Use boolean dependency on fedora 25 also
6 years, 9 months
[xorg-x11-drv-nvidia/f25] back to non-glvnd version for vulkan when needed
by Leigh Scott
commit 507497e8884ffd9e48a8720f4eff241fc994dcab
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 10 11:36:47 2017 +0200
back to non-glvnd version for vulkan when needed
xorg-x11-drv-nvidia.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7575c61..6c69857 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -273,7 +273,7 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/OpenCL/vendors/
install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/
# Vulkan config
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/
-install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
+install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
%endif
# EGL config for libglvnd
@@ -341,6 +341,9 @@ install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
+# back to non-glvnd version for vulkan
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
+touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
@@ -463,9 +466,6 @@ fi ||:
%doc nvidiapkg/html
%dir %{_alternate_dir}
%{_alternate_dir}/alternate-install-present
-%ifarch x86_64 i686
-%{_datadir}/vulkan/icd.d/nvidia_icd.json
-%endif
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
@@ -527,6 +527,9 @@ fi ||:
%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
+%ifarch x86_64 i686
+%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+%endif
%dir %{_nvidia_libdir}
%{_libdir}/libEGL_nvidia.so.0
%{_libdir}/libEGL_nvidia.so.%{version}
6 years, 9 months
[xorg-x11-drv-nvidia/f25] Fixup for rhel
by Leigh Scott
commit 0ff71103e016a3efd36bfaa92a0223fb909c1528
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 5 17:59:44 2017 +0200
Fixup for rhel
xorg-x11-drv-nvidia.spec | 10 +++++-----
xorg.conf.nvidia | 9 ---------
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f71a3c3..7575c61 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -42,7 +42,6 @@ Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-
Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x...
Source2: http://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linu...
-Source3: xorg.conf.nvidia
Source4: 99-nvidia.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
@@ -284,7 +283,7 @@ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_
# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
mkdir -p %{buildroot}%{_modprobe_d}
install -p -m 0644 %{SOURCE15} %{buildroot}%{_modprobe_d}
-%if ! 0%{?fedora} >= 25
+%if 0%{?rhel} && 0%{?rhel} < 8
install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
%endif
@@ -339,8 +338,9 @@ touch -r %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
%else
install -pm 0644 nvidia-drm-outputclass.conf %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
-touch -r %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
%endif
#Ghost Xorg nvidia.conf files
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
@@ -471,10 +471,10 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
+%{_datadir}/X11/xorg.conf.d/nvidia.conf
%if 0%{?fedora} >= 25
%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
%{_dracut_conf_d}/99-nvidia-dracut.conf
-%{_datadir}/X11/xorg.conf.d/nvidia.conf
%else
# Owns the directory since libglvnd is optional here
%dir %{_datadir}/glvnd
6 years, 9 months