git: aada4209a3b0 - main - graphics/mesa-devel: apply 36049d38d71f to Vulkan with VAAPI=off

The branch main has been updated by jbeich:

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

commit aada4209a3b0264fdb8e372efb47739d8bcbf114
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-15 01:37:27 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-15 02:08:58 +0000

    graphics/mesa-devel: apply 36049d38d71f to Vulkan with VAAPI=off
    
    On Intel GPUs VA-API is implemented by libva-intel-{,media-}driver but
    Vulkan Video is implemented by Mesa. VAAPI in mesa-devel depends on
    AMD drivers which in turn brings heavy llvm* dependency, so may not be
    desirable on Intel-only or Intel+NVIDIA systems.
    
    $ ANV_VIDEO_DECODE=1 mpv --vo=gpu-next --gpu-api=vulkan --hwdec=vulkan foo.mp4
    [...]
    [ffmpeg/video] h264: Device does not support decoding h264!
    [...]
    
    $ ANV_VIDEO_DECODE=1 vulkaninfo | fgrep -i decode_h264
                                    VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR
---
 graphics/mesa-devel/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index bbffe05c49df..f88a95a460ef 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mesa
 DISTVERSION=	23.2.0-branchpoint-106
 DISTVERSIONSUFFIX=	-g27d30fe3c0e
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -45,6 +46,7 @@ MESON_ARGS=	-Dgallium-omx=disabled \
 		-Dvalgrind=disabled \
 		-Dglvnd=true \
 		-Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \
+		-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
 		${NULL}
 PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
@@ -129,7 +131,6 @@ OPENCL_IMPLIES=		LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIO
 VAAPI_DESC=		Hardware encoding/decoding (only r600, radeonsi)
 VAAPI_BUILD_DEPENDS=	libva>0:multimedia/libva
 VAAPI_MESON_ENABLED=	gallium-va
-VAAPI_MESON_ON=		-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc
 
 VDPAU_DESC=		Hardware decoding (only r600, radeonsi) (implies X11)
 VDPAU_BUILD_DEPENDS=	libvdpau>0:multimedia/libvdpau