10:50 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14885
Modified Files:
xorg-x11-drv-nvidia-96xx.spec nvidia-96xx-README.Fedora
Added Files:
nvidia-96xx-xorg.conf 00-nvidia.conf
Log Message:
- Update to 96.43.19
- Avoid using livna-config-display on fedora 14 and later
because of rhbz#623742
- Use static workaround
- Explicitely use %%{_isa} dependency from -devel to -libs
- Improve uninstallation script rfbz#1398
--- NEW FILE nvidia-96xx-xorg.conf ---
# RPM Fusion - nvidia-96xx-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
Option "AddARGBGLXVisuals" "true"
EndSection
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file:
/cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:09:27 -0000 1.19
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:50:29 -0000 1.20
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic
cards
Group: User Interface/X Hardware Support
@@ -16,10 +16,12 @@
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...
-Source5: nvidia-96xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-96xx-xorg.conf
+#Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
-Source10: nvidia-96xx-config-display
-Source11: nvidia-96xx-README.Fedora
+#Source10: nvidia-96xx-config-display
+#Source11: nvidia-96xx-README.Fedora
# So we don't pull other nvidia variants
Source91: filter-requires.sh
# So we don't mess with mesa provides.
@@ -45,14 +47,18 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display
+#Requires: livna-config-display
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
+#Requires(post): livna-config-display
+#Requires(preun): livna-config-display
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-96xx-kmod-common = %{version}
@@ -82,7 +88,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -192,10 +202,10 @@
ln -s libglx.so.%{version}
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
#Blacklist nouveau by F-11
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
@@ -216,6 +226,13 @@
%endif
%endif
+#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
+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/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -224,15 +241,15 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia-96xx ||:
- /etc/init.d/nvidia-96xx start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia-96xx ||:
+ #/etc/init.d/nvidia-96xx start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0
rdblacklist=nouveau' &>/dev/null
fi
-fi
+fi || :
if [ -x /usr/sbin/setsebool ] ; then
SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
@@ -246,8 +263,8 @@
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-96xx-config-display &&
%{_sbindir}/nvidia-96xx-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia-96xx stop &>/dev/null ||:
- /sbin/chkconfig --del nvidia-96xx ||:
+ #%{_initrddir}/nvidia-96xx stop &>/dev/null ||:
+ #/sbin/chkconfig --del nvidia-96xx ||:
fi ||:
%postun libs -p /sbin/ldconfig
@@ -255,12 +272,14 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia-96xx
+%config(noreplace) %{_sysconfdir}/X11/nvidia-96xx-xorg.conf
+#{_initrddir}/nvidia-96xx
%exclude %{_bindir}/nvidia-settings
%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
-%{_sbindir}/nvidia-96xx-config-display
+#{_sbindir}/nvidia-96xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -288,8 +307,13 @@
%changelog
-* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-2
- Update to 96.43.19
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
- Update to 96.43.18
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/nvidia-96xx-README.Fedora,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-96xx-README.Fedora 3 Nov 2010 16:09:27 -0000 1.5
+++ nvidia-96xx-README.Fedora 3 Nov 2010 22:50:29 -0000 1.6
@@ -1,112 +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
-
-That should print out
-
- OpenGL vendor string: NVIDIA Corporation
-
-among a few other things. 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-glx.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