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=d02ae5b7c60eb4ba96c7808a486d5afc4f20ded1;hp=5b0c87dbaa28c9afb474b2f2ee78e14414be0a3c;hb=f46b47816689b711b5b6c62d53ecaca3ff79c34b;hpb=f23e5f516b35703856ab305b3b7d5c6124aeb8bf diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 5b0c87d..d02ae5b 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -2,14 +2,14 @@ # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without smp # without smp packages +%bcond_without kernel # without kernel packages %bcond_with verbose # verbose build (V=1) %bcond_with tls # install libraries with tls support # %define _nv_ver 1.0 -%define _nv_rel 6106 -%define _nv_pkg pkg1 +%define _nv_rel 6111 %define _min_x11 6.7.0 -%define _rel 1 +%define _rel 2 # Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro @@ -19,8 +19,10 @@ Release: %{_rel} License: nVidia Binary Vendor: nVidia Corp. Group: X11/XFree86 -Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-%{_nv_pkg}.run -# Source0-md5: 5432f919f0211ce36b854d87108d7db0 +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run +# Source0-md5: 51e83be46f83c52102ccb8995b54f4e2 +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: 6c7b0c8b3ce5c34186e0c80042e6d046 Patch0: %{name}-gcc34.patch URL: http://www.nvidia.com/object/linux.html BuildConflicts: XFree86-nvidia @@ -28,8 +30,9 @@ BuildRequires: grep %{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.153 +BuildRequires: sed >= 4.0 BuildRequires: textutils -Requires: X11-driver-nvidia(kernel) +#BuildRequires: X11-devel >= %{_min_x11} # disabled for now Requires: X11-Xserver Requires: X11-libs >= %{_min_x11} Requires: X11-modules >= %{_min_x11} @@ -38,7 +41,6 @@ Provides: X11-OpenGL-core Provides: X11-OpenGL-libGL Provides: XFree86-OpenGL-core Provides: XFree86-OpenGL-libGL -Provides: XFree86-driver-nvidia Obsoletes: Mesa Obsoletes: X11-OpenGL-core Obsoletes: X11-OpenGL-libGL @@ -47,11 +49,14 @@ Obsoletes: XFree86-OpenGL-libGL Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 -ExclusiveArch: %{ix86} +ExclusiveArch: %{ix86} amd64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLcore.so.1 %define _prefix /usr/X11R6 +%ifarch amd64 +%define _libdir32 %{_prefix}/lib +%endif %description This driver set adds improved 2D functionality to the XFree86 4.0 X @@ -93,7 +98,8 @@ sterownik %package progs Summary: Tools for advanced control of nVidia graphic cards Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia -Group: Application/System +Group: Applications/System +Obsoletes: XFree86-driver-nvidia-progs Requires: %{name} = %{version}-%{release} %description progs @@ -151,10 +157,16 @@ przez sterownik nVidii dla XFree86 4. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-%{_nv_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}-%{_nv_pkg} +%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 +%endif %patch0 -p1 +sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild %build cd usr/src/nv/ @@ -192,6 +204,12 @@ install usr/lib%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_l install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir} install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/modules/extensions +%ifarch amd64 +# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations +#install -d $RPM_BUILD_ROOT%{_libdir32} +#install usr/lib32%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir32} +#install usr/lib32/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir32} +%endif install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers install usr/X11R6/lib/libXvMCNVIDIA.* $RPM_BUILD_ROOT%{_libdir} @@ -218,7 +236,21 @@ install nvidia-smp.ko \ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +cat << EOF + + ******************************************************* + * * + * NOTE: * + * You must install: * + * kernel(24)(-smp)-video-nvidia-%{version} * + * for this driver to work * + * * + ******************************************************* + +EOF + %postun -p /sbin/ldconfig %post -n kernel-video-nvidia @@ -243,11 +275,20 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.* +%ifarch amd64 +# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations +#dir %{_libdir32} +#attr(755,root,root) %{_libdir32}/libGL.so.*.* +#attr(755,root,root) %{_libdir32}/libGLcore.so.*.* +#attr(755,root,root) %{_libdir32}/libXvMCNVIDIA.so.*.* +#attr(755,root,root) %{_libdir32}/libnvidia-tls.so.*.*.* +%endif %attr(755,root,root) /usr/%{_lib}/libGL.so.1 %attr(755,root,root) /usr/%{_lib}/libGL.so %attr(755,root,root) %{_libdir}/modules/extensions/libglx.so* %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o +%if %{with kernel} %files -n kernel-video-nvidia %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/*.ko* @@ -257,6 +298,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/*.ko* %endif +%endif %files devel %defattr(644,root,root,755)