commit: 7e7c112c7d334a19e0048054a9ce888964b50ae3 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Jun 27 04:14:36 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Jun 27 04:22:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7c112c
x11-drivers/nvidia-drivers: Do not use systemd_get_utildir() Package-Manager: Portage-2.3.103, Repoman-2.3.23 Closes: https://bugs.gentoo.org/689588 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> ...2-r3.ebuild => nvidia-drivers-430.64-r5.ebuild} | 58 +++++++--------------- ...2-r3.ebuild => nvidia-drivers-435.21-r5.ebuild} | 14 ++---- ...-r3.ebuild => nvidia-drivers-440.100-r1.ebuild} | 9 ++-- .../nvidia-drivers/nvidia-drivers-440.82-r3.ebuild | 2 +- ...2-r3.ebuild => nvidia-drivers-440.82-r4.ebuild} | 4 +- ...2-r3.ebuild => nvidia-drivers-450.51-r1.ebuild} | 12 ++--- 6 files changed, 32 insertions(+), 67 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild similarity index 91% copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild index de2d1351e1c..129f697ae87 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild @@ -19,11 +19,11 @@ SRC_URI=" " EMULTILIB_PKG="true" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" -IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X" +IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X" REQUIRED_USE=" tools? ( X ) static-libs? ( tools ) @@ -50,11 +50,7 @@ COMMON=" x11-libs/pango[X] ) X? ( - !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) - libglvnd? ( - media-libs/libglvnd[${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) + >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) " @@ -78,10 +74,7 @@ RDEPEND=" " QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ -PATCHES=( - "${FILESDIR}"/${PN}-440.26-locale.patch -) -NV_KV_MAX_PLUS="5.7" +NV_KV_MAX_PLUS="5.5" CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" pkg_pretend() { @@ -324,9 +317,6 @@ src_install() { insinto /etc/vulkan/icd.d doins nvidia_icd.json - - insinto /etc/vulkan/implicit_layer.d - doins nvidia_layers.json fi if use kernel_linux; then @@ -390,7 +380,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then @@ -429,11 +419,7 @@ src_install() { src_install-libs() { local inslibdir=$(get_libdir) - if use libglvnd; then - local GL_ROOT="/usr/$(get_libdir)" - else - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" - fi + local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" local nv_libdir="${NV_OBJ}" @@ -443,11 +429,18 @@ src_install-libs() { if use X; then NV_GLX_LIBRARIES=( + "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}" "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}" + "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLESv2.so.2.1.0 ${GL_ROOT}" "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLX.so.0 ${GL_ROOT}" "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLdispatch.so.0 ${GL_ROOT}" "libOpenCL.so.1.0.0 ${CL_ROOT}" + "libOpenGL.so.0 ${GL_ROOT}" "libcuda.so.${NV_SOVER}" "libnvcuvid.so.${NV_SOVER}" "libnvidia-compiler.so.${NV_SOVER}" @@ -463,22 +456,11 @@ src_install-libs() { "libnvidia-ptxjitcompiler.so.${NV_SOVER}" "libvdpau_nvidia.so.${NV_SOVER}" ) - if ! use libglvnd; then - NV_GLX_LIBRARIES+=( - "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}" - "libGL.so.1.7.0 ${GL_ROOT}" - "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" - "libGLESv2.so.2.1.0 ${GL_ROOT}" - "libGLX.so.0 ${GL_ROOT}" - "libGLdispatch.so.0 ${GL_ROOT}" - "libOpenGL.so.0 ${GL_ROOT}" - ) - fi if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( - "libnvidia-egl-wayland.so.1.1.4" + "libnvidia-egl-wayland.so.1.1.2" ) fi @@ -541,9 +523,7 @@ pkg_postinst() { use driver && use kernel_linux && linux-mod_pkg_postinst # Switch to the nvidia implementation - if ! use libglvnd; then - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia - fi + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia readme.gentoo_print_elog @@ -575,14 +555,10 @@ pkg_postinst() { } pkg_prerm() { - if ! use libglvnd; then - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 - fi + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 } pkg_postrm() { use driver && use kernel_linux && linux-mod_pkg_postrm - if ! use libglvnd; then - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 - fi + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild similarity index 98% copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild index de2d1351e1c..9155c921852 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild @@ -19,7 +19,7 @@ SRC_URI=" " EMULTILIB_PKG="true" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" @@ -78,10 +78,7 @@ RDEPEND=" " QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ -PATCHES=( - "${FILESDIR}"/${PN}-440.26-locale.patch -) -NV_KV_MAX_PLUS="5.7" +NV_KV_MAX_PLUS="5.4" CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" pkg_pretend() { @@ -324,9 +321,6 @@ src_install() { insinto /etc/vulkan/icd.d doins nvidia_icd.json - - insinto /etc/vulkan/implicit_layer.d - doins nvidia_layers.json fi if use kernel_linux; then @@ -390,7 +384,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then @@ -478,7 +472,7 @@ src_install-libs() { if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( - "libnvidia-egl-wayland.so.1.1.4" + "libnvidia-egl-wayland.so.1.1.3" ) fi diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild similarity index 98% copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild index de2d1351e1c..88ae9cd33c8 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI=" " EMULTILIB_PKG="true" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" @@ -81,7 +81,7 @@ S=${WORKDIR}/ PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch ) -NV_KV_MAX_PLUS="5.7" +NV_KV_MAX_PLUS="5.8" CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" pkg_pretend() { @@ -153,14 +153,11 @@ src_prepare() { done if use tools; then - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-fno-common.patch \ "${WORKDIR}"/nvidia-settings-linker.patch \ || die - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi @@ -390,7 +387,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild index de2d1351e1c..325a3407e3e 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild @@ -390,7 +390,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild similarity index 99% copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild index de2d1351e1c..64fbf07f8a8 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" " EMULTILIB_PKG="true" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" @@ -390,7 +390,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild similarity index 98% copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild index de2d1351e1c..010c81689c7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI=" " EMULTILIB_PKG="true" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" @@ -75,13 +75,14 @@ RDEPEND=" >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] ) + kernel_linux? ( net-libs/libtirpc ) " QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch ) -NV_KV_MAX_PLUS="5.7" +NV_KV_MAX_PLUS="5.8" CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" pkg_pretend() { @@ -153,14 +154,11 @@ src_prepare() { done if use tools; then - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-fno-common.patch \ "${WORKDIR}"/nvidia-settings-linker.patch \ || die - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi @@ -390,7 +388,7 @@ src_install() { systemd_dounit *.service dobin nvidia-sleep.sh - exeinto $(systemd_get_utildir)/system-sleep + exeinto /lib/systemd/system-sleep doexe nvidia if has_multilib_profile && use multilib; then @@ -453,7 +451,6 @@ src_install-libs() { "libnvidia-compiler.so.${NV_SOVER}" "libnvidia-eglcore.so.${NV_SOVER}" "libnvidia-encode.so.${NV_SOVER}" - "libnvidia-fatbinaryloader.so.${NV_SOVER}" "libnvidia-fbc.so.${NV_SOVER}" "libnvidia-glcore.so.${NV_SOVER}" "libnvidia-glsi.so.${NV_SOVER}" @@ -499,6 +496,7 @@ src_install-libs() { then NV_GLX_LIBRARIES+=( "libnvidia-cbl.so.${NV_SOVER}" + "libnvidia-ngx.so.${NV_SOVER}" "libnvidia-rtcore.so.${NV_SOVER}" "libnvoptix.so.${NV_SOVER}" )
