Move OMEMO, OpenPGP and RTP plugins into main/libdino

1 files changed, 14 insertions, 11 deletions

diff --git a/meson.build b/meson.build
index 7752f7d0..205553e9 100644
--- a/meson.build
+++ b/meson.build
@@ -69,11 +69,11 @@ if get_option('crypto-backend') == 'auto'
         endif
     endif
 elif get_option('crypto-backend') == 'openssl'
-    dep_openssl = dependency('openssl', required: true)
+    dep_openssl = dependency('openssl')
     crypto_backend = 'openssl'
 elif get_option('crypto-backend') == 'gnu'
-    dep_libgcrypt = dependency('libgcrypt', required: true)
-    dep_gnutls = dependency('gnutls', required: get_option('plugin-ice'))
+    dep_libgcrypt = dependency('libgcrypt')
+    dep_gnutls = dependency('gnutls')
     crypto_backend = 'gnu'
 endif
 
@@ -82,19 +82,19 @@ dep_gee = dependency('gee-0.8')
 dep_gio = dependency('gio-2.0')
 dep_glib = dependency('glib-2.0', version: '>=2.66')
 dep_gmodule = dependency('gmodule-2.0')
-dep_gpgme = dependency('gpgme', disabler: true, required: get_option('plugin-openpgp'))
-dep_gstreamer = dependency('gstreamer-1.0', version: '>=1.20')
-dep_gstreamer_app = dependency('gstreamer-app-1.0', version: '>=1.20')
-dep_gstreamer_audio = dependency('gstreamer-audio-1.0', version: '>=1.20')
-dep_gstreamer_rtp = dependency('gstreamer-rtp-1.0', version: '>=1.20')
-dep_gstreamer_video = dependency('gstreamer-video-1.0', version: '>=1.20')
+dep_gpgme = dependency('gpgme', disabler: true, required: get_option('openpgp'))
+dep_gstreamer = dependency('gstreamer-1.0', version: '>=1.20', required: get_option('rtp'))
+dep_gstreamer_app = dependency('gstreamer-app-1.0', version: '>=1.20', required: get_option('rtp'))
+dep_gstreamer_audio = dependency('gstreamer-audio-1.0', version: '>=1.20', required: get_option('rtp'))
+dep_gstreamer_rtp = dependency('gstreamer-rtp-1.0', version: '>=1.20', required: get_option('rtp'))
+dep_gstreamer_video = dependency('gstreamer-video-1.0', version: '>=1.20', required: get_option('rtp'))
 dep_gtk4 = dependency('gtk4', version: '>=4.14')
 dep_icu_uc = dependency('icu-uc')
 dep_libadwaita = dependency('libadwaita-1', version: '>=1.5')
 dep_libcanberra = dependency('libcanberra', disabler: true, required: get_option('plugin-notification-sound'))
-dep_libqrencode = dependency('libqrencode', disabler: true, required: get_option('plugin-omemo'))
+dep_libqrencode = dependency('libqrencode', disabler: true, required: get_option('omemo'))
 dep_libsrtp2 = dependency('libsrtp2')
-dep_libomemo_c = dependency('libomemo-c', disabler: true, required: get_option('plugin-omemo'))
+dep_libomemo_c = dependency('libomemo-c', disabler: true, required: get_option('omemo'))
 dep_libsoup = dependency('libsoup-3.0')
 dep_nice = dependency('nice', version: '>=0.1.15')
 dep_m = meson.get_compiler('c').find_library('m', required: false)
@@ -107,6 +107,9 @@ endif
 if not dep_webrtc_audio_processing.found()
     dep_webrtc_audio_processing = dependency('webrtc-audio-processing-2', required: false, disabler: true)
 endif
+if not dep_webrtc_audio_processing.found() and get_option('voice-processing').enabled()
+    error('No compatible webrtc-audio-processing found, but voice-processing option set to enabled.')
+endif
 
 default_install_rpath = ''
 if get_option('set-install-rpath')