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 4A4E5158086 for ; Sun, 5 Dec 2021 21:54:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 972C2E07D0; Sun, 5 Dec 2021 21:54:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 40F72E07D0 for ; Sun, 5 Dec 2021 21:54:03 +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 39A333434A4 for ; Sun, 5 Dec 2021 21:54:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB5251D8 for ; Sun, 5 Dec 2021 21:54:00 +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: <1638741230.04c32f5c2e8ad380ee20055fb8cf5e31c94864c4.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: 04c32f5c2e8ad380ee20055fb8cf5e31c94864c4 X-VCS-Branch: master Date: Sun, 5 Dec 2021 21:54:00 +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: b88f62d8-2fba-4f5a-b6c0-44d2cc8e24ca X-Archives-Hash: 1faa0d8d7c4c885f3a39f6c119064e99 commit: 04c32f5c2e8ad380ee20055fb8cf5e31c94864c4 Author: Matt Turner gentoo org> AuthorDate: Fri Nov 19 07:31:02 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Dec 5 21:53:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c32f5c media-libs/mesa: Condense Intel VIDEO_CARDS options VIDEO_CARDS has grown out of control in recent years, and the options don't really make sense outside of a single package. For example, VIDEO_CARDS=iris makes sense for Mesa, because it enables the Gen8+ Gallium OpenGL driver named Iris. VIDEO_CARDS=i965 makes sense as well because it enables the Gen4-Gen11 classic OpenGL driver named i965. But how these VIDEO_CARDS settings should extend to other packages was never clearly defined. Until commit 564e4e3d1b14 ("x11-libs/libva: use optfeatures instead of VIDEO_CARDS") pulled in drivers depending on the VIDEO_CARD setting, but x11-libs/libva-intel-driver and x11-libs/libva-intel-media-driver support only partially overlapping sets of hardware, and neither correspond well to "i965" or "iris". In truth, this level of flexibility (for example, the ability to build only i965 but not the older i915, or iris but not crocus) isn't worth the hassle and confusion it causes users. The insane marketing names of GPUs also doesn't make the situation any clearer. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 55e813f0fde1..f5d8fe0c106d 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -27,7 +27,7 @@ RESTRICT=" " RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done @@ -38,7 +38,7 @@ IUSE="${IUSE_VIDEO_CARDS} vulkan-overlay wayland +X xa xvmc zink +zstd" REQUIRED_USE=" - d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) @@ -81,9 +81,7 @@ RDEPEND=" wayland? ( >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - video_cards_intel? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] @@ -228,10 +226,10 @@ llvm_check_deps() { pkg_pretend() { if use vulkan; then if ! use video_cards_freedreno && - ! use video_cards_iris && + ! use video_cards_intel && ! use video_cards_radeonsi && ! use video_cards_v3d; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, iris, radeonsi, or v3d" + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d" fi fi @@ -294,7 +292,7 @@ pkg_setup() { ewarn "detected! This can cause problems. For details, see bug 459306." fi - if use video_cards_iris || + if use video_cards_intel || use video_cards_radeonsi; then if kernel_is -ge 5 11 3; then CONFIG_CHECK="~KCMP" @@ -322,7 +320,7 @@ multilib_src_configure() { use wayland && platforms+=",wayland" emesonargs+=(-Dplatforms=${platforms#,}) - if use video_cards_iris || + if use video_cards_intel || use video_cards_r300 || use video_cards_r600 || use video_cards_radeonsi || @@ -376,10 +374,8 @@ multilib_src_configure() { fi gallium_enable -- swrast - gallium_enable video_cards_crocus crocus gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_iris iris + gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_panfrost panfrost @@ -405,7 +401,7 @@ multilib_src_configure() { if use vulkan; then vulkan_enable video_cards_freedreno freedreno - vulkan_enable video_cards_iris intel + vulkan_enable video_cards_intel intel vulkan_enable video_cards_radeonsi amd vulkan_enable video_cards_v3d broadcom fi