rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.20, 1.21 nvidia-README.Fedora, 1.3, 1.4 sources, 1.20, 1.21 xorg-x11-drv-nvidia.spec, 1.41, 1.42
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29979/devel
Modified Files:
.cvsignore nvidia-README.Fedora sources
xorg-x11-drv-nvidia.spec
Log Message:
Update to 256.53
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jun 2010 10:27:22 -0000 1.20
+++ .cvsignore 5 Sep 2010 10:27:30 -0000 1.21
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.31-pkg0.run
-NVIDIA-Linux-x86_64-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-256.53-no-compat32.run
+NVIDIA-Linux-x86-256.53.run
Index: nvidia-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/nvidia-README.Fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-README.Fedora 31 Oct 2009 12:07:18 -0000 1.3
+++ nvidia-README.Fedora 5 Sep 2010 10:27:30 -0000 1.4
@@ -1,113 +1 @@
-README for Nvidia Linux Drivers, as packaged by livna.org.
-
-1. After Installation
----------------------
-
-You only have to restart X to start using the Nvidia drivers after
-installation. Either choose "Log Out" from the GNOME/KDE menu, and then
-press Ctrl-Alt-Backspace at the login prompt, or press Ctrl-Alt-Backspace
-directly. You should see a white screen with a big Nvidia logo in the middle
-for about one second.
-
-To check that hardware acceleration is working, issue the following command
-in a terminal:
-
- glxinfo | grep "OpenGL vendor"
-
-That should print out
-
- OpenGL vendor string: NVIDIA Corporation
-
-Also, the command
-
- glxinfo | grep direct
-
-should print out
-
- direct rendering: Yes
-
-If it does, you're all set.
-
-2. Basic Configuration
-----------------------
-
-The installation scripts perform the basic configuration for you.
-When (if) you uninstall the drivers, the configuration is reset to
-use the X.org/XFree86 Nvidia drivers again. If you want to temporarily
-disable the Nvidia drivers without uninstalling, you can issue the
-following two commands as root (remember su -):
-
- nvidia-config-display disable
-
-To re-enable the Nvidia drivers, run:
-
- nvidia-config-display enable
-
-
-3. Additional configuration
----------------------------
-
-It's possible to configure image quality and performance by setting various
-environment variables. Take a look at /etc/profile.d/nvidia.sh
-(or .csh if you use csh) and read the README file in the same directory
-as this file.
-
-There are a number of settings in the X configuration file as well.
-The most interesting are acceleration of the XRENDER extension and AGP
-configuration. In the Driver section of /etc/X11/xorg.conf, you may add
-the following line:
-
- Option "RenderAccel" "true"
-
-to enable XRENDER acceleration. A value of "false" disables it.
-Note: this has shown to make some systems unstable, making the display freeze.
-If you experience this, set to "false" or comment out the line.
-
-To control AGP behaviour, add the following line to the Driver section:
-
- Option "NvAGP" "X"
-
-where X is 0, 1, 2 or 3. The different values are as follows (from Nvidia
-README):
-
- 0 : disable agp
- 1 : use NVIDIA's internal AGP support, if possible
- 2 : use AGPGART, if possible
- 3 : use any agp support (try AGPGART, then NVIDIA's AGP)
-
-Default is 3. AGPGART is the Linux kernel AGP driver. See Nvidia README,
-appendix D for more information. AGP speed is controlled by giving a parameter
-to the Nvidia kernel module, but should be autodetected in most cases.
-See output of "modinfo nvidia".
-
-For more configuration options (TwinView, TV-out etc) see the Nvidia README.
-
-4. An Initscript to enable/disable nvidia driver
-------------------------------------------------
-
-To make gdm work at system start this package contains an initscript that
-will be run during start up. This script will detect if the nvidia module
-for the running kernel is present. If the module is present, then the
-initscript will run.
-
- "nvidia-config-display enable"
-
-so that the X server will use the nvidia driver, otherwise it will run
-
- "nvidia-config-display disable"
-
-and X will use the nv driver. You can disable this check by running, as
-root (with root $PATH) :
-
- chkconfig nvidia off
-
-
-This script will also be invoked when switching to runlevels 6
-(reboot) and 0 (halt). When rebooting (or shutting down) the system,
-the script will _disable_ nvidia driver (and switch back to "nv"
-driver), so that, whatever the kernel you boot, Red Hat Graphical Boot
-will work.
-
-We suggest you read the chkconfig(8) man page for complete
-informations about how to handle rc scripts.
-
+See http://rpmfusion.org/Howto/nVidia
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jun 2010 10:27:22 -0000 1.20
+++ sources 5 Sep 2010 10:27:30 -0000 1.21
@@ -1,2 +1,2 @@
-c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
-91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run
+73f08a19e00d05165cbbfc74e2fa4bdd NVIDIA-Linux-x86_64-256.53-no-compat32.run
+21fe3fe0afed7818b7adf383477b2155 NVIDIA-Linux-x86-256.53.run
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-drv-nvidia.spec 8 Jul 2010 19:01:04 -0000 1.41
+++ xorg-x11-drv-nvidia.spec 5 Sep 2010 10:27:30 -0000 1.42
@@ -8,15 +8,15 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.31
-Release: 2%{?dist}
+Version: 256.53
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
-Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
+Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
+Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source5: nvidia-init
Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
@@ -123,8 +123,7 @@
%setup -q -c -T
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
-tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
-
+tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
# Tweak to have debuginfo - part 2/2
%if 0%{?fedora} >= 7
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
@@ -136,11 +135,12 @@
%else
ln -s nvidiapkg-x64 nvidiapkg
%endif
-mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
-# More docs
-cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
-find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} >= 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
%build
# Nothing to build
@@ -150,127 +150,97 @@
%install
rm -rf $RPM_BUILD_ROOT
-set +x
-for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
-do
- 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/}
- elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
- elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
- elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
- elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
- elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
- then
- if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
- elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
- else
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
- fi
- elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
- gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
- elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
- else
- echo ${file} found -- don\'t know how to handle
- exit 1
- fi
-done
-set -x
+cd nvidiapkg
-# Move the libnvidia-wfb.so lib to the Nvidia xorg extension directory.
-mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version}
+# The new 256.x version supplies all the files in a relatively flat structure
+# .. so explicitly deal out the files to the correct places
+# .. nvidia-installer looks too closely at the current machine, so it's hard
+# .. to generate rpm's unless a NVIDIA card is in the machine.
-# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
-ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
-ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
-ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
-ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
-ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
-ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
-ln -s libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.so.1
-ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
-ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
-ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
-
-
-# This is 97xx specific. libnvidia-wfb.so is a replacement of libwfb.so
-# It is used by card > NV30 but required by G80 and newer.
-%if 0%{?fedora} >= 9
-rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version}
-%else
-ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
-ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libwfb.so
-%endif
+rm -f nvidia-installer*
-# This is 169.04 adds - cuda libs and headers
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
-
-# 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
+install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+# ld.so.conf.d file
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+
+#Blacklist nouveau (since F-11)
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
-# ld.so.conf.d file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+# OpenCL config
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+
+# Simple wildcard install of libs
+install -m 0755 -d $RPM_BUILD_ROOT%{nvidialibdir}/tls/
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
+install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/
+install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/
+
+# .. but some in a different place
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+rm -f $RPM_BUILD_ROOT%{nvidialibdir}/lib{nvidia-wfb,glx,vdpau*}.so.%{version}
+
+# Finish up the special case libs
+install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
+install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{nvidialibdir}/
+
+# Deal out include files
+install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/{CL,GL,cuda,vdpau}/
+install -p -m 0644 cl*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/CL/
+install -p -m 0644 gl*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
+install -p -m 0644 cuda*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/cuda/
+install -p -m 0644 vdpau*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/vdpau/
+
+# Install binaries
+install -p -m 0755 nvidia-{bug-report.sh,smi} $RPM_BUILD_ROOT%{_bindir}
+
+# Install man pages
+install -m 0755 -d $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 *.gz $RPM_BUILD_ROOT%{_mandir}/man1/
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{nvidia-settings,nvidia-xconfig}*
+
+# Make our documentation available for later
+cp -p %{SOURCE11} README.Fedora
+
+# Make unversioned links to dynamic libs
+for lib in $( find $RPM_BUILD_ROOT%{_libdir} -name lib\*.%{version} ) ; do
+ #ln -s libGL.so.256.52 $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
+ ln -s ${lib##*/} ${lib%.%{version}}
+ ln -s ${lib##*/} ${lib%.%{version}}.1
+done
-#Blacklist nouveau by F-11
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-
-# 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 - 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
+# OpenCL is really just a link to libcuda.so?
+ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+
+# X configuration script
+install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+
+# Install nvidia icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+# Remove execstack needs on F-12 and laters
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
%ifarch x86_64
-execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-{settings,smi}
-execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
%endif
%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
-
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
@@ -304,14 +274,16 @@
%files
%defattr(-,root,root,-)
-%doc nvidiapkg/usr/share/doc/*
+%doc nvidiapkg/LICENSE
+%doc nvidiapkg/NVIDIA_Changelog
+%doc nvidiapkg/README.txt
+%doc nvidiapkg/README.Fedora
+%doc nvidiapkg/html
%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
-%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
%{_sbindir}/nvidia-config-display
@@ -321,8 +293,6 @@
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
%{_mandir}/man1/nvidia-smi.*
%files libs
@@ -332,11 +302,10 @@
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
%{nvidialibdir}/libcuda.so
-%{nvidialibdir}/libGLcore.so
-%{nvidialibdir}/tls/*.so.*
-%exclude %{nvidialibdir}/libvdpau.*
-%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
-%{_libdir}/vdpau/libvdpau_nvidia.so.1
+%{nvidialibdir}/libnvidia-glcore.so
+%{nvidialibdir}/tls/*.so*
+%exclude %{_libdir}/vdpau/libvdpau.*
+%{_libdir}/vdpau/libvdpau_nvidia.so*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%files devel
@@ -359,6 +328,16 @@
%changelog
+* Tue Aug 31 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
+- Update to 256.53
+
+* Sat Aug 28 2010 Bob Arendt <rda(a)rincon.com> - 1:256.52-1
+- Update to 265.52 (Adds support for xorg-server driver ABI ver 8, for xorg-server-1.9)
+
+* Mon Aug 16 2010 Bob Arendt <rda(a)rincon.com> - 1:256.44-1
+- Update to 265.44 (Cuda 3.1 compatible)
+- libGLcore.so becomes nvidia-libglcore.so
+
* Thu Jul 08 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-2
- Improve post script as reported in rfbz#1262
- Only blacklist nouveau with grubby on install.
13 years, 8 months
rpms/mythtv-themes/devel sources,1.22,1.23
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19716
Modified Files:
sources
Log Message:
oops, add this to sources
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 2 Sep 2010 01:49:33 -0000 1.22
+++ sources 4 Sep 2010 15:10:02 -0000 1.23
@@ -1 +1,2 @@
+970f9fa081c4d2763516180bf434805a blue-abstract-wide.2010.07.15.tar.bz2
dff8634022f482c62cc4356811c58a83 myththemes-0.24.tar.bz2
13 years, 8 months
rpms/mythtv-themes/F-12 mythtv-themes.spec, 1.32, 1.33 sources, 1.23, 1.24
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19212
Modified Files:
mythtv-themes.spec sources
Log Message:
* Sat Aug 28 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23.1-1
- Update to 0.23.1 + svnfixes at revision 25902
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-12/mythtv-themes.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mythtv-themes.spec 20 Jul 2010 04:16:36 -0000 1.32
+++ mythtv-themes.spec 4 Sep 2010 15:06:32 -0000 1.33
@@ -17,7 +17,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r24509
+%define _svnrev r25902
%define branch release-0-23-fixes
#
@@ -30,11 +30,11 @@
License: GPLv2
# Version/Release info
-Version: 0.23
+Version: 0.23.1
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
################################################################################
@@ -46,7 +46,7 @@
# Robert Siebert's user-contributed theme, included at his (and users') request
Source1: ftp://miroku.no-ip.com/blue-abstract-wide.2010.07.15.tar.bz2
# svnfixes branch patch
-Patch0: myththemes-0.23-svnfixes.patch
+#Patch0: myththemes-0.23-svnfixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,7 +79,8 @@
%prep
%setup -q -c -a 1
cd myththemes-%{version}
-%patch0 -p1
+# Patch is currently empty after 0.23.1 rebase
+#patch0 -p1
cd ..
################################################################################
@@ -121,6 +122,9 @@
%{_datadir}/fonts/%{name}/*.otf
%changelog
+* Sat Aug 28 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23.1-1
+- Update to 0.23.1 + svnfixes at revision 25902
+
* Tue Jul 20 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-2
- Update to 0-23-release-fixes at svn revision 25830
- Include user-contributed blue-abstract-wide theme, 2010.07.15 edition
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 20 Jul 2010 04:16:36 -0000 1.23
+++ sources 4 Sep 2010 15:06:32 -0000 1.24
@@ -1,2 +1,2 @@
-1837ac72f7a03cb780d070cbea549bfe myththemes-0.23.tar.bz2
970f9fa081c4d2763516180bf434805a blue-abstract-wide.2010.07.15.tar.bz2
+7dc2588a3235f84a957909449a8bda88 myththemes-0.23.1.tar.bz2
13 years, 8 months
rpms/mythtv-themes/F-13 sources,1.30,1.31
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19174
Modified Files:
sources
Log Message:
remove old tarball from sources
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-13/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 28 Aug 2010 15:15:18 -0000 1.30
+++ sources 4 Sep 2010 15:06:03 -0000 1.31
@@ -1,3 +1,2 @@
-1837ac72f7a03cb780d070cbea549bfe myththemes-0.23.tar.bz2
970f9fa081c4d2763516180bf434805a blue-abstract-wide.2010.07.15.tar.bz2
7dc2588a3235f84a957909449a8bda88 myththemes-0.23.1.tar.bz2
13 years, 8 months
rpms/ProjectX/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ProjectX/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsA26920/rpms/ProjectX/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module ProjectX
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: ProjectX
# $Id: Makefile,v 1.1 2010/09/03 21:16:52 kwizart Exp $
NAME := ProjectX
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
13 years, 8 months
rpms/ProjectX Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ProjectX
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsA26920/rpms/ProjectX
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module ProjectX
--- NEW FILE Makefile ---
# Top level Makefile for module ProjectX
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
13 years, 8 months
rpms/ProjectX/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ProjectX/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsA26920/rpms/ProjectX/devel
Log Message:
Directory /cvs/free/rpms/ProjectX/devel added to the repository
13 years, 8 months
rpms/ProjectX - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ProjectX
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsA26920/rpms/ProjectX
Log Message:
Directory /cvs/free/rpms/ProjectX added to the repository
13 years, 8 months
rpms/mjpegtools/F-12 mjpegtools-1.9.0-png-memleak.patch, NONE, 1.1 mjpegtools.spec, 1.4, 1.5
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/mjpegtools/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28279
Modified Files:
mjpegtools.spec
Added Files:
mjpegtools-1.9.0-png-memleak.patch
Log Message:
* Fri Sep 3 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-2
- Fix a memleak which is causing issues for LiVES
mjpegtools-1.9.0-png-memleak.patch:
png2yuv.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE mjpegtools-1.9.0-png-memleak.patch ---
diff -up mjpegtools-1.9.0/lavtools/png2yuv.c~ mjpegtools-1.9.0/lavtools/png2yuv.c
--- mjpegtools-1.9.0/lavtools/png2yuv.c~ 2007-11-08 18:31:50.000000000 +0100
+++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-09-03 13:32:43.015596001 +0200
@@ -407,6 +407,7 @@ int decode_png(const char *pngname, int
return 2;
}
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(pngfile);
return 1;
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/F-12/mjpegtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mjpegtools.spec 15 Apr 2009 10:41:21 -0000 1.4
+++ mjpegtools.spec 3 Sep 2010 14:46:20 -0000 1.5
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
@@ -9,6 +9,7 @@
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch
Patch1: mjpegtools-1.9.0-gcc44.patch
+Patch2: mjpegtools-1.9.0-png-memleak.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -74,6 +75,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
for f in docs/yuvfps.1 ; do
@@ -150,6 +152,9 @@
%changelog
+* Fri Sep 3 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-2
+- Fix a memleak which is causing issues for LiVES
+
* Wed Apr 15 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-1
- Update to upstream 1.9.0 final release
13 years, 8 months
rpms/mjpegtools/F-13 mjpegtools-1.9.0-png-memleak.patch, NONE, 1.1 mjpegtools.spec, 1.4, 1.5
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/mjpegtools/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27849
Modified Files:
mjpegtools.spec
Added Files:
mjpegtools-1.9.0-png-memleak.patch
Log Message:
* Fri Sep 3 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-2
- Fix a memleak which is causing issues for LiVES
mjpegtools-1.9.0-png-memleak.patch:
png2yuv.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE mjpegtools-1.9.0-png-memleak.patch ---
diff -up mjpegtools-1.9.0/lavtools/png2yuv.c~ mjpegtools-1.9.0/lavtools/png2yuv.c
--- mjpegtools-1.9.0/lavtools/png2yuv.c~ 2007-11-08 18:31:50.000000000 +0100
+++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-09-03 13:32:43.015596001 +0200
@@ -407,6 +407,7 @@ int decode_png(const char *pngname, int
return 2;
}
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(pngfile);
return 1;
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/F-13/mjpegtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mjpegtools.spec 15 Apr 2009 10:41:21 -0000 1.4
+++ mjpegtools.spec 3 Sep 2010 14:42:45 -0000 1.5
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
@@ -9,6 +9,7 @@
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch
Patch1: mjpegtools-1.9.0-gcc44.patch
+Patch2: mjpegtools-1.9.0-png-memleak.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -74,6 +75,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
for f in docs/yuvfps.1 ; do
@@ -150,6 +152,9 @@
%changelog
+* Fri Sep 3 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-2
+- Fix a memleak which is causing issues for LiVES
+
* Wed Apr 15 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-1
- Update to upstream 1.9.0 final release
13 years, 8 months