move installation of egl vendor file to proper block

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d9c5f709e08aff7f7924c389e1e5f0e4f4c57b87..80e20a7e57cc740c669d66f80b4a43b369e78c0a 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -33,28 +33,29 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     2
+%define                rel     1
 %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:       387.22
+Version:       387.34
 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: abdbb3c813e52148f7435308121e6a37
+# Source0-md5: 4e356a75541633ac3f9ac0f53bb65823
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: b21f9bafb20409b337505c9b1d362c34
+# Source1-md5: a009bbc502c30e4b483d71be9fa51790
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
+Patch2:                structrand.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.20.2}}
@@ -66,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.46
+Provides:      vulkan(icd) = 1.0.56
 Provides:      xorg-driver-video
 Provides:      xorg-xserver-module(glx)
 Obsoletes:     XFree86-driver-nvidia
@@ -268,6 +269,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -281,7 +283,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nv
        $RPM_BUILD_ROOT{%{_includedir}/GL,%{_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}/{nvidia,vulkan/icd.d}
+       $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d}
 
 %if %{with settings}
 install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
@@ -313,13 +315,13 @@ for f in \
        libGLdispatch.so.0                      \
        libGLESv1_CM.so.1                       \
        libGLESv2.so.2                          \
+       libEGL.so.1                             \
 %endif
        libGLX_nvidia.so.%{version}             \
-       libEGL.so.1                             \
        libEGL_nvidia.so.%{version}             \
        libGLESv1_CM_nvidia.so.%{version}       \
        libGLESv2_nvidia.so.%{version}          \
-       libnvidia-egl-wayland.so.1.0.1          \
+       libnvidia-egl-wayland.so.1.0.2          \
        libnvidia-eglcore.so.%{version}         \
 %else
        libGL.so.%{version}                     \
@@ -375,13 +377,15 @@ ln -sf libGLX.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX.so
 ln -sf libOpenGL.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenGL.so
 ln -sf libGLESv1_CM.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so
 ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so
+ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so
 %endif
 ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_nvidia.so.0
 ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indirect.so.0
-ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so
 ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidia.so.0
 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
+
+install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d
 %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
@@ -436,7 +440,6 @@ EOF
 %dir %{_datadir}/nvidia
 %{_datadir}/nvidia/nvidia-application-profiles-%{version}-key-documentation
 %{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc
-%{_datadir}/vulkan/icd.d/nvidia_icd.json
 
 %files libs
 %defattr(644,root,root,755)
@@ -454,8 +457,8 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1
+%endif
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL_nvidia.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libEGL_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1
@@ -498,6 +501,10 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
+%if %{with glvnd}
+%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
+%endif
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
 
 %files devel
 %defattr(644,root,root,755)
@@ -513,8 +520,8 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so
+%endif
 %else
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so
 %endif