From 8145803524da4e1c24dbebc1a0bf9475127c78bd Mon Sep 17 00:00:00 2001 From: Vladimir Stoiakin Date: Tue, 6 Sep 2022 11:15:21 +0300 Subject: [PATCH] meson: remove subprojects Change-Id: I384328c002aa1dc495e29dfa16ada3044cdeda28 --- meson.build | 33 +++++---------------------------- meson_options.txt | 2 ++ subprojects/jsoncpp.wrap | 10 ---------- subprojects/libarchive.wrap | 6 ------ subprojects/yaml-cpp.wrap | 6 ------ subprojects/zlib.wrap | 10 ---------- 6 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 subprojects/jsoncpp.wrap delete mode 100644 subprojects/libarchive.wrap delete mode 100644 subprojects/yaml-cpp.wrap delete mode 100644 subprojects/zlib.wrap diff --git a/meson.build b/meson.build index c985592f2..65f560514 100644 --- a/meson.build +++ b/meson.build @@ -30,22 +30,9 @@ deplibswscale = dependency('libswscale', version: '>= 3.1.101') deplibswresample = dependency('libswresample', version: '>= 1.2.101') deplibavutil = dependency('libavutil', version: '>= 55.75.100') depfmt = dependency('fmt', version: '>= 5.3') - -depyamlcpp = dependency('yaml-cpp', version: '>= 0.5.1', required: false) -if not depyamlcpp.found() - depyamlcpp = modcmake.subproject('yaml-cpp', cmake_options: [ - '-DCMAKE_BUILD_TYPE=Release', - '-DCMAKE_POSITION_INDEPENDENT_CODE=ON', - '-DYAML_CPP_BUILD_TOOLS=OFF', - '-DYAML_CPP_BUILD_TESTS=OFF', - '-DYAML_CPP_BUILD_CONTRIB=OFF', - '-DBUILD_SHARED_LIBS=OFF' - ]).dependency('yaml-cpp') -endif - -depjsoncpp = dependency('jsoncpp', version: '>= 1.6.5', - fallback: ['jsoncpp', 'jsoncpp_dep'], default_options: ['default_library=static']) -depzlib = dependency('zlib', fallback: ['zlib', 'zlib_dep'], default_options: ['default_library=static']) +depyamlcpp = dependency('yaml-cpp', version: '>= 0.5.1') +depjsoncpp = dependency('jsoncpp', version: '>= 1.6.5') +depzlib = dependency('zlib') if get_option('interfaces').contains('dbus') depdbuscpp = dependency('dbus-c++-1') @@ -139,18 +126,7 @@ if get_option('plugins') if host_machine.system() == 'darwin' depminizip = dependency('minizip', version: '>= 3.0.0') else - deplibarchive = dependency('libarchive', version: '>= 3.4.0', required: false) - if not deplibarchive.found() - deplibarchive = modcmake.subproject('libarchive', cmake_options: [ - '-DCMAKE_BUILD_TYPE=Release', - '-DCMAKE_POSITION_INDEPENDENT_CODE=ON', - '-DENABLE_TEST=OFF', - '-DENABLE_TAR=OFF', - '-DENABLE_CPIO=OFF', - '-DENABLE_CAT=OFF', - '-DENABLE_LIBXML2=OFF' - ]).dependency('archive_static') - endif + deplibarchive = dependency('libarchive', version: '>= 3.4.0') endif depdl = meson.get_compiler('cpp').find_library('dl', required: false) else @@ -166,6 +142,7 @@ endif conf.set10('HAVE_COREAUDIO', host_machine.system() == 'darwin') conf.set('ENABLE_SHM', get_option('interfaces').contains('dbus')) + configure_file( output: 'config.h', configuration: conf diff --git a/meson_options.txt b/meson_options.txt index aaf6a55c8..d274aed98 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,6 +11,8 @@ option('jack', type: 'feature', value: 'auto', description: 'Enable support for option('portaudio', type: 'feature', value: 'auto', description: 'Enable support for PortAudio') option('upnp', type: 'feature', value: 'auto', description: 'Enable support for UPnP') option('natpmp', type: 'feature', value: 'auto', description: 'Enable support for NAT-PMP') + +# https://docs.jami.net/user/faq.html#how-can-i-configure-the-audio-processor option('webrtc_ap', type: 'feature', value: 'auto', description: 'Enable support for WebRTC audio processing') option('speex_ap', type: 'feature', value: 'auto', description: 'Enable support for Speex audio processing') diff --git a/subprojects/jsoncpp.wrap b/subprojects/jsoncpp.wrap deleted file mode 100644 index 6ecb2d1ce..000000000 --- a/subprojects/jsoncpp.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = jsoncpp-1.8.4 - -source_url = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -source_filename = jsoncpp-1.8.4.tar.gz -source_hash = c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/jsoncpp/1.8.4/1/get_zip -patch_filename = jsoncpp-1.8.4-1-wrap.zip -patch_hash = 4503fcbfd31ee903a6bcfc898fdb4be1ebc3e2a71add8f24eecbd390dcf386a9 diff --git a/subprojects/libarchive.wrap b/subprojects/libarchive.wrap deleted file mode 100644 index 24898ce13..000000000 --- a/subprojects/libarchive.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = libarchive-3.4.3 - -source_url = https://github.com/libarchive/libarchive/releases/download/v3.4.3/libarchive-3.4.3.tar.gz -source_filename = libarchive-3.4.3.tar.gz -source_hash = ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39 diff --git a/subprojects/yaml-cpp.wrap b/subprojects/yaml-cpp.wrap deleted file mode 100644 index c7db8e8bf..000000000 --- a/subprojects/yaml-cpp.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = yaml-cpp-yaml-cpp-0.6.3 - -source_url = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz -source_filename = yaml-cpp-yaml-cpp-0.6.3.tar.gz -source_hash = 77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap deleted file mode 100644 index 91c1d4d99..000000000 --- a/subprojects/zlib.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = zlib-1.2.11 - -source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz -source_filename = zlib-1.2.11.tar.gz -source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/4/get_zip -patch_filename = zlib-1.2.11-4-wrap.zip -patch_hash = f733976fbfc59e0bcde01aa9469a24eeb16faf0a4280b17e9eaa60a301d75657