X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=6e7a31ea83a7be319d119922fa31a62a085f260f;hp=ed30ef88f758c54c0ea5ce1112563702c754c9b5;hb=5c9422d0d5433a59c8dfd2b94b855ee6f4c7ea36;hpb=9ab5b5ef2bb0c6f34f8179d14331ca9c7dbc9314 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index ed30ef8..6e7a31e 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -5,13 +5,13 @@ %bcond_without incall # include all tarballs %bcond_without userspace # don't build userspace programs %bcond_with verbose # verbose build (V=1) +%bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers # %define no_install_post_strip 1 # -%define _nv_ver 1.0 -%define _nv_rel 9755 -%define _min_x11 6.7.0 -%define _rel 1 +%define _nv_ver 169 +%define _nv_rel 04 +%define _rel 3 # %define need_x86 0 %define need_x8664 0 @@ -27,44 +27,49 @@ %endif %endif # -Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips -Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro +Summary: Linux Drivers for nVidia GeForce/Quadro Chips +Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: xorg-driver-video-nvidia Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel} +Release: %{_rel}%{?with_multigl:.mgl} License: nVidia Binary Group: X11 %if %{need_x86} -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run -# Source0-md5: 594a47bd7e85343bd482775482cd1dce +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run +# Source0-md5: 06a178f5cf10195896974c33ab34c6fb %endif %if %{need_x8664} -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run -# Source1-md5: 88eb6b856ab201dc00663165e10109f9 +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2.run +# Source1-md5: e01e2b19d3cb7e91f4df40a3b946b4fb %endif Source2: %{name}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -URL: http://www.nvidia.com/object/linux.html +URL: http://www.nvidia.com/object/unix.html %if %{with kernel} -%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7} +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} %endif BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server -Provides: OpenGL = 1.5 -Provides: OpenGL-GLX +Requires: xorg-xserver-server(videodrv-abi) = 2.0 +Provides: OpenGL = 2.1 +Provides: OpenGL-GLX = 1.4 Provides: xorg-xserver-libglx +%if !%{with multigl} Obsoletes: Mesa -Obsoletes: Mesa-libGL +%endif Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-OpenGL-core < 1:7.0.0 Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia +%if !%{with multigl} +Conflicts: Mesa-libGL +%endif Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -72,43 +77,60 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLcore.so.1 %description -This driver set adds improved 2D functionality to the Xorg/XFree86 X -server as well as high performance OpenGL acceleration, AGP support, -support for most flat panels, and 2D multiple monitor support. - -Hardware: nVidia TNT, TNT2, GeForce, or Quadro based graphics -accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in -the base Xorg/XFree86 install and are not supported by this driver -set. +This driver set adds improved 2D functionality to the Xorg X server as +well as high performance OpenGL acceleration, AGP support, support for +most flat panels, and 2D multiple monitor support. Supported hardware: +modern NVIDIA GeForce (from GeForce2 MX) and Quadro (Quadro4 and up) +based graphics accelerators. + +The older graphics chips are unsupported: +- NV1 and RIVA 128/128ZX chips are supported in the base Xorg install + (nv driver) +- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy + drivers. %description -l pl.UTF-8 -Usprawnione sterowniki dla kart graficznych nVidia do serwera -Xorg/XFree86, dające wysokowydajną akcelerację OpenGL, obsługę AGP i -wielu monitorów 2D. +Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg, +dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów +2D. Obsługują w miarę nowe karty NVIDIA GeForce (od wersji GeForce2 +MX) oraz Quadro (od wersji Quadro4). -Obsługują karty nVidia TNT/TNT2/GeForce/Quadro do serwera -Xorg/XFree86; Karty nVidia NV1 i Riva 128/128ZX są obsługiwane przez -sterownik nv z pakietów Xorg/XFree8 - NIE są obsługiwane przez ten -pakiet. +Starsze układy graficzne nie są obsługiwane przez ten pakiet: +- NV1 i RIVA 128/128ZX są obsługiwane przez sterownik nv z Xorg +- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez + sterowniki -legacy %package devel -Summary: OpenGL for X11R6 development (only gl?.h) -Summary(pl.UTF-8): Pliki nagłówkowe OpenGL dla systemu X11R6 (tylko gl?.h) +Summary: OpenGL (GL and GLX) header files +Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: OpenGL-GLX-devel -Provides: OpenGL-devel = 1.5 -Provides: OpenGL-devel-base -Obsoletes: OpenGL-devel-base +Provides: OpenGL-GLX-devel = 1.4 +Provides: OpenGL-devel = 2.1 +Obsoletes: X11-OpenGL-devel-base +Obsoletes: XFree86-OpenGL-devel-base Obsoletes: XFree86-driver-nvidia-devel Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3 %description devel -Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers. +OpenGL header files (GL and GLX only) for NVIDIA OpenGL +implementation. %description devel -l pl.UTF-8 -Podstawowe pliki nagłówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla -sterowników nvidii. +Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL +firmy NVIDIA. + +%package static +Summary: Static XvMCNVIDIA library +Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static XvMCNVIDIA library. + +%description static -l pl.UTF-8 +Statyczna biblioteka XvMCNVIDIA. %package progs Summary: Tools for advanced control of nVidia graphic cards @@ -148,13 +170,13 @@ sterownik nVidii dla Xorg/XFree86. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg* +rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2 %endif %patch0 -p1 %patch1 -p1 @@ -180,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_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} +%endif 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 @@ -192,10 +217,17 @@ for f in \ usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ +%if !%{with multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ ; do install $f $RPM_BUILD_ROOT%{_libdir} done +%else +; do + install $f $RPM_BUILD_ROOT%{_libdir}/nvidia +done +install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +%endif install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions @@ -207,13 +239,25 @@ install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ install 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 -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1 ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so +%if %{with multigl} +echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf + +# OpenGL ABI for Linux compatibility +ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 +ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so + +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 +%else # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so + +ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so +ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1 +%endif %endif %if %{with kernel} @@ -226,17 +270,15 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig cat << EOF - - ******************************************************* - * * - * NOTE: * - * You must install: * - * kernel(24)-video-nvidia-%{version} * - * for this driver to work * - * * - ******************************************************* - +NOTE: You must install: +kernel-video-nvidia-%{version} +for this driver to work EOF +%if %{with multigl} +if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then + ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so +fi +%endif %postun -p /sbin/ldconfig @@ -251,34 +293,49 @@ EOF %defattr(644,root,root,755) %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} -# OpenGL ABI for Linux compatibility -%attr(755,root,root) %{_libdir}/libGL.so -%attr(755,root,root) %{_libdir}/libGL.so.1 -# +%if %{with multigl} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf +%dir %{_libdir}/nvidia +%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 +%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/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* +%ghost %{_libdir}/xorg/modules/extensions/libglx.so +%else %attr(755,root,root) %{_libdir}/libGL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libGL.so.1 +# 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}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1 -%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*.* -%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/wfb.so -%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so +%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* %endif +%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* +%attr(755,root,root) %{_libdir}/xorg/modules/wfb.so +%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so -%if %{with kernel} -%files -n kernel%{_alt_kernel}-video-nvidia +%files devel %defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/*.ko* +%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so +%dir %{_includedir}/GL +%{_includedir}/GL/gl.h +%{_includedir}/GL/glext.h +%{_includedir}/GL/glx.h +%{_includedir}/GL/glxext.h +%if %{with multigl} +%attr(755,root,root) %{_libdir}/libGL.so %endif -%if %{with userspace} -%files devel +%files static %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%{_includedir}/GL/*.h -# -static %{_libdir}/libXvMCNVIDIA.a %files progs @@ -291,3 +348,9 @@ EOF %{_mandir}/man1/nvidia-* %{_pixmapsdir}/nvidia-settings.png %endif + +%if %{with kernel} +%files -n kernel%{_alt_kernel}-video-nvidia +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/*.ko* +%endif