Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11319/F-19 Modified Files: .cvsignore sources xorg-x11-drv-nvidia.spec Added Files: 00-avoid-glamor.conf alternate-install-present Log Message: Update to latest --- NEW FILE 00-avoid-glamor.conf --- #This file is provided by xorg-x11-drv-nvidia #Do not edit Section "Module" Disable "glamoregl" EndSection --- NEW FILE alternate-install-present --- This file is provided by RPMFusion project Please look for documentation at http://rpmfusion.org/Howto/nVidia To uninstall the package, use the following command: $ sudo yum remove xorg-x11-drv-nvidia\* kmod-nvidia\* Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 13 Jul 2013 15:21:44 -0000 1.57 +++ .cvsignore 11 Nov 2013 16:45:35 -0000 1.58 @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-319.32.run -NVIDIA-Linux-x86-319.32.run -NVIDIA-Linux-x86_64-319.32.run +NVIDIA-Linux-x86_64-331.20.run +NVIDIA-Linux-x86-331.20.run +NVIDIA-Linux-armv7l-gnueabihf-331.20.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 29 Sep 2013 23:00:02 -0000 1.59 +++ sources 11 Nov 2013 16:45:36 -0000 1.60 @@ -1,3 +1,3 @@ -686e8d2293a8349c1b18bff1024c12a4 NVIDIA-Linux-armv7l-gnueabihf-325.15.run -528fc538584de6446384b9cec3099d6c NVIDIA-Linux-x86-325.15.run -323c3ef74f607aef63d602c7f297ce86 NVIDIA-Linux-x86_64-325.15.run +7d10ca5e2bbb3c470a2e3366b5a33a32 NVIDIA-Linux-x86_64-331.20.run +801aa04a087891690f1cac09575b2ba9 NVIDIA-Linux-x86-331.20.run +2459508dca8cd7313a901a1c9cb321cb NVIDIA-Linux-armv7l-gnueabihf-331.20.run 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.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- xorg-x11-drv-nvidia.spec 2 Oct 2013 15:53:30 -0000 1.112 +++ xorg-x11-drv-nvidia.spec 11 Nov 2013 16:45:36 -0000 1.113 @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 325.15 -Release: 2%{?dist} +Version: 331.20 +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -19,7 +19,9 @@ Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux... Source2: 00-nvidia.conf Source3: nvidia-xorg.conf +Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf +Source7: alternate-install-present BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -216,6 +218,7 @@ #Install static driver dependant configuration files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -232,6 +235,13 @@ #Workaround for self made xorg.conf using a Files section. ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} +#Workaround for cuda availability - rfbz#2916 +ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 +ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so + +#Alternate-install-present is checked by the nvidia .run +install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir} + #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -246,7 +256,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia -%pre +%pretrans if [ "$1" -eq "1" ]; then if [ -x %{_bindir}/nvidia-uninstall ]; then %{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || : @@ -315,6 +325,8 @@ ISGRUB1="" if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then ISGRUB1="--grub" + else + sed -i -e 's|GRUB_GFXPAYLOAD_LINUX=text||g' /etc/default/grub fi if [ -x /sbin/grubby ] ; then DIST=`rpm -E %%{?dist}` @@ -364,6 +376,7 @@ %endif %dir %{_sysconfdir}/nvidia %config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf +%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -375,7 +388,8 @@ %{_bindir}/nvidia-cuda-mps-control %{_bindir}/nvidia-cuda-mps-server %{_bindir}/nvidia-persistenced -%{_bindir}/nvidia-modprobe +#nvidia-modprobe is setuid root to allow users to load the module in +%attr(4755, root, root) %{_bindir}/nvidia-modprobe %{_bindir}/nvidia-settings %{_bindir}/nvidia-xconfig # Xorg libs that do not need to be multilib @@ -397,14 +411,16 @@ %defattr(-,root,root,-) %dir %{_nvidia_libdir} %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +%{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* %ifarch x86_64 i686 %dir %{_nvidia_libdir}/tls -%{_nvidia_libdir}/tls/*.so* +%{_nvidia_libdir}/tls/*.so.* %exclude %{_libdir}/vdpau/libvdpau.* -%{_libdir}/vdpau/libvdpau_nvidia.so* +%{_libdir}/vdpau/libvdpau_nvidia.so.* %exclude %{_libdir}/vdpau/libvdpau_trace.so* %endif +%{_libdir}/libcuda.so.1 %files devel %defattr(-,root,root,-) @@ -414,16 +430,41 @@ %{_nvidia_libdir}/libnvidia-compiler.so %{_nvidia_libdir}/libnvidia-encode.so %endif +%ifarch i686 +%{_nvidia_libdir}/libEGL.so +%{_nvidia_libdir}/libGLESv1_CM.so +%{_nvidia_libdir}/libGLESv2.so +%{_nvidia_libdir}/libnvidia-eglcore.so +%{_nvidia_libdir}/libnvidia-glsi.so +%endif %{_nvidia_libdir}/libcuda.so %{_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}/libnvidia-vgxcfg.so +%{_nvidia_libdir}/tls/libnvidia-tls.so +%{_libdir}/libcuda.so +%{_libdir}/vdpau/libvdpau_nvidia.so %changelog +* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.20-3 +- move nvidia-uninstall to %%pretrans +- Setuid root for nvidia-modprobe to allow text users to load modules +- Disable GRUB_GFXPAYLOAD_LINUX=text in grub2 when uninstalling +- Workaround for cuda availability - rfbz#2916 +- Add alternate-install-present in -libs to prevent .run to overwrite us + +* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.20-2 +- remove conflicts xorg-x11-glamor +- disable glamor module + +* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.20-1 +- Update to 331.20 +- add conflicts xorg-x11-glamor + * Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:325.15-2 - Avoid to exclude libcuda.so in devel - Drop desktop-file-install options not supported on EL6