commit: bef5caa454213db9386868aba8dfe11bdb719e5d Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 20:39:18 2020 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 20:39:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef5caa4
x11-drivers/nvidia-drivers: 340 series tree clean. Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> profiles/package.mask | 6 - .../nvidia-drivers-340.108-r1.ebuild | 500 --------------------- 2 files changed, 506 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index ea2031c24cb..347af048992 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -642,12 +642,6 @@ dev-tex/crosstex # Bug #629272 app-admin/apg -# Matt Turner <matts...@gentoo.org> (2020-08-11) -# NVIDIA declared this branch to have reached end of life about six months ago. -# Blocks removal of app-eselect/eselect-opengl and app-eselect/eselect-opencl. -# Masked for removal in 30 days. Bug #728290 -x11-drivers/nvidia-drivers:0/340 - # Michał Górny <mgo...@gentoo.org> (2020-08-09) # Build tool with no revdeps left. # Removal in 30 days. Bug #736517. diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108-r1.ebuild deleted file mode 100644 index dc1b42d6f30..00000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108-r1.ebuild +++ /dev/null @@ -1,500 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ - nvidia-driver portability toolchain-funcs unpacker udev - -NV_URI="https://us.download.nvidia.com/XFree86/"; -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" -AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}" - -SRC_URI=" - amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz ) - amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz ) - x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - tools? ( - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 - ) -" - -EMULTILIB_PKG="true" -IUSE="driver multilib kernel_FreeBSD kernel_linux static-libs +tools +X" -KEYWORDS="-* amd64 x86" -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0/${PV%.*}" - -COMMON=" - app-eselect/eselect-opencl - kernel_linux? ( - >=sys-libs/glibc-2.6.1 - acct-group/video - ) - tools? ( - >=x11-libs/gtk+-2.4:2 - dev-libs/atk - dev-libs/glib:2 - dev-libs/jansson - x11-libs/gdk-pixbuf[X] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXv - x11-libs/pango[X] - ) - X? ( - >=app-eselect/eselect-opengl-1.0.9 - ) -" -DEPEND=" - ${COMMON} - app-arch/xz-utils - kernel_linux? ( virtual/linux-sources ) -" -RDEPEND=" - ${COMMON} - tools? ( !media-video/nvidia-settings ) - X? ( - <x11-base/xorg-server-1.20.99:= - >=x11-libs/libvdpau-0.3-r1 - sys-libs/zlib[${MULTILIB_USEDEP}] - multilib? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - ) - ) -" -REQUIRED_USE="tools? ( X )" -QA_PREBUILT="opt/* usr/lib*" -S=${WORKDIR}/ -NV_KV_MAX_PLUS="5.5" -CONFIG_CHECK=" - !DEBUG_MUTEXES - ~!LOCKDEP - ~DRM - ~DRM_KMS_HELPER - ~SYSVIPC -" - -pkg_pretend() { - use x86 && CONFIG_CHECK+=" ~HIGHMEM" - nvidia-driver_check -} - -pkg_setup() { - use x86 && CONFIG_CHECK+=" ~HIGHMEM" - nvidia-driver_check - - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - if use driver && use kernel_linux; then - MODULE_NAMES="nvidia(video:${S}/kernel)" - - # This needs to run after MODULE_NAMES (so that the eclass checks - # whether the kernel supports loadable modules) but before BUILD_PARAMS - # is set (so that KV_DIR is populated). - linux-mod_pkg_setup - - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" - - # linux-mod_src_compile calls set_arch_to_kernel, which - # sets the ARCH to x86 but NVIDIA's wrapping Makefile - # expects x86_64 or i386 and then converts it to x86 - # later on in the build process - BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')" - fi - - # set variables to where files are in the package structure - if use kernel_FreeBSD; then - use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}" - use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}" - NV_DOC="${S}/doc" - NV_OBJ="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_OBJ="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_SOVER=${PV} - else - die "Could not determine proper NVIDIA package" - fi -} - -src_prepare() { - # Please add a brief description for every added patch - - if use driver && use kernel_linux; then - if kernel_is lt 2 6 9 ; then - eerror "You must build this against 2.6.9 or higher kernels." - fi - - # If greater than 2.6.5 use M= instead of SUBDIR= -# convert_to_m "${NV_SRC}"/Makefile.kbuild - fi - - local man_file - for man_file in "${NV_MAN}"/*1.gz; do - gunzip $man_file || die - done - - if use tools; then - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die - sed -i \ - -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-fno-common.patch \ - || die - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch - fi - - # Allow user patches so they can support RC kernels and whatever else - eapply_user -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use kernel_FreeBSD; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use driver && use kernel_linux; then - BUILD_TARGETS=module linux-mod_src_compile - fi - - if use tools; then - emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean - emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - libXNVCtrl.a - emake -C "${S}"/nvidia-settings-${PV}/src \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - LIBDIR="$(get_libdir)" \ - NVML_ENABLED=0 \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - RANLIB="$(tc-getRANLIB)" \ - STRIP_CMD=true - fi -} - -# Install nvidia library: -# the first parameter is the library to install -# the second parameter is the provided soversion -# the third parameter is the target directory if its not /usr/lib -donvidia() { - # Full path to library minus SOVER - MY_LIB="$1" - - # SOVER to use - MY_SOVER="$2" - - # Where to install - MY_DEST="$3" - - if [[ -z "${MY_DEST}" ]]; then - MY_DEST="/usr/$(get_libdir)" - action="dolib.so" - else - exeinto ${MY_DEST} - action="doexe" - fi - - # Get just the library name - libname=$(basename $1) - - # Install the library with the correct SOVER - ${action} ${MY_LIB}.${MY_SOVER} || \ - die "failed to install ${libname}" - - # If SOVER wasn't 1, then we need to create a .1 symlink - if [[ "${MY_SOVER}" != "1" ]]; then - dosym ${libname}.${MY_SOVER} \ - ${MY_DEST}/${libname}.1 || \ - die "failed to create ${libname} symlink" - fi - - # Always create the symlink from the raw lib to the .1 - dosym ${libname}.1 \ - ${MY_DEST}/${libname} || \ - die "failed to create ${libname} symlink" -} - -src_install() { - if use driver && use kernel_linux; then - linux-mod_src_install - - # Add the aliases - # This file is tweaked with the appropriate video group in - # pkg_preinst, see bug #491414 - insinto /etc/modprobe.d - newins "${FILESDIR}"/nvidia-169.07 nvidia.conf - - # Ensures that our device nodes are created when not using X - exeinto "$(get_udevdir)" - newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh - udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules - elif use kernel_FreeBSD; then - if use x86-fbsd; then - insinto /boot/modules - doins "${S}/src/nvidia.kld" - fi - - exeinto /boot/modules - doexe "${S}/src/nvidia.ko" - fi - - # NVIDIA kernel <-> userspace driver config lib - donvidia "${NV_OBJ}"/libnvidia-cfg.so ${NV_SOVER} - - # NVIDIA framebuffer capture library - donvidia "${NV_OBJ}"/libnvidia-fbc.so ${NV_SOVER} - - # NVIDIA video encode/decode <-> CUDA - if use kernel_linux; then - donvidia "${NV_OBJ}"/libnvcuvid.so ${NV_SOVER} - donvidia "${NV_OBJ}"/libnvidia-encode.so ${NV_SOVER} - fi - - if use X; then - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins "${NV_X11}"/nvidia_drv.so - - # Xorg GLX driver - donvidia "${NV_X11}"/libglx.so ${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions - fi - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins "${NV_OBJ}"/nvidia.icd - fi - - # Helper Apps - exeinto /opt/bin/ - - if use X; then - doexe "${NV_OBJ}"/nvidia-xconfig - fi - - if use kernel_linux ; then - doexe "${NV_OBJ}"/nvidia-cuda-mps-control - doexe "${NV_OBJ}"/nvidia-cuda-mps-server - doexe "${NV_OBJ}"/nvidia-debugdump - doexe "${NV_OBJ}"/nvidia-persistenced - doexe "${NV_OBJ}"/nvidia-smi - - # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) - doexe "${NV_OBJ}"/nvidia-modprobe - fowners root:video /opt/bin/nvidia-modprobe - fperms 4710 /opt/bin/nvidia-modprobe - dosym /{opt,usr}/bin/nvidia-modprobe - - doman nvidia-cuda-mps-control.1 - doman nvidia-modprobe.1 - doman nvidia-persistenced.1 - newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi - newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced - newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced - fi - - if use tools; then - emake -C "${S}"/nvidia-settings-${PV}/src/ \ - DESTDIR="${D}" \ - LIBDIR="${D}/usr/$(get_libdir)" \ - PREFIX=/usr \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - install - - if use static-libs; then - dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h - fi - - insinto /usr/share/nvidia/ - doins nvidia-application-profiles-${PV}-key-documentation - - insinto /etc/nvidia - newins \ - nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - - # There is no icon in the FreeBSD tarball. - use kernel_FreeBSD || \ - doicon "${NV_OBJ}"/nvidia-settings.png - - domenu "${FILESDIR}"/nvidia-settings.desktop - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings - - fi - - dobin "${NV_OBJ}"/nvidia-bug-report.sh - - #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist - - if has_multilib_profile && use multilib ; then - local OABI=${ABI} - for ABI in $(multilib_get_enabled_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" - - # Documentation - if use kernel_FreeBSD; then - dodoc "${NV_DOC}"/README - use X && doman "${NV_MAN}"/nvidia-xconfig.1 - use tools && doman "${NV_MAN}"/nvidia-settings.1 - else - # Docs - newdoc "${NV_DOC}"/README.txt README - dodoc "${NV_DOC}"/NVIDIA_Changelog - doman "${NV_MAN}"/nvidia-smi.1 - use X && doman "${NV_MAN}"/nvidia-xconfig.1 - use tools && doman "${NV_MAN}"/nvidia-settings.1 - doman "${NV_MAN}"/nvidia-cuda-mps-control.1 - fi - - readme.gentoo_create_doc - - docinto html - dodoc -r "${NV_DOC}"/html/* -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" - local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" - local nv_libdir="${NV_OBJ}" - - if use kernel_linux && has_multilib_profile && \ - [[ ${ABI} == "x86" ]] ; then - nv_libdir="${NV_OBJ}"/32 - fi - - if use X; then - # The GLX libraries - donvidia "${nv_libdir}"/libEGL.so ${NV_SOVER} ${GL_ROOT} - donvidia "${nv_libdir}"/libGL.so ${NV_SOVER} ${GL_ROOT} - donvidia "${nv_libdir}"/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT} - donvidia "${nv_libdir}"/libnvidia-eglcore.so ${NV_SOVER} - donvidia "${nv_libdir}"/libnvidia-glcore.so ${NV_SOVER} - donvidia "${nv_libdir}"/libnvidia-glsi.so ${NV_SOVER} - donvidia "${nv_libdir}"/libnvidia-ifr.so ${NV_SOVER} - if use kernel_FreeBSD; then - donvidia "${nv_libdir}"/libnvidia-tls.so ${NV_SOVER} - else - donvidia "${nv_libdir}"/tls/libnvidia-tls.so ${NV_SOVER} - fi - - # VDPAU - donvidia "${nv_libdir}"/libvdpau_nvidia.so ${NV_SOVER} - - # GLES v2 libraries - insinto ${GL_ROOT} - doexe "${nv_libdir}"/libGLESv2.so.${PV} - dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2 - dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so - fi - - # NVIDIA monitoring library - if use kernel_linux ; then - donvidia "${nv_libdir}"/libnvidia-ml.so ${NV_SOVER} - fi - - # CUDA & OpenCL - if use kernel_linux; then - donvidia "${nv_libdir}"/libcuda.so ${NV_SOVER} - donvidia "${nv_libdir}"/libnvidia-compiler.so ${NV_SOVER} - donvidia "${nv_libdir}"/libOpenCL.so 1.0.0 ${CL_ROOT} - donvidia "${nv_libdir}"/libnvidia-opencl.so ${NV_SOVER} - fi -} - -pkg_preinst() { - if use driver && use kernel_linux; then - linux-mod_pkg_preinst - local videogroup="$(getent group video | cut -d ':' -f 3)" - if [ -z "${videogroup}" ]; then - eerror "Failed to determine the video group gid" - die "Failed to determine the video group gid" - else - sed -i \ - -e "s:PACKAGE:${PF}:g" \ - -e "s:VIDEOGID:${videogroup}:" \ - "${D}"/etc/modprobe.d/nvidia.conf || die - fi - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - use driver && use kernel_linux && linux-mod_pkg_postinst - - # Switch to the nvidia implementation - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia - "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia - - readme.gentoo_print_elog - - if ! use X; then - elog "You have elected to not install the X.org driver. Along with" - elog "this the OpenGL libraries and VDPAU libraries were not" - elog "installed. Additionally, once the driver is loaded your card" - elog "and fan will run at max speed which may not be desirable." - elog "Use the 'nvidia-smi' init script to have your card and fan" - elog "speed scale appropriately." - elog - fi - if ! use tools; then - elog "USE=tools controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. Optionally you can install" - elog "media-video/nvidia-settings" - elog - fi -} - -pkg_prerm() { - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use driver && use kernel_linux && linux-mod_pkg_postrm - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -}
