- up to 550.54.14

diff --git a/X11-driver-nvidia-desktop.patch b/X11-driver-nvidia-desktop.patch
index efb40820c914b1c59d227cb11966d6d6a71caa62..384872ae76bf0d181bd28d4bb12d52bb81c31e26 100644 (file)
--- a/X11-driver-nvidia-desktop.patch
+++ b/X11-driver-nvidia-desktop.patch
@@ -1,19 +1,17 @@
 --- NVIDIA-Linux-x86_64-387.22-no-compat32/nvidia-settings.desktop.orig        2017-10-30 19:01:41.321706656 +0100
 +++ NVIDIA-Linux-x86_64-387.22-no-compat32/nvidia-settings.desktop     2017-10-30 19:04:57.757191009 +0100
-@@ -1,10 +1,12 @@
+@@ -1,9 +1,11 @@
  [Desktop Entry]
  Type=Application
  Encoding=UTF-8
 -Name=NVIDIA X Server Settings
 -Comment=Configure NVIDIA X Server Settings
 -Exec=__UTILS_PATH__/nvidia-settings
--Icon=__PIXMAP_PATH__/nvidia-settings.png
 +Name=nVidia X Server Settings
 +Name[pl]=Ustawienia X serwera nVidii
 +Comment=Configure nVidia X Server Settings
 +Comment[pl]=Konfiguracja ustawień X serwera NVndii
 +Exec=nvidia-settings
-+Icon=nvidia-settings
+ Icon=nvidia-settings
  Categories=Settings;HardwareSettings;
  
- # Translation by Marcin Mikołajczak

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index af4c16aae11ee4693bcd6e042d7b15a09fedf0e8..cfb3c088a5684e25fcf069a2076280c3b0ad8dfd 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -3,7 +3,7 @@
 # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
-%bcond_with    system_libglvnd # use system libglvnd
+%bcond_without system_libglvnd # use system libglvnd
 %bcond_without kernel          # without kernel packages
 %bcond_without userspace       # don't build userspace programs
 %bcond_with    settings        # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec)
@@ -27,13 +27,13 @@ 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:       470.63.01
+Version:       550.54.14
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5: 24ffc518e708addc9728f7f356f56ef7
+# Source0-md5: 69e77647875bef192f8458912027e44b
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
@@ -42,16 +42,16 @@ Patch0:             X11-driver-nvidia-desktop.patch
 URL:           https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
-%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.10}}
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) <= 24.1
+Requires:      xorg-xserver-server(videodrv-abi) <= 25.2
 Requires:      xorg-xserver-server(videodrv-abi) >= 4.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
-Provides:      vulkan(icd) = 1.2.155
+Provides:      vulkan(icd) = 1.3.194
 Provides:      xorg-driver-video
 Provides:      xorg-xserver-module(glx)
 Obsoletes:     XFree86-driver-nvidia < 1.0.5336-4
@@ -168,13 +168,18 @@ Summary(pl.UTF-8):        Biblioteki OpenGL (GL i GLX) Nvidia
 Group:         X11/Development/Libraries
 Requires(post,postun): /sbin/ldconfig
 %if %{with system_libglvnd}
-Requires:      libglvnd
-Requires:      libglvnd-libGL
-Requires:      libglvnd-libGLES
+Requires:      libglvnd >= 1.3.4-2
+Requires:      libglvnd-libGL >= 1.3.4-2
+Requires:      libglvnd-libGLES >= 1.3.4-2
 %endif
 Requires:      libvdpau >= 0.3
 Provides:      OpenGL = 4.6
 Provides:      OpenGL-GLX = 1.4
+%if %{with system_libglvnd}
+Provides:      glvnd(EGL)%{?_isa}
+Provides:      glvnd(GL)%{?_isa}
+Provides:      glvnd(GLES)%{?_isa}
+%endif
 Obsoletes:     X11-OpenGL-core < 1:7.0.0
 Obsoletes:     X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:     XFree86-OpenGL-core < 1:7.0.0
@@ -280,7 +285,8 @@ sterownik nVidii dla Xorg/XFree86.\
 %defattr(644,root,root,755)\
 %dir /lib/firmware/nvidia\
 %dir /lib/firmware/nvidia/%{version}\
-/lib/firmware/nvidia/%{version}/gsp.bin\
+/lib/firmware/nvidia/%{version}/gsp_ga10x.bin\
+/lib/firmware/nvidia/%{version}/gsp_tu10x.bin\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
 \
@@ -321,11 +327,11 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kerne
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \
+install -d $RPM_BUILD_ROOT%{_libdir}/{gbm,nvidia,xorg/modules/{drivers,extensions/nvidia}} \
        $RPM_BUILD_ROOT{%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
        $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \
-       $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d}
+       $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d,egl/egl_external_platform.d}
 
 %ifarch %{x8664}
 %if %{with settings}
@@ -370,33 +376,33 @@ for f in \
        %{srcdir}/libEGL_nvidia.so.%{version}           \
        %{srcdir}/libGLESv1_CM_nvidia.so.%{version}     \
        %{srcdir}/libGLESv2_nvidia.so.%{version}                \
-%ifarch %{x8664}
-       %{srcdir}/libnvidia-egl-wayland.so.1.1.7                \
-       %{srcdir}/libnvidia-eglcore.so.%{version}               \
-%endif
        %{srcdir}/libcuda.so.%{version}                 \
        %{srcdir}/libnvcuvid.so.%{version}              \
-%ifarch %{x8664}
-       %{srcdir}/libnvidia-cbl.so.%{version}   \
-       %{srcdir}/libnvidia-cfg.so.%{version}           \
-       %{srcdir}/libnvidia-ngx.so.%{version}           \
-       %{srcdir}/libnvidia-nvvm.so.4.0.0               \
-       %{srcdir}/libnvidia-rtcore.so.%{version}        \
-       %{srcdir}/libnvoptix.so.%{version}      \
-%endif
        %{srcdir}/libnvidia-allocator.so.%{version}     \
-       %{srcdir}/libnvidia-compiler.so.%{version}      \
        %{srcdir}/libnvidia-encode.so.%{version}                \
        %{srcdir}/libnvidia-fbc.so.%{version}   \
        %{srcdir}/libnvidia-glcore.so.%{version}                \
        %{srcdir}/libnvidia-glsi.so.%{version}          \
        %{srcdir}/libnvidia-glvkspirv.so.%{version}             \
-       %{srcdir}/libnvidia-ifr.so.%{version}           \
+       %{srcdir}/libnvidia-gpucomp.so.%{version}               \
        %{srcdir}/libnvidia-ml.so.%{version}            \
+       %{srcdir}/libnvidia-nvvm.so.%{version}          \
        %{srcdir}/libnvidia-opencl.so.%{version}                \
        %{srcdir}/libnvidia-opticalflow.so.%{version}           \
        %{srcdir}/libnvidia-ptxjitcompiler.so.%{version}        \
        %{srcdir}/libnvidia-tls.so.%{version}           \
+%ifarch %{x8664}
+       %{srcdir}/libcudadebugger.so.%{version}         \
+       %{srcdir}/libnvidia-api.so.1                    \
+       %{srcdir}/libnvidia-egl-gbm.so.1.1.1            \
+       %{srcdir}/libnvidia-egl-wayland.so.1.1.13               \
+       %{srcdir}/libnvidia-eglcore.so.%{version}               \
+       %{srcdir}/libnvidia-cfg.so.%{version}           \
+       %{srcdir}/libnvidia-ngx.so.%{version}           \
+       %{srcdir}/libnvidia-pkcs11-openssl3.so.%{version}               \
+       %{srcdir}/libnvidia-rtcore.so.%{version}        \
+       %{srcdir}/libnvoptix.so.%{version}      \
+%endif
 ; do
        install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
 done
@@ -442,22 +448,24 @@ ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidi
 ln -sf libGLESv1_CM_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1
 ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2_nvidia.so.2
 
+ln -sf ../nvidia/libnvidia-allocator.so.%{version} $RPM_BUILD_ROOT%{_libdir}/gbm/nvidia-drm_gbm.so
+
 %ifarch %{x8664}
 install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d
+install -p 15_nvidia_gbm.json $RPM_BUILD_ROOT%{_datadir}/egl/egl_external_platform.d
+install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d
 %endif
 ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so
 ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so
 
-%ifarch %{x8664}
-install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d
-%endif
 %endif
 
 %ifarch %{x8664}
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT
 cp -a installed/* $RPM_BUILD_ROOT
-install -D firmware/gsp.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp.bin
+install -D firmware/gsp_ga10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_ga10x.bin
+install -D firmware/gsp_tu10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_tu10x.bin
 %endif
 %endif
 
@@ -507,6 +515,7 @@ EOF
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
 %endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
+%attr(755,root,root) %{_libdir}/gbm/nvidia-drm_gbm.so
 %dir %{_libdir}/nvidia
 %if %{without system_libglvnd}
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0
@@ -531,32 +540,14 @@ EOF
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_indirect.so.0
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_nvidia.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLX_nvidia.so.*.*
-%ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so
 %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvcuvid.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so
-%ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cbl.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ngx.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ngx.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-nvvm.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvvm.so.4
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-rtcore.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvoptix.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvoptix.so.1
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-allocator.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-allocator.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-encode.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-encode.so.1
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-fbc.so.1
@@ -564,10 +555,11 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.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-gpucomp.so.*.*
 %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-nvvm.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-nvvm.so.4
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opticalflow.so.*.*
@@ -578,6 +570,26 @@ EOF
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
 %ifarch %{x8664}
+%attr(755,root,root) %{_libdir}/nvidia/libcudadebugger.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libcudadebugger.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-api.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-gbm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-gbm.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ngx.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ngx.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-pkcs11-openssl3.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-rtcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvoptix.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvoptix.so.1
+# which package should own those?
+%dir %{_datadir}/egl
+%dir %{_datadir}/egl/egl_external_platform.d
+%{_datadir}/egl/egl_external_platform.d/15_nvidia_gbm.json
 %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
 %{_datadir}/vulkan/icd.d/nvidia_icd.json
 %endif