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=56d62169c694cd72608adcbb0868216500c7226c;hp=83dd0a70d06f96424d518c9c6cf777f7edde9390;hb=8f4af7b33e34702170ebf63bb0d9192f4b2e5ba4;hpb=25b520ff5d0e6b4c9eb67c02c14523df1b9e7993 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 83dd0a7..56d6216 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -2,13 +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_rel 6629 %define _min_x11 6.7.0 -%define _rel 2 +%define _rel 1 # Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro @@ -18,11 +19,17 @@ Release: %{_rel} License: nVidia Binary Vendor: nVidia Corp. Group: X11/XFree86 +# why not pkg0!? Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run -# Source0-md5: 5432f919f0211ce36b854d87108d7db0 +# Source0-md5: f7737c1e95371f37a4fd30da2f11e72c +# Source0-size: 8167999 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: 024f21a3fa134bee8339adac64bdc77a +# Source1-md5: 652e69f549c81a7a3f2806daa74b9c36 +# Source1-size: 7333486 Patch0: %{name}-gcc34.patch +Patch1: %{name}-GL.patch +Patch2: %{name}-enable-pci.patch +Patch3: %{name}-power-suspend.patch URL: http://www.nvidia.com/object/linux.html BuildConflicts: XFree86-nvidia BuildRequires: grep @@ -31,6 +38,7 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.153 BuildRequires: sed >= 4.0 BuildRequires: textutils +#BuildRequires: X11-devel >= %{_min_x11} # disabled for now Requires: X11-Xserver Requires: X11-libs >= %{_min_x11} Requires: X11-modules >= %{_min_x11} @@ -39,7 +47,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 @@ -97,7 +104,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 @@ -164,31 +172,36 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg* %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2 %endif %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild %build +%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 - rm -rf include - install -d include/{linux,config} - ln -sf %{_kernelsrcdir}/config-$cfg .config - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm - touch include/config/MARKER - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ - M=$PWD O=$PWD \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - CC="%{__cc}" CPP="%{__cpp}" \ - M=$PWD O=$PWD \ - %{?with_verbose:V=1} - mv nvidia.ko nvidia-$cfg.ko + if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then + exit 1 + fi + rm -rf include + install -d include/{linux,config} + ln -sf %{_kernelsrcdir}/config-$cfg .config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + touch include/config/MARKER + %{__make} -C %{_kernelsrcdir} clean \ + RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + %{__make} -C %{_kernelsrcdir} modules \ + CC="%{__cc}" CPP="%{__cpp}" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + mv nvidia.ko nvidia-$cfg.ko done +%endif %install rm -rf $RPM_BUILD_ROOT @@ -210,7 +223,7 @@ install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ %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} +install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir} install usr/include/GL/*.h $RPM_BUILD_ROOT/usr/include/GL #install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir} @@ -234,26 +247,22 @@ install nvidia-smp.ko \ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - +%post +/sbin/ldconfig cat << EOF ******************************************************* * * * NOTE: * * You must install: * - * kernel-video-nvidia-%{version}-%{release} * - * for this driver to work correctly * + * kernel(24)(-smp)-video-nvidia-%{version} * + * for this driver to work * * * ******************************************************* EOF -%postun -p /sbin/ldconfig - -%post st -p /sbin/ldconfig -%postun st -p /sbin/ldconfig +%postun -p /sbin/ldconfig %post -n kernel-video-nvidia %depmod %{_kernel_ver} @@ -290,6 +299,7 @@ EOF %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* @@ -299,6 +309,7 @@ EOF %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/*.ko* %endif +%endif %files devel %defattr(644,root,root,755)