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 25B1E138350 for ; Wed, 29 Apr 2020 17:37:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18010E0826; Wed, 29 Apr 2020 17:37:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 F1740E0826 for ; Wed, 29 Apr 2020 17:37:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 067DC34EEF5 for ; Wed, 29 Apr 2020 17:37:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0E401EE for ; Wed, 29 Apr 2020 17:37:33 +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: <1588181845.5c1b8b4038ee152e30de111ee673fc1ee57b245a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-20.0.5.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5c1b8b4038ee152e30de111ee673fc1ee57b245a X-VCS-Branch: master Date: Wed, 29 Apr 2020 17:37:33 +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: 6f1c1adf-90e4-493f-9104-c7a83bfc0cc3 X-Archives-Hash: 77d551e3d0c73cb3ee4ef7960ae1c2e4 commit: 5c1b8b4038ee152e30de111ee673fc1ee57b245a Author: Matt Turner gentoo org> AuthorDate: Wed Apr 29 17:35:51 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Apr 29 17:37:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1b8b40 media-libs/mesa: Replace vulkan REQUIRED_USE with pkg_pretend() Ignore USE=vulkan if no supported VIDEO_CARDS are set, like we do with other USE flags. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-20.0.5.ebuild | 9 ++++++++- media-libs/mesa/mesa-9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-20.0.5.ebuild b/media-libs/mesa/mesa-20.0.5.ebuild index 85944a36141..0bd61593e8d 100644 --- a/media-libs/mesa/mesa-20.0.5.ebuild +++ b/media-libs/mesa/mesa-20.0.5.ebuild @@ -44,7 +44,6 @@ REQUIRED_USE=" gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 - || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) @@ -260,6 +259,14 @@ llvm_check_deps() { } pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" + fi + fi + if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 59a1d4fc57c..800cbffbe70 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -44,7 +44,6 @@ REQUIRED_USE=" gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 - || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) @@ -261,6 +260,14 @@ llvm_check_deps() { } pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" + fi + fi + if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then