git: a5ad59492834 - main - graphics/mesa-{dri,libs}: Fix vaapi for AMD

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a5ad594928348358d169ce8703788a0976d40f5d

commit a5ad594928348358d169ce8703788a0976d40f5d
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-06-16 12:41:30 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-18 13:11:54 +0000

    graphics/mesa-{dri,libs}: Fix vaapi for AMD
    
    VA bits end up being compiled into the libgallium.so giant library, which is
    shipped by mesa-libs. This means that we should make libva an unconditional
    build dep for mesa-libs. In turn this makes no sense to disable VA in mesa-dri.
    
    Luckily, libva is a pretty thin dep.
    
    Reported by:    flo
---
 graphics/mesa-dri/Makefile  | 14 ++------------
 graphics/mesa-libs/Makefile |  6 ++++--
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 451b681b283a..f12553b7541b 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -5,7 +5,8 @@ CATEGORIES=	graphics
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
+		libva>=0:multimedia/libva
 LIB_DEPENDS+=	libgallium-${MESAVERSION}.so:graphics/mesa-libs \
 		libgbm.so:graphics/mesa-libs
 
@@ -44,11 +45,7 @@ panfrost_DESC=		ARM Midgard and Bifrost
 panfrost_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
 r300_DESC=		AMD/ATI R300, R400 and R500
 r600_DESC=		AMD/ATI R600, R700, Evergreen, Northern Islands
-r600_BUILD_DEPENDS=	libva>=0:multimedia/libva
-r600_MESON_ON=		-Dgallium-va=enabled
 radeonsi_DESC=		AMD/ATI Southern Islands and newer
-radeonsi_BUILD_DEPENDS=	libva>=0:multimedia/libva
-radeonsi_MESON_ON=	-Dgallium-va=enabled
 svga_DESC=		VMWare Virtual GPU
 zink_DESC=		OpenGL on top of Khronos’ Vulkan API
 
@@ -102,9 +99,6 @@ MESA_PLATFORMS+=	wayland
 
 MESON_ARGS+=	-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
-# Vulkan Video extensions (keep in sync with mesa-gallium-va)
-MESON_ARGS+=	-Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1enc,vp9dec"
-
 # Disable some options
 MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dgles1=enabled \
@@ -116,10 +110,6 @@ MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dvalgrind=disabled
 
-.if !${PORT_OPTIONS:Mr600} && !${PORT_OPTIONS:Mradeonsi}
-MESON_ARGS+=	-Dgallium-va=disabled
-.endif
-
 .if ${ARCH} != amd64
 MESON_ARGS+=	-Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
 .endif
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 1088b8295661..a299f97f2c1a 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -14,7 +14,8 @@ BUILD_DEPENDS=	libglvnd>=0:graphics/libglvnd \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
 		spirv-tools>0:graphics/spirv-tools \
-		spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
+		spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T} \
+		libva>=0:multimedia/libva
 LIB_DEPENDS=	libdisplay-info.so:sysutils/libdisplay-info
 RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 		spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
@@ -59,8 +60,9 @@ GALLIUM_DRIVERS=	llvmpipe
 MESON_ARGS+=	-Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
 MESON_ARGS+=	-Dvulkan-drivers=""
 
+MESON_ARGS+=	-Dvideo-codecs="all"
+
 MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
-		-Dgallium-va=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dtools="" \