# TODO
+# - should -libs Require main package?
# - 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
%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
%endif
%define pname xorg-driver-video-nvidia
-%define rel 3%{?with_multigl:.mgl}
+%define rel 3
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.29
-Release: %{rel}
+Name: %{pname}
+Version: 190.42
+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: db9aa3683988b7b0872abae7182f5bc5
+# Source0-md5: f94806feee87de756d14fe3e9bcaf05a
Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5: 318e36822c095fcd410161b1326797b1
+# 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
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
-Requires: xorg-xserver-server(videodrv-abi) <= 4.1
+Requires: xorg-xserver-server(videodrv-abi) <= 6.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
-Provides: OpenGL = 2.1
-Provides: OpenGL-GLX = 1.4
Provides: xorg-xserver-module(glx)
-%if %{without multigl}
-Obsoletes: Mesa
-%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)
- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez
sterowniki -legacy
+%package libs
+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}
+Provides: OpenGL = 2.1
+Provides: OpenGL-GLX = 1.4
+%if %{without multigl}
+Obsoletes: Mesa
+%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
+%if %{without multigl}
+Conflicts: Mesa-libGL
+%endif
+
+%description libs
+NVIDIA OpenGL (GL and GLX only) implementation libraries.
+
+%description libs -l pl.UTF-8
+Implementacja OpenGL (tylko GL i GLX) firmy NVIDIA.
+
%package devel
Summary: OpenGL (GL and GLX) header files
Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok
Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX)
Group: X11/Development/Libraries
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: X11-OpenGL-devel-base
%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}
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 \
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
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
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
%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
%post
-/sbin/ldconfig
cat << 'EOF'
NOTE: You must also install kernel module for this driver to work
kernel-video-nvidia-%{version}
fi
%endif
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
%doc LICENSE
%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
%if %{with multigl}
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%else
+%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/drivers/nvidia_drv.so
+
+%files libs
+%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) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
%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
%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_dynamic.so.1
+%attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1
%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.*.*
-%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/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
-%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)