packages: xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2...
glen
glen at pld-linux.org
Sun Nov 27 21:46:47 CET 2011
Author: glen Date: Sun Nov 27 20:46:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 96.43.20; cosmetics
---- Files affected:
packages/xorg-driver-video-nvidia-legacy2:
xorg-driver-video-nvidia-legacy2.spec (1.113 -> 1.114)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec
diff -u packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec:1.113 packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec:1.114
--- packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec:1.113 Sat Aug 27 11:02:33 2011
+++ packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec Sun Nov 27 21:46:42 2011
@@ -12,19 +12,19 @@
%undefine with_userspace
%endif
-%define rel 3
+%define rel 1
%define pname xorg-driver-video-nvidia-legacy2
Summary: Linux Drivers for older nVidia GeForce/Quadro Chips
Summary(pl.UTF-8): Sterowniki do starszych kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: 96.43.19
+Version: 96.43.20
Release: %{rel}
License: nVidia Binary
Group: X11
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-# Source0-md5: 53e98129d885a1b004aabc42a989fa73
+# Source0-md5: 875cc011385ea26ab5edd54a9b65a003
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5: 7ff779e299b938b880baff6cd970ab51
+# Source1-md5: df3c87005487bdf54a6c5b783ff373db
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-legacy-desktop.patch
URL: http://www.nvidia.com/object/unix.html
@@ -32,7 +32,7 @@
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
%endif
-BuildRequires: rpmbuild(macros) >= 1.379
+BuildRequires: rpmbuild(macros) >= 1.583
BuildConflicts: XFree86-nvidia
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) <= 8.0
@@ -53,8 +53,10 @@
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1 libGLcore.so.1
+%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _enable_debug_packages 0
+# we have no power to fix these linkage
+%define skip_post_check_so libXvMCNVIDIA.so.96.43.* libGL.so.96.43.* libGLcore.so.96.43.* libglx.so.96.43.*
%description
This driver set adds improved 2D functionality to the Xorg/XFree86 X
@@ -62,17 +64,28 @@
support for most flat panels, and 2D multiple monitor support.
This driver version supports the following nVidia adapters:
-GeForce 6100/6150/6150LE/6200/6200TurboCache(TM)/6500/6600/6600GT/6600LE/6600VE/6610XL/6800/6800GS/6800GT/6800LE/6800Ultra/6800XE/6800XT/7300GS/7300LE/7600GS/7600GT/7800GS/7800GT/7800GTX/7900GT/7900GTX
-GeForce FX 5100/5200/5200LE/5500/5600/5600XT/5700/5700LE/5700VE/5800/5900/5900XT/5900ZT/5950/Go5100/Go5200/Go5250/Go53xx/Go5600/Go5650/Go5700
-GeForce Go 6200/6400/6600/6800/7300/7400/7600/7800/7900
-GeForce PCX 4300/5750/5900 GeForce2 Go/Integrated GPU/MX(100/200/400)
-GeForce3/GeForce3 Ti(200/500) GeForce4 410Go/420Go/4200Go/440Go/460Go
-GeForce4 MX 4000/420/440/440SE/440-SE/460/Integrated
-GeForce4 Ti 4200/4400/4600/4800
-Quadro DCC
-Quadro FX 1000/1100/1300/1400/1500/1500M/2000/2500M/3000/330/3400/4400/3450/350/3500/350M/4000/4500/500/600/540/550/5500/560/700/Go1000/Go1400/Go700
-Quadro NVS 110M/120M/280/285/440/50 Quadro NVSA Quadro2 MXR/EX/Go
-Quadro4 380XGL/500GoGL/550XGL/580XGL/700GoGL/700XGL/750XGL/780XGL/900XGL/980XGL
+- GeForce 6100/6150/6150LE/6200/6200TurboCache(TM)/6500/6600/6600GT
+ 6600LE/6600VE/6610XL/6800/6800GS/6800GT/6800LE/6800Ultra/6800XE
+ 6800XT/7300GS/7300LE/7600GS/7600GT/7800GS/7800GT/7800GTX/7900GT
+ 7900GTX
+- GeForce FX
+ 5100/5200/5200LE/5500/5600/5600XT/5700/5700LE/5700VE/5800/5900
+ 5900XT/5900ZT/5950/Go5100/Go5200/Go5250/Go53xx/Go5600/Go5650/Go5700
+- GeForce Go 6200/6400/6600/6800/7300/7400/7600/7800/7900
+- GeForce PCX 4300/5750/5900 GeForce2 Go/Integrated
+ GPU/MX(100/200/400)
+- GeForce3/GeForce3 Ti(200/500) GeForce4
+ 410Go/420Go/4200Go/440Go/460Go
+- GeForce4 MX 4000/420/440/440SE/440-SE/460/Integrated
+- GeForce4 Ti 4200/4400/4600/4800
+- Quadro DCC
+- Quadro FX
+ 1000/1100/1300/1400/1500/1500M/2000/2500M/3000/330/3400/4400/3450
+ 350/3500/350M/4000/4500/500/600/540/550/5500/560/700/Go1000
+ Go1400/Go700
+- Quadro NVS 110M/120M/280/285/440/50 Quadro NVSA Quadro2 MXR/EX/Go
+- Quadro4
+ 380XGL/500GoGL/550XGL/580XGL/700GoGL/700XGL/750XGL/780XGL/900XGL/980XGL
Older TNT/GeForce/Quadro adapters are supported by driver from
xorg-driver-video-nvidia-legacy package, not this one.
@@ -83,17 +96,28 @@
wielu monitorów 2D.
Ta wersja sterowników obsługuje następujące karty nVidia:
-GeForce 6100/6150/6150LE/6200/6200TurboCache(TM)/6500/6600/6600GT/6600LE/6600VE/6610XL/6800/6800GS/6800GT/6800LE/6800Ultra/6800XE/6800XT/7300GS/7300LE/7600GS/7600GT/7800GS/7800GT/7800GTX/7900GT/7900GTX
-GeForce FX 5100/5200/5200LE/5500/5600/5600XT/5700/5700LE/5700VE/5800/5900/5900XT/5900ZT/5950/Go5100/Go5200/Go5250/Go53xx/Go5600/Go5650/Go5700
-GeForce Go 6200/6400/6600/6800/7300/7400/7600/7800/7900
-GeForce PCX 4300/5750/5900 GeForce2 Go/Integrated GPU/MX(100/200/400)
-GeForce3/GeForce3 Ti(200/500) GeForce4 410Go/420Go/4200Go/440Go/460Go
-GeForce4 MX 4000/420/440/440SE/440-SE/460/Integrated
-GeForce4 Ti 4200/4400/4600/4800
-Quadro DCC
-Quadro FX 1000/1100/1300/1400/1500/1500M/2000/2500M/3000/330/3400/4400/3450/350/3500/350M/4000/4500/500/600/540/550/5500/560/700/Go1000/Go1400/Go700
-Quadro NVS 110M/120M/280/285/440/50 Quadro NVSA Quadro2 MXR/EX/Go
-Quadro4 380XGL/500GoGL/550XGL/580XGL/700GoGL/700XGL/750XGL/780XGL/900XGL/980XGL
+- GeForce
+ 6100/6150/6150LE/6200/6200TurboCache(TM)/6500/6600/6600GT/6600LE
+ 6600VE/6610XL/6800/6800GS/6800GT/6800LE/6800Ultra/6800XE/6800XT
+ 7300GS/7300LE/7600GS/7600GT/7800GS/7800GT/7800GTX/7900GT/7900GTX
+- GeForce FX
+ 5100/5200/5200LE/5500/5600/5600XT/5700/5700LE/5700VE/5800/5900
+ 5900XT/5900ZT/5950/Go5100/Go5200/Go5250/Go53xx/Go5600/Go5650/Go5700
+- GeForce Go 6200/6400/6600/6800/7300/7400/7600/7800/7900
+- GeForce PCX 4300/5750/5900 GeForce2 Go/Integrated
+ GPU/MX(100/200/400)
+- GeForce3/GeForce3 Ti(200/500) GeForce4
+ 410Go/420Go/4200Go/440Go/460Go
+- GeForce4 MX 4000/420/440/440SE/440-SE/460/Integrated
+- GeForce4 Ti 4200/4400/4600/4800
+- Quadro DCC
+- Quadro FX
+ 1000/1100/1300/1400/1500/1500M/2000/2500M/3000/330/3400/4400/3450
+ 350/3500/350M/4000/4500/500/600/540/550/5500/560/700/Go1000
+ Go1400/Go700
+- Quadro NVS 110M/120M/280/285/440/50 Quadro NVSA Quadro2 MXR/EX/Go
+- Quadro4 380XGL/500GoGL/550XGL/580XGL/700GoGL/700XGL/750XGL/780XGL
+ 900XGL/980XGL
Starsze karty TNT/GeForce/Quadro są obsługiwane przez sterownik z
pakietu xorg-driver-video-nvidia-legacy.
@@ -181,7 +205,7 @@
%build
%if %{with kernel}
-cd usr/src/nv/
+cd usr/src/nv
ln -sf Makefile.kbuild Makefile
cat >> Makefile <<'EOF'
@@ -200,27 +224,27 @@
$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
-install usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
-install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+cp -p usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -p usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
for f in \
- usr/lib/tls/libnvidia-tls.so.%{version} \
- usr/lib/libnvidia-cfg.so.%{version} \
- usr/lib/libGL{,core}.so.%{version} \
- usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
- usr/X11R6/lib/libXvMCNVIDIA.a \
+ usr/lib/tls/libnvidia-tls.so.%{version} \
+ usr/lib/libnvidia-cfg.so.%{version} \
+ usr/lib/libGL{,core}.so.%{version} \
+ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
+ usr/X11R6/lib/libXvMCNVIDIA.a \
; do
- install $f $RPM_BUILD_ROOT%{_libdir}
+ install -p $f $RPM_BUILD_ROOT%{_libdir}
done
-install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
+install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
+install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
-install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -p usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
@@ -240,10 +264,9 @@
%post
/sbin/ldconfig
-cat << EOF
-NOTE: You must install:
-kernel-video-nvidia-legacy2-%{version}
-for this driver to work
+cat << 'EOF'
+NOTE: You must also install kernel module for this driver to work:
+ kernel-video-nvidia-legacy2-%{version}
EOF
%postun -p /sbin/ldconfig
@@ -307,6 +330,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.114 2011/11/27 20:46:42 glen
+- up to 96.43.20; cosmetics
+
Revision 1.113 2011/08/27 09:02:33 arekm
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia-legacy2/xorg-driver-video-nvidia-legacy2.spec?r1=1.113&r2=1.114&f=u
More information about the pld-cvs-commit
mailing list