diff options
| author | Niklas Haas <git@haasn.dev> | 2022-02-03 16:14:27 +0100 |
|---|---|---|
| committer | Niklas Haas <github-daiK1o@haasn.dev> | 2022-02-03 18:22:14 +0100 |
| commit | a2b147abc6e8dbf70f6823158e61db6ac4c511e5 (patch) | |
| tree | a0e4b59014c4db828d69a17c474b59262d8d6371 | |
| parent | c25129339dc0ff57a21140b29357bdf181882fee (diff) | |
| download | mpv-a2b147abc6e8dbf70f6823158e61db6ac4c511e5.tar.bz2 mpv-a2b147abc6e8dbf70f6823158e61db6ac4c511e5.tar.xz | |
build: rename libplacebo version check
Rename from "libplacebo-v4" to "libplacebo-next" to more closely capture
the intent, since this will become libplacebo v5 eventually (tm).
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | video/out/vo.c | 2 | ||||
| -rw-r--r-- | wscript | 2 | ||||
| -rw-r--r-- | wscript_build.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 468a048eab..2312fb00f4 100644 --- a/meson.build +++ b/meson.build @@ -969,7 +969,7 @@ if jpeg.found() features += 'jpeg' endif -libplacebo_v4 = false +libplacebo_next = false libplacebo = dependency('libplacebo', version: '>=3.104.0', required: get_option('libplacebo')) if libplacebo.found() dependencies += libplacebo @@ -978,8 +978,8 @@ if libplacebo.found() 'video/out/placebo/utils.c') pl_api_ver = libplacebo.version().split('.')[1] if pl_api_ver.version_compare('>=190') - features += 'libplacebo-v4' - libplacebo_v4 = true + features += 'libplacebo-next' + libplacebo_next = true message('libplacebo v4.190+ found! Enabling vo_gpu_next.') sources += files('video/out/vo_gpu_next.c', 'video/out/gpu_next/context.c') @@ -1754,7 +1754,7 @@ conf_data.set10('HAVE_LIBARCHIVE', libarchive.found()) conf_data.set10('HAVE_LIBAVDEVICE', libavdevice.found()) conf_data.set10('HAVE_LIBDL', libdl) conf_data.set10('HAVE_LIBBLURAY', libbluray.found()) -conf_data.set10('HAVE_LIBPLACEBO_V4', libplacebo_v4) +conf_data.set10('HAVE_LIBPLACEBO_NEXT', libplacebo_next) conf_data.set10('HAVE_LINUX_FSTATFS', linux_fstatfs) conf_data.set10('HAVE_LUA', lua['use']) conf_data.set10('HAVE_MACOS_10_11_FEATURES', macos_10_11_features.allowed()) diff --git a/video/out/vo.c b/video/out/vo.c index 08d109b768..253cb6274a 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -74,7 +74,7 @@ const struct vo_driver *const video_out_drivers[] = &video_out_mediacodec_embed, #endif &video_out_gpu, -#if HAVE_LIBPLACEBO_V4 +#if HAVE_LIBPLACEBO_NEXT &video_out_gpu_next, #endif #if HAVE_VDPAU @@ -740,7 +740,7 @@ video_output_features = [ 'desc': 'libplacebo support', 'func': check_pkg_config('libplacebo >= 3.104.0'), }, { - 'name': 'libplacebo-v4', + 'name': 'libplacebo-next', 'desc': 'libplacebo v4.190+, needed for vo_gpu_next', 'deps': 'libplacebo', 'func': check_preprocessor('libplacebo/config.h', 'PL_API_VER >= 190', diff --git a/wscript_build.py b/wscript_build.py index 5ba8ce9b52..82ccebf199 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -453,7 +453,7 @@ def build(ctx): ( "video/out/gpu/utils.c" ), ( "video/out/gpu/video.c" ), ( "video/out/gpu/video_shaders.c" ), - ( "video/out/gpu_next/context.c", "libplacebo-v4" ), + ( "video/out/gpu_next/context.c", "libplacebo-next" ), ( "video/out/hwdec/hwdec_cuda.c", "cuda-interop" ), ( "video/out/hwdec/hwdec_cuda_gl.c", "cuda-interop && gl" ), ( "video/out/hwdec/hwdec_cuda_vk.c", "cuda-interop && vulkan" ), @@ -495,7 +495,7 @@ def build(ctx): ( "video/out/vo_direct3d.c", "direct3d" ), ( "video/out/vo_drm.c", "drm" ), ( "video/out/vo_gpu.c" ), - ( "video/out/vo_gpu_next.c", "libplacebo-v4" ), + ( "video/out/vo_gpu_next.c", "libplacebo-next" ), ( "video/out/vo_image.c" ), ( "video/out/vo_lavc.c" ), ( "video/out/vo_libmpv.c" ), |