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=c3eb8fd45d911eb725f52a76c02f37779822fa6c;hp=0a5714892469004d2023364061b5229ba1d68254;hb=223cb21abebe0dbde7c6d3a0e3a0315451e80114;hpb=a916079652e15304e4535586490fad03f9d0c572 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 0a57148..c3eb8fd 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -24,25 +24,26 @@ %endif %define pname xorg-driver-video-nvidia -%define rel 2 +%define rel 0.1 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} -Version: 190.53 +Version: 195.36.15 Release: %{rel}%{?with_multigl:.mgl} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run -# Source0-md5: 2e80419f6f9ac16beecd839874d0c5ab +# Source0-md5: b09b45113585524b08b3b2acfdf4a290 Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: 3d3e956366f9df0e4c64d2e0299d1029 +# Source1-md5: 82ff23e6d02b9f208c618ec17c60ca29 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch +Patch2: xorg-driver-video-nvidia-kernel.patch URL: http://www.nvidia.com/object/unix.html %if %{with kernel} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} @@ -53,7 +54,7 @@ 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) <= 7.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -229,23 +230,12 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg* %endif %patch0 -p1 %patch1 -p1 +%patch2 -p0 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild -mv usr/share/doc . -mv usr/bin . -mv usr/share/man/man1 man -mv usr/share/applications xdg -mv usr/share/pixmaps/* xdg -mv usr/src/nv src -mv usr/lib/tls lib -mv usr/lib/* lib -mv usr/X11R6/lib/modules lib/xorg -mv usr/X11R6/lib/* lib -mv usr/include . - %build %if %{with kernel} -cd src +cd usr/src/nv ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -267,18 +257,18 @@ install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif -install -p bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -cp -a man/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a xdg/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} -cp -a xdg/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} +cp -a usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -a usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} +cp -a usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh for f in \ - lib/libnvidia-tls.so.%{version} \ - lib/libnvidia-cfg.so.%{version} \ - lib/libGL{,core}.so.%{version} \ - lib/libcuda.so.%{version} \ - lib/libXvMCNVIDIA.so.%{version} \ + 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/X11R6/lib/libXvMCNVIDIA.so.%{version} \ ; do %if %{without multigl} install -p $f $RPM_BUILD_ROOT%{_libdir} @@ -287,18 +277,18 @@ for f in \ %endif done -cp -a lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} -install -p lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau +cp -a usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +install -p usr/lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau -install -p lib/xorg/extensions/libglx.so.%{version} \ +install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions -install -p lib/xorg/drivers/nvidia_drv.so \ +install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} -install -p lib/xorg/libnvidia-wfb.so.%{version} \ +install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules -cp -a include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL -cp -a include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda +cp -a usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL +cp -a usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so @@ -328,7 +318,7 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %if %{with kernel} -%install_kernel_modules -m src/nvidia -d misc +%install_kernel_modules -m usr/src/nv/nvidia -d misc %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} @@ -377,7 +367,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files %defattr(644,root,root,755) %doc LICENSE -%doc doc/{README.txt,NVIDIA_Changelog,XF86Config.sample} +%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample} %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so @@ -392,8 +382,10 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %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}/libXvMCNVIDIA.so %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 +%attr(755,root,root) %{_libdir}/libcuda.so %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.*.* @@ -404,8 +396,10 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so # (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.so.*.* %attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1 +%attr(755,root,root) %{_libdir}/libcuda.so %attr(755,root,root) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* @@ -415,8 +409,6 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%attr(755,root,root) %{_libdir}/libcuda.so %dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_includedir}/GL/glext.h @@ -434,7 +426,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files doc %defattr(644,root,root,755) -%doc doc/html/* +%doc usr/share/doc/html/* %files progs %defattr(644,root,root,755)