X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=5679dbd5636449d04ff29ea1e02447291d123c2a;hp=a0281012e817c2a9712157865f7d49da3b232bc4;hb=4c6ac3379777b4aed5c90697b6fb97ff7a703e5d;hpb=54a5a04068997546a36a3c8e1d424e4b7cadc735 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index a028101..5679dbd 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -25,7 +25,7 @@ %define no_install_post_check_so 1 %define pname xorg-driver-video-nvidia -%define rel 3%{?with_multigl:.mgl} +%define rel 7%{?with_multigl:.mgl} Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez @@ -251,7 +251,9 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ + $RPM_BUILD_ROOT/etc/OpenCL/vendors + %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif @@ -261,22 +263,26 @@ cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +install -p nvidia.icd $RPM_BUILD_ROOT/etc/OpenCL/vendors + +%if %{without multigl} +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir} +%else +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia +%endif for f in \ - libGL.so.%{version} \ libOpenCL.so.1.0.0 \ libXvMCNVIDIA.so.%{version} \ libcuda.so.%{version} \ + libnvcuvid.so.%{version} \ libnvidia-cfg.so.%{version} \ + libnvidia-compiler.so.%{version} \ libnvidia-glcore.so.%{version} \ libnvidia-ml.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do -%if %{without multigl} install -p $f $RPM_BUILD_ROOT%{_libdir} -%else - install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia -%endif done /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} @@ -303,19 +309,11 @@ echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so - -ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so.1 -ln -sf nvidia/libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so - -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 -ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so - -ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so -ln -sf nvidia/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.%{version} %else # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so +%endif ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so.1 ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so @@ -325,7 +323,9 @@ ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so -%endif + +ln -sf libnvcuvid.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so.1 +ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so %endif %if %{with kernel} @@ -386,31 +386,21 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %files libs %defattr(644,root,root,755) +%dir /etc/OpenCL +%dir /etc/OpenCL/vendors +/etc/OpenCL/vendors/nvidia.icd %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %dir %{_libdir}/nvidia %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%attr(755,root,root) %{_libdir}/libOpenCL.so -%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1 -%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 -%attr(755,root,root) %{_libdir}/libcuda.so -%attr(755,root,root) %ghost %{_libdir}/libcuda.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* %else %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libGL.so.1 # symlink for binary apps which fail to conform Linux OpenGL ABI # (and dlopen libGL.so instead of libGL.so.1) %attr(755,root,root) %{_libdir}/libGL.so +%endif %attr(755,root,root) %{_libdir}/libOpenCL.so %attr(755,root,root) %{_libdir}/libOpenCL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1 @@ -420,13 +410,16 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %attr(755,root,root) %{_libdir}/libcuda.so %attr(755,root,root) %ghost %{_libdir}/libcuda.so.1 %attr(755,root,root) %{_libdir}/libcuda.so.*.* +%attr(755,root,root) %{_libdir}/libnvcuvid.so +%attr(755,root,root) %ghost %{_libdir}/libnvcuvid.so.1 +%attr(755,root,root) %{_libdir}/libnvcuvid.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %ghost %{_libdir}/libnvidia-cfg.so.1 +%attr(755,root,root) %{_libdir}/libnvidia-compiler.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-ml.so.*.* %attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%endif %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1