From d2b3fb381bdd329f0cb0eea8ae9e8eade07abf8c Mon Sep 17 00:00:00 2001 From: Boyuan Zhang Date: Wed, 28 Feb 2024 13:52:35 -0500 Subject: [PATCH] meson: bump the minimal required vdpau version to 1.4 VDP_YCBCR_FORMAT_P010 and VDP_YCBCR_FORMAT_P016 require ver 1.4 or above Fixes: c3ceec6cd8533a5a5f3c ("vdpau: Refactor query for video surface formats.") Cc: mesa-stable Signed-off-by: Boyuan Zhang Reviewed-by: Leo Liu Part-of: (cherry picked from commit 74f63925450aedb3a32b03f7272549c961fd8539) --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 18d11b17c15..79271b9a5d0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4054,7 +4054,7 @@ "description": "meson: bump the minimal required vdpau version to 1.4", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c3ceec6cd8533a5a5f3ccaf687308dee2f097a99", "notes": null diff --git a/meson.build b/meson.build index 133fd9a8ca3..5c91048a3f1 100644 --- a/meson.build +++ b/meson.build @@ -603,7 +603,7 @@ vdpau = get_option('gallium-vdpau') \ .require(with_platform_x11, error_message : 'VDPAU state tracker requires X11 support.') \ .require(_vdpau_drivers.contains(true), error_message : 'VDPAU state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video, virgl).') -dep_vdpau = dependency('vdpau', version : '>= 1.1', required : vdpau) +dep_vdpau = dependency('vdpau', version : '>= 1.4', required : vdpau) if dep_vdpau.found() dep_vdpau = dep_vdpau.partial_dependency(compile_args : true) pre_args += '-DHAVE_ST_VDPAU'