Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv22695/F-11 Modified Files: .cvsignore blacklist-nouveau.conf nvidia-config-display sources xorg-x11-drv-nvidia.spec Log Message: Update to 195.36.31 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 Dec 2009 13:13:53 -0000 1.18 +++ .cvsignore 21 Jun 2010 10:29:31 -0000 1.19 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-190.53-pkg0.run -NVIDIA-Linux-x86-190.53-pkg0.run +NVIDIA-Linux-x86-195.36.31-pkg0.run +NVIDIA-Linux-x86_64-195.36.31-pkg0.run Index: blacklist-nouveau.conf =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/blacklist-nouveau.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- blacklist-nouveau.conf 1 Jul 2009 16:59:27 -0000 1.1 +++ blacklist-nouveau.conf 21 Jun 2010 10:29:31 -0000 1.2 @@ -1,4 +1,4 @@ # RPM Fusion blacklist for nouveau driver - you need to run as root: -# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r) +# dracut -f /boot/initramfs-$(uname -r).img $(uname -r) # if nouveau is loaded despite this file. blacklist nouveau Index: nvidia-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/nvidia-config-display,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nvidia-config-display 5 Oct 2008 11:47:05 -0000 1.1 +++ nvidia-config-display 21 Jun 2010 10:29:31 -0000 1.2 @@ -76,8 +76,8 @@ break else: self.addModule(module) - # Problems with Compiz without these. - self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True") + # Problems with Compiz without these. - not needed since 195.xxx + #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True") #self.addOption(self.majorVendor,"DisableGLXRootClipping", "True") Utils.writeXorgConf(self.xconfig, self.xconfigpath) # We have to read saved status file to restore the Xorg configuration. @@ -94,9 +94,9 @@ prevDriver = self.config.getOldDriver() if prevDriver == self.majorVendor: print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor) - print _('Using the \'nv\' driver instead.') - prevDriver = "nv" - self.config.setOldDriver("nv") + print _('Using the \'nouveau\' driver instead.') + prevDriver = "nouveau" + self.config.setOldDriver("nouveau") self.removeOption(self.majorVendor,"AddARGBGLXVisuals") self.removeOption(self.majorVendor,"DisableGLXRootClipping") self.toggleDriver(self.majorVendor, prevDriver) Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 30 Dec 2009 13:13:53 -0000 1.19 +++ sources 21 Jun 2010 10:29:31 -0000 1.20 @@ -1,2 +1,2 @@ -3d3e956366f9df0e4c64d2e0299d1029 NVIDIA-Linux-x86_64-190.53-pkg0.run -2e80419f6f9ac16beecd839874d0c5ab NVIDIA-Linux-x86-190.53-pkg0.run +c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run +91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xorg-x11-drv-nvidia.spec 30 Dec 2009 13:13:53 -0000 1.35 +++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:29:31 -0000 1.36 @@ -7,7 +7,8 @@ %endif Name: xorg-x11-drv-nvidia -Version: 190.53 +Epoch: 1 +Version: 195.36.31 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -47,7 +48,7 @@ Requires: which Requires: livna-config-display >= 0.0.21 %if 0%{?fedora} > 10 || 0%{?rhel} > 5 -Requires: %{name}-libs%{_isa} = %{version}-%{release} +Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} %else Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} %endif @@ -59,7 +60,7 @@ Requires(preun): chkconfig -Provides: nvidia-kmod-common = %{version} +Provides: nvidia-kmod-common = %{?epoch}:%{version} Conflicts: xorg-x11-drv-nvidia-beta Conflicts: xorg-x11-drv-nvidia-legacy Conflicts: xorg-x11-drv-nvidia-71xx @@ -67,7 +68,7 @@ Conflicts: xorg-x11-drv-nvidia-173xx Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-catalyst -Obsoletes: nvidia-kmod < %{version} +Obsoletes: nvidia-kmod < %{?epoch}:%{version} #Introduced in F10 for freshrpms compatibility Obsoletes: nvidia-x11-drv < %{version}-%{release} @@ -89,7 +90,7 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} #Introduced in F10 when 173xx has forked to legacy serie Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100 Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101 @@ -101,12 +102,12 @@ %package libs Summary: Libraries for %{name} Group: User Interface/X Hardware Support -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.3 -Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} %ifarch %{ix86} -Provides: %{name}-libs-32bit = %{version}-%{release} -Obsoletes: %{name}-libs-32bit <= %{version}-%{release} +Provides: %{name}-libs-32bit = %{?epoch}:%{version}-%{release} +Obsoletes: %{name}-libs-32bit <= %{?epoch}:%{version}-%{release} Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release} Provides: nvidia-x11-drv-32bit = %{version}-%{release} %endif @@ -155,6 +156,9 @@ if [[ ! "/${file##./usr/lib/vdpau}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/vdpau/${file##./usr/lib/vdpau} + elif [[ ! "/${file##./etc/OpenCL/vendors}" = "/${file}" ]] + then + install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/OpenCL/vendors/${file##./etc/OpenCL/vendors/} elif [[ ! "/${file##./usr/lib/}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/} @@ -227,6 +231,12 @@ # This is 180.xx adds - vdpau libs and headers ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 +# This is 195.xx adds - OpenCL support +ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1 +ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so +ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so.1 +ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so + # X configuration script install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display @@ -244,8 +254,8 @@ # Change perms on static libs. Can't fathom how to do it nicely above. find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \; -# Remove execstack needs on F-12 and laters -%if 0%{?fedora} >= 12 || 0%{?rhel} > 5 +# Remove execstack needs on F-12 and laters - disabled +%if 0 find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';' execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version} execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so @@ -262,8 +272,6 @@ %post -# Removes old legacy layout, fixed SELinux copy errors -if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||: if [ "$1" -eq "1" ]; then # Enable nvidia driver when installing %{_sbindir}/nvidia-config-display enable &>/dev/null ||: @@ -271,6 +279,16 @@ /sbin/chkconfig --add nvidia ||: /etc/init.d/nvidia start &>/dev/null ||: fi +if [ -x /sbin/grubby ] ; then + GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` + /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null +fi +if [ -x /usr/sbin/setsebool ] ; then + SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l` + if [ ${SELINUXEXECSTACK} -eq "1" ] ; then + /usr/sbin/setsebool -P allow_execstack on &>/dev/null + fi +fi ||: %post libs -p /sbin/ldconfig @@ -287,6 +305,9 @@ %files %defattr(-,root,root,-) %doc nvidiapkg/usr/share/doc/* +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf %{_initrddir}/nvidia %exclude %{_bindir}/nvidia-settings @@ -321,19 +342,47 @@ %files devel %defattr(-,root,root,-) %dir %{_includedir}/nvidia +%dir %{_includedir}/nvidia/CL %dir %{_includedir}/nvidia/GL %dir %{_includedir}/nvidia/cuda %exclude %dir %{_includedir}/nvidia/vdpau +%{_includedir}/nvidia/CL/*.h %{_includedir}/nvidia/GL/*.h %{_includedir}/nvidia/cuda/*.h %exclude %{_includedir}/nvidia/vdpau/*.h %exclude %{nvidialibdir}/libXvMCNVIDIA.a %exclude %{nvidialibdir}/libcuda.so +%{nvidialibdir}/libOpenCL.so +%{nvidialibdir}/libnvidia-compiler.so %{nvidialibdir}/libGL.so %{nvidialibdir}/libXvMCNVIDIA.so %changelog +* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:195.36.31-1 +- Update to 195.36.31 +- Add post section to change boot option with grubby +- Add post section Enabled Selinux allow_execstack boolean. +- Fallback to nouveau instead of nv +- AddARGBGLXVisuals is enabled by default since 195xx serie. + +* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1:195.36.24-1 +- Update to 195.36.24 + +* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1:195.36.15-1 +- Update to 195.36.15 +- Use macro for Epoch + +* Sun Mar 14 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1:190.53-4 +- Fix multilibs requirements + +* Fri Mar 12 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1:190.53-2 +- Bump Epoch - Fan problem in recent release + http://www.nvnews.net/vbulletin/announcement.php?f=14 + +* Sat Feb 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 195.36.08-1 +- Update to 195.36.08 + * Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 190.53-1 - Update to 190.53 - Switch to new libvdpau location in %%{_libdir}/vdpau