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=f14627d4f9b948a1e49c138cf5a16384e6f8a7da;hp=5e0231ef31c6b89dfa387f88adee341efc89183d;hb=1b8b76469aa8e7632ebcfcfc23cb219dc8c36424;hpb=00aee69a27c81d0c5985660c4eeeabc3b457dab9 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 5e0231e..f14627d 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,7 +1,6 @@ # # Conditional build: %bcond_without dist_kernel # without distribution kernel -%bcond_without smp # without smp packages %bcond_without kernel # without kernel packages %bcond_without incall # include all tarballs %bcond_without userspace # don't build userspace programs @@ -9,10 +8,10 @@ # %define no_install_post_strip 1 # -%define _nv_ver 1.0 -%define _nv_rel 8762 +%define _nv_ver 100 +%define _nv_rel 14.11 %define _min_x11 6.7.0 -%define _rel 0.1 +%define _rel 1 # %define need_x86 0 %define need_x8664 0 @@ -28,44 +27,42 @@ %endif %endif # -Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips -Summary(pl): 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} License: nVidia Binary Group: X11 %if %{need_x86} -Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run -# Source0-md5: 86bcf4a3a9d441dff9e25b82ec8a6060 +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run +# Source0-md5: 3e76376b5f1a53e0c18694fa65691c75 %endif %if %{need_x8664} -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run -# Source1-md5: 5eb0b27342fd726fbbdd1d99eadbd0e7 +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: 060dfcab02bc903ce6f18da4fad6f74f %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 %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.213 +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server -Provides: OpenGL = 1.5 -Provides: OpenGL-GLX -Provides: X11-OpenGL-core -Provides: X11-OpenGL-libGL -Provides: XFree86-OpenGL-core -Provides: XFree86-OpenGL-libGL -Provides: xorg-xserver-modules-libglx +Provides: OpenGL = 2.1 +Provides: OpenGL-GLX = 1.4 +Provides: xorg-xserver-libglx Obsoletes: Mesa -Obsoletes: X11-OpenGL-core -Obsoletes: X11-OpenGL-libGL -Obsoletes: XFree86-OpenGL-core -Obsoletes: XFree86-OpenGL-libGL +Obsoletes: Mesa-libGL +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 Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 @@ -75,47 +72,64 @@ 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. - -%description -l pl -Usprawnione sterowniki dla kart graficznych nVidia do serwera -Xorg/XFree86, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i -wielu monitorów 2D. - -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. +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, +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). + +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): 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 +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 devel -l pl -Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla -sterowników nvidii. +%description static -l pl.UTF-8 +Statyczna biblioteka XvMCNVIDIA. %package progs Summary: Tools for advanced control of nVidia graphic cards -Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia +Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System Requires: %{name} = %{version}-%{release} Obsoletes: XFree86-driver-nvidia-progs @@ -123,63 +137,41 @@ Obsoletes: XFree86-driver-nvidia-progs %description progs Tools for advanced control of nVidia graphic cards. -%description progs -l pl -Narzêdzia do zarz±dzania kartami graficznymi nVidia. +%description progs -l pl.UTF-8 +Narzędzia do zarządzania kartami graficznymi nVidia. %package -n kernel%{_alt_kernel}-video-nvidia Summary: nVidia kernel module for nVidia Architecture support -Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung -Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia +Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung +Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia Version: %{_nv_ver}.%{_nv_rel} Release: %{_rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 -%{?with_dist_kernel:%requires_releq_kernel_up} +%{?with_dist_kernel:%requires_releq_kernel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel %description -n kernel%{_alt_kernel}-video-nvidia nVidia Architecture support for Linux kernel. -%description -n kernel%{_alt_kernel}-video-nvidia -l de -Die nVidia-Architektur-Unterstützung für den Linux-Kern. +%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8 +Die nVidia-Architektur-Unterstützung für den Linux-Kern. -%description -n kernel%{_alt_kernel}-video-nvidia -l pl -Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez +%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8 +Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez sterownik nVidii dla Xorg/XFree86. -%package -n kernel%{_alt_kernel}-smp-video-nvidia -Summary: nVidia kernel module for nVidia Architecture support -Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung -Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia -Release: %{_rel}@%{_kernel_ver_str} -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -Requires: dev >= 2.7.7-10 -%{?with_dist_kernel:%requires_releq_kernel_smp} -Provides: X11-driver-nvidia(kernel) -Obsoletes: XFree86-nvidia-kernel - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -nVidia Architecture support for Linux kernel SMP. - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de -Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP. - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl -Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany -przez 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 @@ -189,35 +181,13 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s %if %{with kernel} cd usr/src/nv/ ln -sf Makefile.kbuild Makefile -for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do - if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then - exit 1 - fi - install -d o/include/linux - ln -sf %{_kernelsrcdir}/config-$cfg o/.config - ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h -%if %{with dist_kernel} - %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts -%else - install -d o/include/config - touch o/include/config/MARKER - ln -sf %{_kernelsrcdir}/scripts o/scripts -%endif - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - CC="%{__cc}" CPP="%{__cpp}" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv nvidia.ko nvidia-$cfg.ko -done +cat >> Makefile <<'EOF' + +$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin + cp $< $@ +EOF +mv nv-kernel.o{,.bin} +%build_kernel_modules -m nvidia %endif %install @@ -226,15 +196,17 @@ rm -rf $RPM_BUILD_ROOT %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{%{_desktopdir},%{_pixmapsdir}} + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} -install usr/bin/nvidia-{settings,xconfig} $RPM_BUILD_ROOT%{_bindir} +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/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +install %{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/X11R6/lib/libXvMCNVIDIA.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -244,14 +216,17 @@ 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.o \ +install usr/X11R6/lib/modules/drivers/nvidia_drv.so \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers +install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ + $RPM_BUILD_ROOT%{_libdir}/xorg/modules 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 # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 @@ -259,14 +234,7 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so %endif %if %{with kernel} -cd usr/src/nv/ -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc -install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko -%if %{with smp} && %{with dist_kernel} -install nvidia-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko -%endif +%install_kernel_modules -m usr/src/nv/nvidia -d misc %endif %clean @@ -275,16 +243,9 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig cat << EOF - - ******************************************************* - * * - * NOTE: * - * You must install: * - * kernel(24)(-smp)-video-nvidia-%{version} * - * for this driver to work * - * * - ******************************************************* - +NOTE: You must install: +kernel-video-nvidia-%{version} +for this driver to work EOF %postun -p /sbin/ldconfig @@ -295,55 +256,52 @@ EOF %postun -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-smp-video-nvidia -%depmod %{_kernel_ver}smp - -%postun -n kernel%{_alt_kernel}-smp-video-nvidia -%depmod %{_kernel_ver}smp - %if %{with userspace} %files %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 -# %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}/xorg/modules/extensions/libglx.so* -%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.o -%endif - -%if %{with kernel} -%files -n kernel%{_alt_kernel}-video-nvidia -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/*.ko* -%if %{with smp} && %{with dist_kernel} -%files -n kernel%{_alt_kernel}-smp-video-nvidia -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/*.ko* -%endif -%endif - -%if %{with userspace} %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%{_includedir}/GL/*.h -# -static +%dir %{_includedir}/GL +%{_includedir}/GL/gl.h +%{_includedir}/GL/glext.h +%{_includedir}/GL/glx.h +%{_includedir}/GL/glxext.h + +%files static +%defattr(644,root,root,755) %{_libdir}/libXvMCNVIDIA.a %files progs %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/nvidia-settings %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-* %{_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