rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.114,1.115
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16142/F-19
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Backport
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xorg-x11-drv-nvidia.spec 13 Nov 2013 21:13:03 -0000 1.114
+++ xorg-x11-drv-nvidia.spec 11 Dec 2013 22:57:16 -0000 1.115
@@ -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
@@ -68,13 +68,17 @@
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libEGL\.so/d;
%filter_from_provides /^libGLcore\.so/d;
%filter_from_provides /^libGL\.so/d;
+%filter_from_provides /^libGLES.*\.so/d;
%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
+%filter_from_requires /^libEGL\.so/d;
%filter_from_requires /^libGLcore\.so/d;
%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libGLES.*\.so/d;
%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
%filter_setup
@@ -429,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
@@ -441,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> - 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> - 1:331.20-4
- Revert %%pretrans move - rfbz#3027