From e4261faf73346a9bd26015413a7e64094ddf552e Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 8 Aug 2022 03:32:29 +0200 Subject: [PATCH] bestsource: Add jannson wrap --- .gitignore | 1 + subprojects/jansson.wrap | 4 ++++ subprojects/packagefiles/bestsource/meson.build | 12 ++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 subprojects/jansson.wrap diff --git a/.gitignore b/.gitignore index fd239df2d..76f92ff5c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ subprojects/glib* subprojects/googletest-* subprojects/harfbuzz subprojects/icu +subprojects/jansson subprojects/libass subprojects/libffi* subprojects/libpng-* diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap new file mode 100644 index 000000000..51ff9a82b --- /dev/null +++ b/subprojects/jansson.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory = jansson +url = https://github.com/akheron/jansson.git +revision = v2.14 diff --git a/subprojects/packagefiles/bestsource/meson.build b/subprojects/packagefiles/bestsource/meson.build index 559e93a27..b4f77c93f 100644 --- a/subprojects/packagefiles/bestsource/meson.build +++ b/subprojects/packagefiles/bestsource/meson.build @@ -3,7 +3,7 @@ project('BestSource', 'cpp', meson_version: '>=0.48.0' ) -libs = [] +cmake = import('cmake') sources = [ 'src/audiosource.cpp', @@ -13,12 +13,20 @@ sources = [ ] deps = [ - dependency('jansson', version: '>= 2.7', required: true), dependency('libavcodec'), dependency('libavformat'), dependency('libavutil'), ] +jansson_dep = dependency('jansson', version: '>= 2.7', required: false) + +if jansson_dep.found() + deps += jansson_dep +else + jansson = cmake.subproject('jansson') + deps += jansson.dependency('jansson') +endif + bs_lib = static_library('bestsource', sources, dependencies: deps, gnu_symbol_visibility: 'hidden'