rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.124,1.125

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16090 Modified Files: xorg-x11-drv-nvidia.spec Log Message: Fix build on ARM and race with mesa Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- xorg-x11-drv-nvidia.spec 11 Dec 2013 21:59:49 -0000 1.124 +++ xorg-x11-drv-nvidia.spec 11 Dec 2013 22:56:57 -0000 1.125 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 331.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -433,8 +433,12 @@ %{_nvidia_libdir}/libOpenCL.so %{_nvidia_libdir}/libnvidia-compiler.so %{_nvidia_libdir}/libnvidia-encode.so +%{_nvidia_libdir}/libnvidia-ifr.so +%{_nvidia_libdir}/libnvidia-opencl.so +%{_nvidia_libdir}/tls/libnvidia-tls.so +%{_libdir}/vdpau/libvdpau_nvidia.so %endif -%ifarch i686 +%ifarch i686 armv7hl %{_nvidia_libdir}/libEGL.so %{_nvidia_libdir}/libGLESv1_CM.so %{_nvidia_libdir}/libGLESv2.so @@ -445,15 +449,15 @@ %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-fbc.so -%{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libnvcuvid.so %{_nvidia_libdir}/libnvidia-ml.so -%{_nvidia_libdir}/libnvidia-opencl.so -%{_nvidia_libdir}/tls/libnvidia-tls.so %{_libdir}/libcuda.so -%{_libdir}/vdpau/libvdpau_nvidia.so %changelog +* Wed Dec 11 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.20-5 +- Add filter on libEGL and libGLES to avoid race with mesa +- Fix build on ARM + * Wed Nov 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.20-4 - Revert %%pretrans move - rfbz#3027