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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B749E1581E7 for ; Thu, 25 Apr 2024 16:10:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 101C4E29F5; Thu, 25 Apr 2024 16:10:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51568E29F6 for ; Thu, 25 Apr 2024 16:10:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 526213430FF for ; Thu, 25 Apr 2024 16:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89D451759 for ; Thu, 25 Apr 2024 16:10:14 +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: <1714060978.847bd6034a9b3d885de3419a53084595bef9e8ac.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: 847bd6034a9b3d885de3419a53084595bef9e8ac X-VCS-Branch: master Date: Thu, 25 Apr 2024 16:10:14 +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: 89f4b19b-22b3-484e-8dd7-f031e5d9fc75 X-Archives-Hash: b9cd68774942fecc1a746f0372dddbfe commit: 847bd6034a9b3d885de3419a53084595bef9e8ac Author: Matt Turner gentoo org> AuthorDate: Thu Apr 25 15:27:43 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 25 16:02:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847bd603 media-libs/mesa: Control GL ES support via IUSE=opengl Disabling GL ES support saves only a trivial amount of disk space and makes relying on GL ES availability difficult. Bug: https://bugs.gentoo.org/929992 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index dc8e65478508..a25510a044f3 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -34,7 +34,7 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm + cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd" @@ -57,8 +57,7 @@ REQUIRED_USE=" video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) vdpau? ( X ) xa? ( X ) - X? ( gles1? ( opengl ) gles2? ( opengl ) ) - zink? ( vulkan || ( opengl gles1 gles2 ) ) + zink? ( opengl vulkan ) " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119" @@ -349,20 +348,6 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use opengl || use gles1 || use gles2; then - emesonargs+=( - -Degl=enabled - -Dgbm=enabled - -Dglvnd=true - ) - else - emesonargs+=( - -Degl=disabled - -Dgbm=disabled - -Dglvnd=false - ) - fi - if use opengl && use X; then emesonargs+=(-Dglx=dri) else @@ -377,8 +362,11 @@ multilib_src_configure() { -Ddri3=enabled -Dexpat=enabled $(meson_use opengl) - $(meson_feature gles1) - $(meson_feature gles2) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) $(meson_feature llvm) $(meson_feature lm-sensors lmsensors) $(meson_use osmesa)