From 8d5d47973767365fc0434a3d318578c8b8928306 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 25 Jul 2017 00:20:12 +0200 Subject: [PATCH] up to 384.59 --- linux-4.1-and-older.patch | 2 +- xorg-driver-video-nvidia.spec | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/linux-4.1-and-older.patch b/linux-4.1-and-older.patch index cf88a4e..3f0b751 100644 --- a/linux-4.1-and-older.patch +++ b/linux-4.1-and-older.patch @@ -3,7 +3,7 @@ @@ -21,6 +21,7 @@ */ - #include "conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ +#include #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 8124554..ec3eea6 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -40,15 +40,15 @@ Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 381.22 +Version: 384.59 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 8825cec1640739521689bd80121d1425 +# Source0-md5: 8d2a2049d0509875c5dc0d9a0275aee4 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 0e9590d48703c8baa034b6f0f8bbf1e5 +# Source1-md5: 778318b0fd2d5d511474a8987cc7dbe5 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -67,7 +67,7 @@ Requires: xorg-xserver-server(videodrv-abi) <= 23.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver -Provides: vulkan(icd) = 1.0.42 +Provides: vulkan(icd) = 1.0.46 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -387,7 +387,7 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so -sed 's!"library_path":[[:blank:]]*"[^"]\+"!"library_path": "%{vulkan_lib}"!g' nvidia_icd.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json +sed 's!__NV_VK_ICD__!%{vulkan_lib}!g' nvidia_icd.json.template > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json %endif %if %{with kernel} @@ -483,6 +483,7 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ifr.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ifr.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.* -- 2.43.0