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=8b750141db1608db8857bf8321465c3bbc394853;hp=051f876c1050204b96617270c77cb590bb772948;hb=08cbb75030aa6475c1a810b7561108685408622b;hpb=63c6d4b1ca4aa3d739c93e09d3ecda281f83570f diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 051f876..8b75014 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,51 +1,41 @@ +# TODO +# - solve this (shouldn't there be some obsoletes?): +# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 +# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 # # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # without kernel packages -%bcond_without incall # include all tarballs %bcond_without userspace # don't build userspace programs +%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) -# -%define no_install_post_strip 1 -# -%define _nv_ver 100 -%define _nv_rel 14.11 -%define _min_x11 6.7.0 -%define _rel 1 -# -%define need_x86 0 -%define need_x8664 0 -%if %{with incall} -%define need_x86 1 -%define need_x8664 1 -%else -%ifarch %{ix86} -%define need_x86 1 -%endif -%ifarch %{x8664} -%define need_x8664 1 + +%if "%{_alt_kernel}" != "%{nil}" +%undefine with_userspace %endif +%if %{without userspace} +# nothing to be placed to debuginfo package +%define _enable_debug_packages 0 %endif -# + +%define pname xorg-driver-video-nvidia +%define rel 3 + Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro -Name: xorg-driver-video-nvidia -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel} +Name: %{pname}%{_alt_kernel} +Version: 173.14.12 +Release: %{rel}%{?with_multigl:.mgl} License: nVidia Binary Group: X11 -%if %{need_x86} -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run -# Source0-md5: 3e76376b5f1a53e0c18694fa65691c75 -%endif -%if %{need_x8664} -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2.run -# Source1-md5: 060dfcab02bc903ce6f18da4fad6f74f -%endif -Source2: %{name}-xinitrc.sh +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run +# Source0-md5: c099b6e15ef34187571403fb017d58a1 +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run +# Source1-md5: 220b8dbe64d976e0045ee875cfa33c03 +Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -URL: http://www.nvidia.com/object/linux.html +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} %endif @@ -54,17 +44,22 @@ BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server -Provides: OpenGL = 1.5 +Requires: xorg-xserver-server(videodrv-abi) = 2.0 +Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 Provides: xorg-xserver-libglx +%if %{without multigl} Obsoletes: Mesa -Obsoletes: Mesa-libGL +%endif Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-OpenGL-core < 1:7.0.0 Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia +%if %{without multigl} +Conflicts: Mesa-libGL +%endif Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -101,7 +96,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Provides: OpenGL-GLX-devel = 1.4 -Provides: OpenGL-devel = 1.5 +Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base Obsoletes: XFree86-OpenGL-devel-base Obsoletes: XFree86-driver-nvidia-devel @@ -132,6 +127,7 @@ Summary: Tools for advanced control of nVidia graphic cards Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System Requires: %{name} = %{version}-%{release} +Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs %description progs @@ -144,12 +140,12 @@ Narzędzia do zarządzania kartami graficznymi nVidia. Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel}@%{_kernel_ver_str} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel} +Requires: %{pname} = %{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -165,13 +161,13 @@ sterownik nVidii dla Xorg/XFree86. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg* +rm -rf NVIDIA-Linux-x86*-%{version}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg2 %endif %patch0 -p1 %patch1 -p1 @@ -179,7 +175,7 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s %build %if %{with kernel} -cd usr/src/nv/ +cd usr/src/nv ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -197,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_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} +%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 @@ -209,10 +208,17 @@ for f in \ usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ +%if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ ; do install $f $RPM_BUILD_ROOT%{_libdir} done +%else +; do + install $f $RPM_BUILD_ROOT%{_libdir}/nvidia +done +install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +%endif install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions @@ -224,13 +230,25 @@ install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.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 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so +%if %{with multigl} +echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf + +# OpenGL ABI for Linux compatibility +ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 +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 +%else # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 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 +%endif %endif %if %{with kernel} @@ -242,11 +260,21 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -cat << EOF -NOTE: You must install: -kernel-video-nvidia-%{version} -for this driver to work +cat << 'EOF' +NOTE: You must also install kernel module for this driver to work + kernel-video-nvidia-%{version} + kernel-desktop-video-nvidia-%{version} + kernel-laptop-video-nvidia-%{version} + kernel-vanilla-video-nvidia-%{version} + +Depending on which kernel brand you use. + EOF +%if %{with multigl} +if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then + ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so +fi +%endif %postun -p /sbin/ldconfig @@ -261,6 +289,19 @@ EOF %defattr(644,root,root,755) %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} +%if %{with multigl} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf +%dir %{_libdir}/nvidia +%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}/nvidia/libXvMCNVIDIA.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* +%ghost %{_libdir}/xorg/modules/extensions/libglx.so +%else %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libGL.so.1 # symlink for binary apps which fail to conform Linux OpenGL ABI @@ -269,20 +310,25 @@ EOF %attr(755,root,root) %{_libdir}/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1 -%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*.* -%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*.* +%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* +%endif +%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/wfb.so %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so +%dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h +%if %{with multigl} +%attr(755,root,root) %{_libdir}/libGL.so +%endif %files static %defattr(644,root,root,755)