packages (STABLE): xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidi...
hawk
hawk at pld-linux.org
Tue Jul 14 19:07:08 CEST 2009
Author: hawk Date: Tue Jul 14 17:07:08 2009 GMT
Module: packages Tag: STABLE
---- Log message:
- merged changes from xorg-driver-video-nvidia.spec (cuda and vdpau are
now packaged)
---- Files affected:
packages/xorg-driver-video-nvidia-legacy3:
xorg-driver-video-nvidia-legacy3.spec (1.20.2.9 -> 1.20.2.10)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec
diff -u packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.20.2.9 packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.20.2.10
--- packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.20.2.9 Tue Jul 14 18:56:40 2009
+++ packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec Tue Jul 14 19:07:03 2009
@@ -20,13 +20,13 @@
%endif
%define pname xorg-driver-video-nvidia-legacy3
-%define rel 1
+%define rel 1%{?with_multigl:.mgl}
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{_alt_kernel}
Version: 173.14.20
-Release: %{rel}%{?with_multigl:.mgl}
+Release: %{rel}
License: nVidia Binary
Group: X11
Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
@@ -46,7 +46,7 @@
BuildConflicts: XFree86-nvidia
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
-Requires: xorg-xserver-server(videodrv-abi) <= 6.0
+Requires: xorg-xserver-server(videodrv-abi) < 6.0
Provides: OpenGL = 2.1
Provides: OpenGL-GLX = 1.4
Provides: xorg-xserver-module(glx)
@@ -193,7 +193,7 @@
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_bindir},%{_mandir}/man1} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
%if %{with multigl}
install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
@@ -209,6 +209,8 @@
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/lib/libvdpau{,_nvidia,_trace}.so.%{version} \
usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
%if %{without multigl}
usr/X11R6/lib/libXvMCNVIDIA.a \
@@ -230,6 +232,8 @@
$RPM_BUILD_ROOT%{_libdir}/xorg/modules
install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau
ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
@@ -242,6 +246,9 @@
ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+
+ln -sf nvidia/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
+ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%else
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
@@ -249,6 +256,9 @@
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
+
+ln -sf libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
+ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%endif
%endif
@@ -298,8 +308,12 @@
%attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau_trace.so.*.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
%ghost %{_libdir}/xorg/modules/extensions/libglx.so
%else
@@ -311,8 +325,12 @@
%attr(755,root,root) %{_libdir}/libGLcore.so.*.*
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/libcuda.so.*.*
%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
%endif
%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
@@ -321,11 +339,15 @@
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
+%attr(755,root,root) %{_libdir}/libcuda.so
+%attr(755,root,root) %{_libdir}/libvdpau.so
%dir %{_includedir}/GL
%{_includedir}/GL/gl.h
%{_includedir}/GL/glext.h
%{_includedir}/GL/glx.h
%{_includedir}/GL/glxext.h
+%{_includedir}/cuda
+%{_includedir}/vdpau
%if %{with multigl}
%attr(755,root,root) %{_libdir}/libGL.so
%endif
@@ -357,6 +379,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20.2.10 2009/07/14 17:07:03 hawk
+- merged changes from xorg-driver-video-nvidia.spec (cuda and vdpau are
+ now packaged)
+
Revision 1.20.2.9 2009/07/14 16:56:40 hawk
- updated to 173.14.20, builds with 2.6.30.x
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec?r1=1.20.2.9&r2=1.20.2.10&f=u
More information about the pld-cvs-commit
mailing list