X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=89ce0bfc0622dc6dc11c30dc14014b0bf77bdca0;hp=92a500a49bf489ff9eb800d028ad561d0120555c;hb=c185e63d3abe0effaa9bbf2351f46fda92ccef7b;hpb=3a265d3028903c6d5e64dde1c5cb1450b0c28030 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 92a500a..89ce0bf 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -4,7 +4,6 @@ # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: -%bcond_without glvnd # without GL vendor neutral libs %bcond_with system_libglvnd # do not use system libglvnd %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs @@ -20,12 +19,6 @@ exit 1 %endif -%if %{with glvnd} -%define vulkan_lib libGLX_nvidia.so.0 -%else -%define vulkan_lib libGL.so.1 -%endif - %if %{without userspace} # nothing to be placed to debuginfo package %define _enable_debug_packages 0 @@ -33,25 +26,26 @@ exit 1 %define no_install_post_check_so 1 -%define rel 2 +%define rel 3 %define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips 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: 430.40 +Version: 440.44 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_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run -# Source0-md5: 3a1d7e988d5cb03669aa93ec3fea74ba +# Source0-md5: 8b72e9af14e43171405526a308a08796 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-desktop.patch +Patch1: kernel-5.5.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}} @@ -59,11 +53,11 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 24.0 +Requires: xorg-xserver-server(videodrv-abi) <= 24.1 Requires: xorg-xserver-server(videodrv-abi) >= 4.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver -Provides: vulkan(icd) = 1.1.84 +Provides: vulkan(icd) = 1.1.119 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -116,7 +110,7 @@ Summary: OpenGL (GL and GLX) Nvidia libraries Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries Requires(post,postun): /sbin/ldconfig -%if %{with glvnd} && %{with system_libglvnd} +%if %{with system_libglvnd} Requires: libglvnd Requires: libglvnd-libGL Requires: libglvnd-libGLES @@ -259,6 +253,7 @@ rm -rf NVIDIA-Linux-x86_64-%{version} /bin/sh %{SOURCE0} --extract-only %setup -qDT -n NVIDIA-Linux-x86_64-%{version} %patch0 -p1 +%patch1 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build @@ -306,7 +301,6 @@ install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/ %endif for f in \ -%if %{with glvnd} %if %{without system_libglvnd} %{srcdir}/libGL.so.1.7.0 \ %{srcdir}/libGLX.so.0 \ @@ -321,11 +315,8 @@ for f in \ %{srcdir}/libGLESv1_CM_nvidia.so.%{version} \ %{srcdir}/libGLESv2_nvidia.so.%{version} \ %ifarch %{x8664} - %{srcdir}/libnvidia-egl-wayland.so.1.1.2 \ + %{srcdir}/libnvidia-egl-wayland.so.1.1.4 \ %{srcdir}/libnvidia-eglcore.so.%{version} \ -%endif -%else - %{srcdir}/libGL.so.%{version} \ %endif %{srcdir}/libcuda.so.%{version} \ %{srcdir}/libnvcuvid.so.%{version} \ @@ -374,7 +365,6 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf %endif # OpenGL ABI for Linux compatibility -%if %{with glvnd} %if %{without system_libglvnd} ln -sf libGL.so.1.7.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so @@ -396,15 +386,11 @@ ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2 %ifarch %{x8664} install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d %endif -%else -ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 -ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so -%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} -sed 's!__NV_VK_ICD__!%{vulkan_lib}!g' nvidia_icd.json.template > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json +install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d %endif %endif @@ -462,7 +448,6 @@ EOF %endif} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf %dir %{_libdir}/nvidia -%if %{with glvnd} %if %{without system_libglvnd} %attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 @@ -490,10 +475,6 @@ EOF %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.* %endif -%else -%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%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 @@ -529,15 +510,12 @@ EOF %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 %ifarch %{x8664} -%if %{with glvnd} %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -%endif %{_datadir}/vulkan/icd.d/nvidia_icd.json %endif %files devel %defattr(644,root,root,755) -%if %{with glvnd} %if %{without system_libglvnd} %attr(755,root,root) %{_libdir}/nvidia/libGL.so %attr(755,root,root) %{_libdir}/nvidia/libGLX.so @@ -546,9 +524,6 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so %attr(755,root,root) %{_libdir}/nvidia/libEGL.so %endif -%else -%attr(755,root,root) %{_libdir}/nvidia/libGL.so -%endif %{_pkgconfigdir}/gl.pc %files doc