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 8AEDF138334 for ; Sat, 10 Nov 2018 18:47:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53E4CE0C7D; Sat, 10 Nov 2018 18:47:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 17F8AE0C7D for ; Sat, 10 Nov 2018 18:47:12 +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 CEC29335CA6 for ; Sat, 10 Nov 2018 18:47:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 071453DB for ; Sat, 10 Nov 2018 18:47:09 +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: <1541875616.4d352ccbca4ba4e136efdee4ac5962724ee6294c.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-18.2.4.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: 4d352ccbca4ba4e136efdee4ac5962724ee6294c X-VCS-Branch: master Date: Sat, 10 Nov 2018 18:47:09 +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-Archives-Salt: c07f14dd-64b8-4346-a3e1-c6f32310f463 X-Archives-Hash: f13d4aa508aacdd44e23b48d2373804a commit: 4d352ccbca4ba4e136efdee4ac5962724ee6294c Author: Matt Turner gentoo org> AuthorDate: Sat Nov 10 18:33:36 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Nov 10 18:46:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d352ccb media-libs/mesa: Add REQUIRED_USE For USE=d3d9 The new Meson build requires a suitable driver to be enabled, and ignoring the d3d9 USE flag isn't safe since WINE has a dependency on mesa[d3d9]. Closes: https://bugs.gentoo.org/670737 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-18.2.4.ebuild | 13 +------------ media-libs/mesa/mesa-9999.ebuild | 13 +------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/media-libs/mesa/mesa-18.2.4.ebuild b/media-libs/mesa/mesa-18.2.4.ebuild index 013ed5b1e1f..661f4153d49 100644 --- a/media-libs/mesa/mesa-18.2.4.ebuild +++ b/media-libs/mesa/mesa-18.2.4.ebuild @@ -41,7 +41,7 @@ IUSE="${IUSE_VIDEO_CARDS} vulkan wayland xa xvmc" REQUIRED_USE=" - d3d9? ( dri3 ) + d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 @@ -250,16 +250,6 @@ llvm_check_deps() { } pkg_pretend() { - if use d3d9; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware" - fi - fi - if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then @@ -300,7 +290,6 @@ pkg_pretend() { fi if ! use gallium; then - use d3d9 && ewarn "Ignoring USE=d3d9 since USE does not contain gallium" use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium" use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 23f29b41b35..46f8ece8fa1 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -41,7 +41,7 @@ IUSE="${IUSE_VIDEO_CARDS} vulkan wayland xa xvmc" REQUIRED_USE=" - d3d9? ( dri3 ) + d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 @@ -245,16 +245,6 @@ llvm_check_deps() { } pkg_pretend() { - if use d3d9; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware" - fi - fi - if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then @@ -295,7 +285,6 @@ pkg_pretend() { fi if ! use gallium; then - use d3d9 && ewarn "Ignoring USE=d3d9 since USE does not contain gallium" use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium" use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"