# 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 2
+%define rel 4
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: 177.82
+Name: %{pname}
+Version: 256.35
Release: %{rel}%{?with_multigl:.mgl}
+Epoch: 1
License: nVidia Binary
Group: X11
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: 8e46c4af035bf29064140fa6255f3cf3
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: 963d5223851ee307b15b0923492c2ace
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
+# Source0-md5: f6af8917a500de28396a438f3f548c88
+Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
+# Source1-md5: 7b5924f14a4d2326b4d916efdb7852ff
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) <= 7.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
-Requires: xorg-xserver-server(videodrv-abi) <= 4.1
-Provides: OpenGL = 2.1
-Provides: OpenGL-GLX = 1.4
-Provides: xorg-xserver-libglx
-%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
+Provides: xorg-xserver-module(glx)
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)
-%define _noautoreqdep libGL.so.1 libGLcore.so.1
+%define _noautoreqdep libGL.so.1
%description
This driver set adds improved 2D functionality to the Xorg X server as
- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy
drivers.
+%description -l hu.UTF-8
+Ez a meghajtó kibővíti az Xorg X szerver 2D működését OpenGL
+gyorsítással, AGP támogatással és támogatja a több monitort.
+Támogatott hardverek: modern NVIDIA GeForce (GeForce2 MX-től) és
+Quadro (Quadro4 és újabbak) alapú grafikai gyorsítók.
+
+A régekbbi grafikus chipek nem támogatottak:
+- NV1 és RIVA 128/128ZX chipek az alap Xorg telepítéssel (nv meghajtó)
+- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 a -legacy driverekkel
+ támogatottak.
+
%description -l pl.UTF-8
Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg,
dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów
- 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(post,postun): /sbin/ldconfig
+Requires: libvdpau >= 0.3
+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: %{name} = %{version}-%{release}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: X11-OpenGL-devel-base
OpenGL header files (GL and GLX only) for NVIDIA OpenGL
implementation.
+%description devel -l hu.UTF-8
+OpenGL fejléc fájlok (csak GL és GLX) NVIDIA OpenGL implementációhoz.
+
%description devel -l pl.UTF-8
Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL
firmy NVIDIA.
%package static
Summary: Static XvMCNVIDIA library
+Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár
Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{pname}-devel = %{epoch}:%{version}-%{rel}
%description static
Static XvMCNVIDIA library.
+%description static -l hu.UTF-8
+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
Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
%description progs
Tools for advanced control of nVidia graphic cards.
+%description progs -l hu.UTF-8
+Eszközök az nVidia grafikus kártyák beállításához.
+
%description progs -l pl.UTF-8
Narzędzia do zarządzania kartami graficznymi nVidia.
%package -n kernel%{_alt_kernel}-video-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(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez.
Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia
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}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8
Die nVidia-Architektur-Unterstützung für den Linux-Kern.
+%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8
+nVidia Architektúra támogatás Linux kernelhez.
+
%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8
Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
sterownik nVidii dla Xorg/XFree86.
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86-%{version}
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg2
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32
%endif
%patch0 -p1
%patch1 -p1
-echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
+echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
%build
%if %{with kernel}
-cd usr/src/nv
+cd kernel
ln -sf Makefile.kbuild Makefile
cat >> Makefile <<'EOF'
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{%{_includedir}/GL,%{_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 nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a 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/X11R6/lib/libXvMCNVIDIA.so.%{version} \
-%if %{without multigl}
- usr/X11R6/lib/libXvMCNVIDIA.a \
+ libGL.so.%{version} \
+ libXvMCNVIDIA.so.%{version} \
+ libcuda.so.%{version} \
+ libnvidia-cfg.so.%{version} \
+ libnvidia-glcore.so.%{version} \
+ tls/libnvidia-tls.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
-install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
+cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+
+install -p libglx.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
-install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+install -p nvidia_drv.so \
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+install -p libnvidia-wfb.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules
-install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -a 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
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/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%else
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
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 libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%endif
%endif
%if %{with kernel}
-%install_kernel_modules -m usr/src/nv/nvidia -d misc
+%install_kernel_modules -m kernel/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}
if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
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
+ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
%endif
-%postun -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}
%if %{with userspace}
%files
%defattr(644,root,root,755)
-%doc LICENSE
-%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
+%doc LICENSE NVIDIA_Changelog README.txt
+%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/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
%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) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+%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-glcore.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
# (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) %{_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}/libcuda.so.*.*
%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-glcore.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/drivers/nvidia_drv.so
+%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)
-%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
+%{_includedir}/cuda
%if %{with multigl}
%attr(755,root,root) %{_libdir}/libGL.so
%endif
+%{_pkgconfigdir}/gl.pc
%files static
%defattr(644,root,root,755)
%{_libdir}/libXvMCNVIDIA.a
+%files doc
+%defattr(644,root,root,755)
+%doc html/*
+
%files progs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-smi
%attr(755,root,root) %{_bindir}/nvidia-xconfig
-%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
%{_desktopdir}/nvidia-settings.desktop
%{_mandir}/man1/nvidia-*
projects / packages / xorg-driver-video-nvidia.git / blobdiff