git: fbaf96a60fd0 - main - multimedia/mpv: backport VULKAN+VAAPI fix for Intel

[Jan Beich]

The branch main has been updated by jbeich:

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

commit fbaf96a60fd0a9d08614a58a3be3344768c78eeb
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-06-12 19:31:46 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-06-12 20:23:00 +0000

    multimedia/mpv: backport VULKAN+VAAPI fix for Intel
    
    Regressed by cc87022694a6 update but the fix only helps mesa-devel.
    
    $ mpv --hwdec=vaapi --gpu-api=vulkan /path/to/file
    [...]
    [vo/gpu/vulkan/libplacebo] vk->CreateImage(vk->dev, &iinfo, PL_VK_ALLOC, &tex_vk->img): VK_ERROR_OUT_OF_DEVICE_MEMORY (../src/vulkan/gpu.c:1185)
    [vo/gpu/vulkan/libplacebo] vk->CreateImage(vk->dev, &iinfo, PL_VK_ALLOC, &tex_vk->img): VK_ERROR_OUT_OF_DEVICE_MEMORY (../src/vulkan/gpu.c:1185)
    [vo/gpu/vulkan/libplacebo] vk->CreateImage(vk->dev, &iinfo, PL_VK_ALLOC, &tex_vk->img): VK_ERROR_OUT_OF_DEVICE_MEMORY (../src/vulkan/gpu.c:1185)
    [vo/gpu/vulkan/libplacebo] vk->CreateImage(vk->dev, &iinfo, PL_VK_ALLOC, &tex_vk->img): VK_ERROR_OUT_OF_DEVICE_MEMORY (../src/vulkan/gpu.c:1185)
    Using hardware decoding (vaapi).
    VO: [gpu] 1920x1080 vaapi[nv12]
    [vo/gpu/vaapi-egl] unsupported VA image format nv12
    [vo/gpu] Initializing texture for hardware decoding failed.
    [...]
---
 multimedia/mpv/Makefile | 3 ++-
 multimedia/mpv/distinfo | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index db11b1dffff5..f30c7067b073 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.33.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
@@ -13,6 +13,7 @@ PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	1bb2665e3d09.patch:-p1 59c32a04b04d.patch:-p1 62fb374349e0.patch:-p1
 PATCHFILES+=	24525e4ef9ba.patch:-p1 4dd5fdc0876e.patch:-p1 4d80314c5c88.patch:-p1
 PATCHFILES+=	1b2e5137e04b.patch:-p1 # https://github.com/mpv-player/mpv/pull/8312
+PATCHFILES+=	968faef86723.patch:-p1 # libplacebo 3.104
 PATCHFILES+=	7c4465cefb27.patch:-p1 # libplacebo 3.104
 
 MAINTAINER=	multimedia at FreeBSD.org
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 58dbfb7fabb2..a255b319bd94 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -17,5 +17,7 @@ SHA256 (4d80314c5c88.patch) = 86413d684bac8c5b04e62f9030a458cc028a261178e7a02985
 SIZE (4d80314c5c88.patch) = 4265
 SHA256 (1b2e5137e04b.patch) = 4620272f66ee82c396ffbc6fde67de3ced99a75829671bd2d49c9a56924f1514
 SIZE (1b2e5137e04b.patch) = 15404
+SHA256 (968faef86723.patch) = 21a052c67d36c2e9d30f9ab9714cde6284c46efd7397a1440ad19becc6aa5b20
+SIZE (968faef86723.patch) = 1176
 SHA256 (7c4465cefb27.patch) = a9f656a163e17a33050ea3ffe51203b948168437c87038239fc3a2424927b35a
 SIZE (7c4465cefb27.patch) = 3551