From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56AA0138359 for ; Wed, 26 Aug 2020 05:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F424E0882; Wed, 26 Aug 2020 05:32:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB835E0882 for ; Wed, 26 Aug 2020 05:32:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4C5733BF0B for ; Wed, 26 Aug 2020 05:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64267324 for ; Wed, 26 Aug 2020 05:32:20 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1598419931.4b39ac5d997c6201aa3f3441f3a3dab040b9c281.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-390.conf x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/files/ x11-drivers/nvidia-drivers/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 4b39ac5d997c6201aa3f3441f3a3dab040b9c281 X-VCS-Branch: master Date: Wed, 26 Aug 2020 05:32:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cc8de1cd-0b25-4387-8cdb-160979b48479 X-Archives-Hash: e01c88482a453bbed07d58759651806a commit: 4b39ac5d997c6201aa3f3441f3a3dab040b9c281 Author: Matt Turner gentoo org> AuthorDate: Wed Aug 26 05:31:05 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Aug 26 05:32:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b39ac5d x11-drivers/nvidia-drivers: Fix libdir Thanks to Ionen Wolkens for noticing the mistake. Bug: https://bugs.gentoo.org/show_bug.cgi?id=713546 Signed-off-by: Matt Turner gentoo.org> x11-drivers/nvidia-drivers/files/nvidia-390.conf | 2 +- ...ia-drivers-390.138-r2.ebuild => nvidia-drivers-390.138-r3.ebuild} | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-390.conf index 81dbfc45786..55c7cc4a539 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-390.conf +++ b/x11-drivers/nvidia-drivers/files/nvidia-390.conf @@ -3,5 +3,5 @@ Section "OutputClass" MatchDriver "nvidia-drm" Driver "nvidia" Option "AllowEmptyInitialConfiguration" - ModulePath "/usr/lib/nvidia/xorg" + ModulePath "/usr/%LIBDIR%/nvidia/xorg" EndSection diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild similarity index 99% rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild index 7505e7d936a..c5edfd1bb9a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild @@ -176,6 +176,9 @@ src_prepare() { cp nvidia_icd.json.template nvidia_icd.json || die sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die fi + + sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/nvidia-390.conf" \ + > "${T}/nvidia-390.conf" || die } src_compile() { @@ -345,7 +348,7 @@ src_install() { doins nvidia_icd.json insinto /etc/X11/xorg.conf.d - doins "${FILESDIR}"/nvidia-390.conf + doins ${T}/nvidia-390.conf fi if use kernel_linux; then