jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

meson: remove subprojects

Browse Source 
Change-Id: I384328c002aa1dc495e29dfa16ada3044cdeda28
This commit is contained in:
Vladimir Stoiakin
2022-09-06 11:15:21 +03:00
parent 673dc5f525
commit 8145803524
6 changed files with 7 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meson.build
View File

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

2
meson_options.txt
View File

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

10
subprojects/jsoncpp.wrap
View File

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

6
subprojects/libarchive.wrap
View File

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

6
subprojects/yaml-cpp.wrap
View File

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

10
subprojects/zlib.wrap
View File

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