From owner-dev-commits-ports-all@freebsd.org Sat Jun 12 20:24:32 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2AEB46508C8; Sat, 12 Jun 2021 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G2Thc0jrMz3q7y; Sat, 12 Jun 2021 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAA04149AC; Sat, 12 Jun 2021 20:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15CKOV3C029154; Sat, 12 Jun 2021 20:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15CKOV3A029153; Sat, 12 Jun 2021 20:24:31 GMT (envelope-from git) Date: Sat, 12 Jun 2021 20:24:31 GMT Message-Id: <202106122024.15CKOV3A029153@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 039c0c283e0f - 2021Q2 - multimedia/mpv: backport VULKAN+VAAPI fix for Intel MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 039c0c283e0fff535cb6662f0c1c6041111bdb80 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2021 20:24:32 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=039c0c283e0fff535cb6662f0c1c6041111bdb80 commit 039c0c283e0fff535cb6662f0c1c6041111bdb80 Author: Jan Beich AuthorDate: 2021-06-12 19:31:46 +0000 Commit: Jan Beich CommitDate: 2021-06-12 20:23:57 +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. [...] (cherry picked from commit fbaf96a60fd0a9d08614a58a3be3344768c78eeb) --- multimedia/mpv/Makefile | 2 ++ multimedia/mpv/distinfo | 2 ++ 2 files changed, 4 insertions(+) diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 0a89e61c5cb2..4d393a6a0b3d 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -3,6 +3,7 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.33.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf @@ -12,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@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