summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2023-05-29 14:38:00 -0700
committerPhilip Langdale <philipl@overt.org>2023-05-29 14:39:22 -0700
commit0f37d72360a7d0e58100a6ecdfe7de165b8a8745 (patch)
tree98ee1c59474316c2e84e46550c63d9dbfb2bc567
parent0d1b96c233b6ae88725d15a005a9b801595c2510 (diff)
downloadmpv-0f37d72360a7d0e58100a6ecdfe7de165b8a8745.tar.bz2
mpv-0f37d72360a7d0e58100a6ecdfe7de165b8a8745.tar.xz
hwdec_vulkan: check for the correct libplacebo version
It's 6.278, rather than 5.278.
-rw-r--r--meson.build4
-rw-r--r--wscript4
2 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 812f97cc98..91b44f52bc 100644
--- a/meson.build
+++ b/meson.build
@@ -1311,9 +1311,9 @@ endif
vulkan_interop = get_option('vulkan-interop').require(
features['vulkan'] and vulkan.version().version_compare('>=1.3.238') and
- features['libplacebo'] and libplacebo.version().version_compare('>=5.278.0') and
+ features['libplacebo'] and libplacebo.version().version_compare('>=6.278.0') and
libavutil.version().version_compare('>=58.11.100'),
- error_message: 'Vulkan Interop requires vulkan headers >= 1.3.238, libplacebo >= 5.278.0, and libavutil >= 58.11.100',
+ error_message: 'Vulkan Interop requires vulkan headers >= 1.3.238, libplacebo >= 6.278.0, and libavutil >= 58.11.100',
)
features += {'vulkan-interop': vulkan_interop.allowed()}
if vulkan_interop.allowed()
diff --git a/wscript b/wscript
index 8ee61e0d7b..1435443b71 100644
--- a/wscript
+++ b/wscript
@@ -799,9 +799,9 @@ video_output_features = [
use='libplacebo'),
}, {
'name': 'libplacebo-decode',
- 'desc': 'libplacebo v5.275.0+, needed for Vulkan video decode',
+ 'desc': 'libplacebo v6.278.0+, needed for Vulkan video decode',
'deps': 'libplacebo',
- 'func': check_preprocessor('libplacebo/config.h', 'PL_API_VER >= 275',
+ 'func': check_preprocessor('libplacebo/config.h', 'PL_API_VER >= 278',
use='libplacebo'),
}, {
'name': '--vulkan',