commit: 1eec3925d3ac045ca50ed3898d4f58f70daacb98
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 21 03:48:09 2025 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 21 21:55:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eec3925
media-libs/mesa: Readd VIDEO_CARDS=i915 and require LLVM
I'm loathe to readd VIDEO_CARDS=i915, but upstream commit b8b38d38b1c
("meson: reinstate LLVM requirement for r300 and enforce it for i915
too") causes LLVM to be required if i915 is enabled, and I would like to
allow the common case of VIDEO_CARDS=intel USE=-llvm to continue
working.
i915 hardware is now 20 years old, so I expect it's exceptionally
uncommon these days.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/mesa/mesa-9999.ebuild | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a20e0214a620..14c43f0d6207 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -54,8 +54,8 @@ LICENSE="MIT SGI-B-2.0"
SLOT="0"
VIDEO_CARDS="
- asahi d3d12 freedreno imagination intel lavapipe lima nouveau nvk
panfrost
- r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
+ asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
+ panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -68,6 +68,7 @@ IUSE="${IUSE_VIDEO_CARDS}
RESTRICT="!test? ( test )"
REQUIRED_USE="
llvm? ( ${LLVM_REQUIRED_USE} )
+ video_cards_i915? ( llvm )
video_cards_lavapipe? ( llvm vulkan )
video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -77,6 +78,7 @@ REQUIRED_USE="
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
RDEPEND="
+ ${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -107,6 +109,9 @@ RDEPEND="
vaapi? (
>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
)
+ video_cards_i915? (
+ ${LIBDRM_DEPSTRING}[video_cards_intel]
+ )
video_cards_radeonsi? (
${LIBDRM_DEPSTRING}[video_cards_amdgpu]
virtual/libelf:0=[${MULTILIB_USEDEP}]
@@ -117,7 +122,6 @@ RDEPEND="
virtual/libudev:=
)
wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_intel?,${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
@@ -304,7 +308,8 @@ multilib_src_configure() {
gallium_enable video_cards_asahi asahi
gallium_enable video_cards_d3d12 d3d12
gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_intel crocus i915 iris
+ gallium_enable video_cards_i915 i915
+ gallium_enable video_cards_intel crocus iris
gallium_enable video_cards_lima lima
gallium_enable video_cards_nouveau nouveau
gallium_enable video_cards_panfrost panfrost
