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=f95d0faaf1f0626857fb49fa4cbb12d83b7f7b8e;hp=9b401e12bfdd78b92d94ddadb14ff27de57b1702;hb=7f051d903172ac4181d1b4add9170e7a11d2f90c;hpb=b225ff5983296c24772c0bb5db45d756dbf4d8a8 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 9b401e1..f95d0fa 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -8,12 +8,16 @@ %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs +%bcond_with force_userspace # force userspace build (useful if alt_kernel is set) %bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers %bcond_with verbose # verbose build (V=1) %if "%{_alt_kernel}" != "%{nil}" %undefine with_userspace %endif +%if %{with force_userspace} +%define with_userspace 1 +%endif %if %{without userspace} # nothing to be placed to debuginfo package %define _enable_debug_packages 0 @@ -25,17 +29,18 @@ 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}%{_alt_kernel} -Version: 180.44 +Name: %{pname} +Version: 190.42 Release: %{rel} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run -# Source0-md5: cd577950a63e9eae8aba27d594319a76 +# Source0-md5: f94806feee87de756d14fe3e9bcaf05a Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: 58f1d0f1f1702405cf763043aa20714f +# Source1-md5: ae431ff849ec01446e6724f9fcfe3bb4 Source2: %{pname}-xinitrc.sh +Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html @@ -48,7 +53,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) <= 6.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -235,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_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} @@ -252,7 +257,7 @@ for f in \ usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ usr/lib/libcuda.so.%{version} \ - usr/lib/libvdpau{,_nvidia,_trace}.so.%{version} \ + usr/lib/libvdpau_nvidia.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ %if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -275,7 +280,6 @@ install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda -install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so @@ -289,7 +293,6 @@ 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 -ln -sf nvidia/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %else # OpenGL ABI for Linux compatibility @@ -299,7 +302,6 @@ 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 -ln -sf libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %endif @@ -308,6 +310,10 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %install_kernel_modules -m usr/src/nv/nvidia -d misc %endif +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \ + > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -363,9 +369,7 @@ fi %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.*.* -%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libvdpau_trace.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* %ghost %{_libdir}/xorg/modules/extensions/libglx.so %else @@ -380,26 +384,23 @@ fi %attr(755,root,root) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%attr(755,root,root) %{_libdir}/libvdpau.so.*.* %attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.* -%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.* %endif %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so %attr(755,root,root) %{_libdir}/libcuda.so -%attr(755,root,root) %{_libdir}/libvdpau.so %dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h %{_includedir}/cuda -%{_includedir}/vdpau %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif +%{_pkgconfigdir}/gl.pc %files static %defattr(644,root,root,755)