Skip to content

Commit

Permalink
meson: Support system-provided vapoursynth
Browse files Browse the repository at this point in the history
Meson unconditionally uses headers from the wrapped vapoursynth
subproject when the vapoursynth option is enabled. Update meson.build
to support using system-provided vapoursynth headers.
  • Loading branch information
al3xtjames committed Nov 29, 2024
1 parent f03bcab commit 8691915
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,13 @@ endif

if get_option('vapoursynth').enabled()
conf.set('WITH_VAPOURSYNTH', 1)
vs_sub = subproject('vapoursynth')
deps_inc += vs_sub.get_variable('vs_inc')
vs_dep = dependency('vapoursynth', required: false)
if vs_dep.found()
deps_inc += vs_dep.get_variable('includedir')
else
vs_sub = subproject('vapoursynth')
deps_inc += vs_sub.get_variable('vs_inc')
endif
dep_avail += 'VapourSynth'
endif

Expand Down

0 comments on commit 8691915

Please sign in to comment.