RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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).
This commit is contained in:
Niklas Haas 2022-02-03 16:14:27 +01:00 committed by Niklas Haas
parent c25129339d
commit a2b147abc6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -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())

2
video/out/vo.c
View File

@ -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

2
wscript
View File

@ -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',

4
wscript_build.py
View File

@ -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" ),