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 1222C1382C5 for ; Thu, 10 Dec 2020 19:53:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1827CE08A0; Thu, 10 Dec 2020 19:53:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 024ECE08A0 for ; Thu, 10 Dec 2020 19:53:43 +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 CF63A340AB2 for ; Thu, 10 Dec 2020 19:53:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7296D2CA for ; Thu, 10 Dec 2020 19:53:41 +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: <1607630016.7c338fc7b6fa1c7058cb06ca240642b33933a33b.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-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7c338fc7b6fa1c7058cb06ca240642b33933a33b X-VCS-Branch: master Date: Thu, 10 Dec 2020 19:53:41 +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: 81befb35-9e5b-4cfb-80d1-ce9b0f61e8f5 X-Archives-Hash: cc8c056680e8f9142900278e3d0c861f commit: 7c338fc7b6fa1c7058cb06ca240642b33933a33b Author: Matt Turner gentoo org> AuthorDate: Thu Dec 10 19:33:31 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Dec 10 19:53:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c338fc7 media-libs/mesa: Remove classic OSMesa support Was removed upstream in commit ee802372180a (mesa: Retire classic OSMesa.). media-libs/mesa[osmesa] now requires USE=gallium, and it is recommended to enable USE=llvm for better performance. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 2e217a5233a..5c410fcd981 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -43,6 +43,7 @@ REQUIRED_USE=" d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) + osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) @@ -316,6 +317,10 @@ pkg_pretend() { if ! use llvm; then use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi } python_check_deps() { @@ -346,6 +351,8 @@ multilib_src_configure() { local emesonargs=() if use classic; then + dri_driver_enable !gallium swrast + # Intel code dri_driver_enable video_cards_i915 i915 dri_driver_enable video_cards_i965 i965 @@ -437,6 +444,7 @@ multilib_src_configure() { gallium_enable -- kmsro fi + gallium_enable -- swrast gallium_enable video_cards_lima lima gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -481,14 +489,6 @@ multilib_src_configure() { vulkan_enable video_cards_v3d broadcom fi - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - driver_list() { local drivers="$(sort -u <<< "${1// /$'\n'}")" echo "${drivers//$'\n'/,}" @@ -503,6 +503,7 @@ multilib_src_configure() { $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) + $(meson_use osmesa) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false)