Author: hawk Date: Tue Jul 14 17:42:51 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- sync with STABLE branch:
- cuda and vdpau are packaged
- internal deps fixes
- updated to 173.14.20, builds with 2.6.30.x
---- Files affected:
packages/xorg-driver-video-nvidia-legacy3:
xorg-driver-video-nvidia-legacy3.spec (1.25 -> 1.26)
---- 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.25
packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.26
---
packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.25
Sat Jun 27 20:40:36 2009
+++
packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec
Tue Jul 14 19:42:46 2009
@@ -1,5 +1,6 @@
# $Revision$, $Date$
# TODO
+# - should -libs Require main package?
# - solve this (shouldn't there be some obsoletes?):
# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts
with installed Mesa-libGL-7.0.3-2.i686
# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts
with installed Mesa-libGL-7.0.3-2.i686
@@ -20,20 +21,20 @@
%endif
%define pname xorg-driver-video-nvidia-legacy3
-%define rel 4
+%define rel 1%{?with_multigl:.mgl}
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}%{_alt_kernel}
-Version: 173.14.18
-Release: %{rel}%{?with_multigl:.mgl}
+Version: 173.14.20
+Release: %{rel}
License: nVidia Binary
Group: X11
Source0:
http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-# Source0-md5: 480c10f3d861fd2c3cc2a46bccc961a4
+# Source0-md5: 1274759c7e17a039f322a38097de0a98
Source1:
http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5: 39e26816de3b7d3692d28f9bd396eaf6
+# Source1-md5: 8bddf91b7a98b296e2ae2b657bc5f971
Source2: %{pname}-xinitrc.sh
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-legacy-desktop.patch
@@ -45,10 +46,10 @@
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
+Requires: xorg-xserver-server(videodrv-abi) < 6.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
-Requires: xorg-xserver-server(videodrv-abi) <= 4.1
-Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Provides: xorg-xserver-module(glx)
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
@@ -146,7 +147,7 @@
Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár
Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA
Group: X11/Development/Libraries
-Requires: %{pname}-devel = %{version}-%{rel}
+Requires: %{pname}-devel = %{epoch}:%{version}-%{rel}
%description static
Static XvMCNVIDIA library.
@@ -162,7 +163,7 @@
Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához
Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia
Group: Applications/System
-Requires: %{pname} = %{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
@@ -185,7 +186,7 @@
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel}
-Requires: %{pname} = %{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -195,7 +196,7 @@
%description -n kernel%{_alt_kernel}-video-nvidia-legacy3 -l de.UTF-8
Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-%description -n kernel%{_alt_kernel}-video-nvidia-legacy3 -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy3 -l hu.UTF-8
nVidia Architektúra támogatás Linux kernelhez.
%description -n kernel%{_alt_kernel}-video-nvidia-legacy3 -l pl.UTF-8
@@ -234,7 +235,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}
@@ -250,6 +251,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 \
@@ -271,6 +274,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
@@ -283,6 +288,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
@@ -290,6 +298,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
@@ -349,8 +360,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
@@ -362,18 +377,26 @@
%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.*.*
%endif
%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
@@ -405,6 +428,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2009/07/14 17:42:46 hawk
+- sync with STABLE branch:
+ - cuda and vdpau are packaged
+ - internal deps fixes
+ - updated to 173.14.20, builds with 2.6.30.x
+
Revision 1.25 2009/06/27 18:40:36 glen
- split -libs for multilib installs
- translations merged from xorg-driver-video-nvidia
================================================================
---- 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.25&r2=1.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
