Author: arvenil Date: Mon May 24 00:22:48 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 256.25
---- Files affected:
packages/xorg-driver-video-nvidia:
xorg-driver-video-nvidia.spec (1.262 -> 1.262.2.1) ,
X11-driver-nvidia-GL.patch (1.1 -> 1.1.6.1) , X11-driver-nvidia-desktop.patch
(1.5 -> 1.5.2.1)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.262
packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.262.2.1
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.262
Tue May 18 19:39:02 2010
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Mon May
24 02:22:42 2010
@@ -25,21 +25,21 @@
%endif
%define pname xorg-driver-video-nvidia
-%define rel 2
+%define rel 1
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}
-Version: 195.36.24
+Version: 256.25
Release: %{rel}%{?with_multigl:.mgl}
Epoch: 1
License: nVidia Binary
Group: X11
-Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-# Source0-md5: 97d3e5f69707092aa643fb901bb94003
-Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5: 9d58114ed8c89cd66fbaccad0c997ee8
+Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
+# Source0-md5: c24056ab5cf86a9e745caa787aa59e08
+Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
+# Source1-md5: 5118229a0c8c23d4b8b9a99f5c3e7ab1
Source2: %{pname}-xinitrc.sh
Source3: gl.pc.in
Patch0: X11-driver-nvidia-GL.patch
@@ -220,21 +220,21 @@
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86-%{version}
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32
%endif
%patch0 -p1
%patch1 -p1
-echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >>
usr/src/nv/Makefile.kbuild
+echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >>
kernel/Makefile.kbuild
%build
%if %{with kernel}
-cd usr/src/nv
+cd kernel
ln -sf Makefile.kbuild Makefile
cat >> Makefile <<'EOF'
@@ -256,18 +256,19 @@
install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
%endif
-install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh}
$RPM_BUILD_ROOT%{_bindir}
-cp -a usr/share/man/man1/nvidia-{settings,xconfig}.*
$RPM_BUILD_ROOT%{_mandir}/man1
-cp -a usr/share/applications/nvidia-settings.desktop
$RPM_BUILD_ROOT%{_desktopdir}
-cp -a usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p nvidia-{settings,smi,xconfig,bug-report.sh}
$RPM_BUILD_ROOT%{_bindir}
+cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
install -p %{SOURCE2}
$RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
for f in \
- usr/lib/tls/libnvidia-tls.so.%{version} \
- usr/lib/libnvidia-cfg.so.%{version} \
- usr/lib/libGL{,core}.so.%{version} \
- usr/lib/libcuda.so.%{version} \
- usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
+ libGL.so.%{version} \
+ libXvMCNVIDIA.so.%{version} \
+ libcuda.so.%{version} \
+ libnvidia-cfg.so.%{version} \
+ libnvidia-glcore.so.%{version} \
+ tls/libnvidia-tls.so.%{version} \
; do
%if %{without multigl}
install -p $f $RPM_BUILD_ROOT%{_libdir}
@@ -276,18 +277,18 @@
%endif
done
-cp -a usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
-install -p usr/lib/vdpau/libvdpau_nvidia.so.%{version}
$RPM_BUILD_ROOT%{_libdir}/vdpau
+cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
-install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
+install -p libglx.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+install -p nvidia_drv.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
-install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+install -p libnvidia-wfb.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules
-cp -a usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-cp -a usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda
ln -sf libglx.so.%{version}
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
ln -sf nvidia_drv.so.%{version}
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -317,7 +318,7 @@
%endif
%if %{with kernel}
-%install_kernel_modules -m usr/src/nv/nvidia -d misc
+%install_kernel_modules -m kernel/nvidia -d misc
%endif
install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -365,8 +366,7 @@
%if %{with userspace}
%files
%defattr(644,root,root,755)
-%doc LICENSE
-%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+%doc LICENSE NVIDIA_Changelog README.txt
%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
@@ -394,7 +394,7 @@
# symlink for binary apps which fail to conform Linux OpenGL ABI
# (and dlopen libGL.so instead of libGL.so.1)
%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) %{_libdir}/libGLcore.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.*
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1
@@ -425,13 +425,14 @@
%files doc
%defattr(644,root,root,755)
-%doc usr/share/doc/html/*
+%doc html/*
%files progs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-smi
%attr(755,root,root) %{_bindir}/nvidia-xconfig
-%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
%{_desktopdir}/nvidia-settings.desktop
%{_mandir}/man1/nvidia-*
@@ -450,6 +451,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.262.2.1 2010/05/24 00:22:42 arvenil
+- up to 256.25
+
Revision 1.262 2010/05/18 17:39:02 arekm
- release 2
================================================================
Index: packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch
diff -u packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch:1.1
packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch:1.1.6.1
--- packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch:1.1 Mon Sep
13 13:34:51 2004
+++ packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch Mon May
24 02:22:43 2010
@@ -1,5 +1,5 @@
---- NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h~ 2004-07-27
17:33:20.000000000 +0200
-+++ NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h 2004-09-13
13:23:24.188682536 +0200
+--- NVIDIA-Linux-x86-1.0-6111-pkg1/gl.h 2004-07-27 17:33:20.000000000
+0200
++++ NVIDIA-Linux-x86-1.0-6111-pkg1/gl.h 2004-09-13 13:23:24.188682536
+0200
@@ -1620,6 +1620,7 @@
WINGDIAPI void APIENTRY glVertex4sv (const GLshort *v);
WINGDIAPI void APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei
stride, const GLvoid *pointer);
================================================================
Index: packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch
diff -u packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch:1.5
packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch:1.5.2.1
--- packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch:1.5
Sat Feb 14 14:59:27 2009
+++ packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch Mon May
24 02:22:43 2010
@@ -1,5 +1,5 @@
----
NVIDIA-Linux-x86-1.0-8774-pkg1/usr/share/applications/nvidia-settings.desktop~
2006-08-24 23:20:06.166925750 +0200
-+++
NVIDIA-Linux-x86-1.0-8774-pkg1/usr/share/applications/nvidia-settings.desktop
2006-08-24 23:25:53.264618000 +0200
+--- NVIDIA-Linux-x86-1.0-8774-pkg1/nvidia-settings.desktop 2006-08-24
23:20:06.166925750 +0200
++++ NVIDIA-Linux-x86-1.0-8774-pkg1/nvidia-settings.desktop 2006-08-24
23:25:53.264618000 +0200
@@ -1,9 +1,13 @@
[Desktop Entry]
Type=Application
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.262&r2=1.262.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/X11-driver-nvidia-GL.patch?r1=1.1&r2=1.1.6.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/X11-driver-nvidia-desktop.patch?r1=1.5&r2=1.5.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
