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=0a5714892469004d2023364061b5229ba1d68254;hp=61acec3397f76f6128828cb06d21312d826b7b62;hb=a916079652e15304e4535586490fad03f9d0c572;hpb=d69b7ea1a85b61c8cb727f26ef8e4cc252749901 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 61acec3..0a57148 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -24,21 +24,21 @@ %endif %define pname xorg-driver-video-nvidia -%define rel 7 +%define rel 2 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.42 +Version: 190.53 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: f94806feee87de756d14fe3e9bcaf05a +# Source0-md5: 2e80419f6f9ac16beecd839874d0c5ab Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: ae431ff849ec01446e6724f9fcfe3bb4 +# Source1-md5: 3d3e956366f9df0e4c64d2e0299d1029 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -103,7 +103,8 @@ Starsze układy graficzne nie są obsługiwane przez ten pakiet: Summary: OpenGL (GL and GLX) Nvidia libraries Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries -#Requires: %{pname} = %{epoch}:%{version}-%{rel} +Requires(post,postun): /sbin/ldconfig +Requires: libvdpau >= 0.3 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 %if %{without multigl} @@ -163,6 +164,14 @@ Statikus XwMCNVIDIA könyvtár. %description static -l pl.UTF-8 Statyczna biblioteka XvMCNVIDIA. +%package doc +Summary: Documentation for NVIDIA Graphics Driver +Group: Documentation + +%description doc +NVIDIA Accelerated Linux Graphics Driver README and Installation +Guide. + %package progs Summary: Tools for advanced control of nVidia graphic cards Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához @@ -222,9 +231,21 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg* %patch1 -p1 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 usr/src/nv +cd src ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -240,49 +261,48 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir},%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_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} %endif -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/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +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 %{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/lib/libcuda.so.%{version} \ - usr/lib/libvdpau_nvidia.so.%{version} \ - usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ -%if %{without multigl} - usr/X11R6/lib/libXvMCNVIDIA.a \ + lib/libnvidia-tls.so.%{version} \ + lib/libnvidia-cfg.so.%{version} \ + lib/libGL{,core}.so.%{version} \ + lib/libcuda.so.%{version} \ + lib/libXvMCNVIDIA.so.%{version} \ ; do - install $f $RPM_BUILD_ROOT%{_libdir} -done +%if %{without multigl} + install -p $f $RPM_BUILD_ROOT%{_libdir} %else -; do - install $f $RPM_BUILD_ROOT%{_libdir}/nvidia -done -install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} + install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia %endif +done + +cp -a lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +install -p lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau -install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ +install -p lib/xorg/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions -install usr/X11R6/lib/modules/drivers/nvidia_drv.so \ +install -p lib/xorg/drivers/nvidia_drv.so \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} -install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ +install -p lib/xorg/libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules -install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL -install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda +cp -a include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL +cp -a 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 +ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 %if %{with multigl} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf @@ -308,7 +328,7 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %if %{with kernel} -%install_kernel_modules -m usr/src/nv/nvidia -d misc +%install_kernel_modules -m src/nvidia -d misc %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} @@ -335,10 +355,17 @@ if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then fi %else /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions +# until versioned SONAME is built for nvidia_drv.so, update symlink manually +ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %endif -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +/sbin/ldconfig -N %{_libdir}/vdpau + +%postun libs +/sbin/ldconfig +/sbin/ldconfig -N %{_libdir}/vdpau %post -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} @@ -350,14 +377,15 @@ fi %files %defattr(644,root,root,755) %doc LICENSE -%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} +%doc 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 -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.* %attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files libs +%defattr(644,root,root,755) %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %dir %{_libdir}/nvidia @@ -369,7 +397,6 @@ 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_nvidia.so.*.* %else %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libGL.so.1 @@ -382,8 +409,9 @@ 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_nvidia.so.*.* %endif +%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 %files devel %defattr(644,root,root,755) @@ -404,6 +432,10 @@ fi %defattr(644,root,root,755) %{_libdir}/libXvMCNVIDIA.a +%files doc +%defattr(644,root,root,755) +%doc doc/html/* + %files progs %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/nvidia-settings