rtp plugin doesn't depend on GnuTLS
This commit is contained in:
parent
86b101900c
commit
e93e14b12c
10
meson.build
10
meson.build
|
@ -17,19 +17,11 @@ foreach plugin : ['plugin-ice', 'plugin-omemo', 'plugin-rtp']
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
if get_option('plugin-ice').enabled() and not get_option('plugin-rtp').enabled()
|
|
||||||
dep_gnutls_required = get_option('plugin-ice')
|
|
||||||
elif get_option('plugin-ice').allowed() and not get_option('plugin-rtp').allowed()
|
|
||||||
dep_gnutls_required = get_option('plugin-ice')
|
|
||||||
else
|
|
||||||
dep_gnutls_required = get_option('plugin-rtp')
|
|
||||||
endif
|
|
||||||
|
|
||||||
dep_gdk_pixbuf = dependency('gdk-pixbuf-2.0')
|
dep_gdk_pixbuf = dependency('gdk-pixbuf-2.0')
|
||||||
dep_gee = dependency('gee-0.8')
|
dep_gee = dependency('gee-0.8')
|
||||||
dep_gio = dependency('gio-2.0')
|
dep_gio = dependency('gio-2.0')
|
||||||
dep_glib = dependency('glib-2.0')
|
dep_glib = dependency('glib-2.0')
|
||||||
dep_gnutls = dependency('gnutls', disabler: true, required: dep_gnutls_required)
|
dep_gnutls = dependency('gnutls', disabler: true, required: get_option('plugin-ice'))
|
||||||
dep_gmodule = dependency('gmodule-2.0')
|
dep_gmodule = dependency('gmodule-2.0')
|
||||||
dep_gpgme = dependency('gpgme', disabler: true, required: get_option('plugin-openpgp'))
|
dep_gpgme = dependency('gpgme', disabler: true, required: get_option('plugin-openpgp'))
|
||||||
dep_gstreamer = dependency('gstreamer-1.0', disabler: true, required: get_option('plugin-rtp'))
|
dep_gstreamer = dependency('gstreamer-1.0', disabler: true, required: get_option('plugin-rtp'))
|
||||||
|
|
|
@ -4,7 +4,6 @@ find_packages(RTP_PACKAGES REQUIRED
|
||||||
Gee
|
Gee
|
||||||
GLib
|
GLib
|
||||||
GModule
|
GModule
|
||||||
GnuTLS
|
|
||||||
GObject
|
GObject
|
||||||
GTK4
|
GTK4
|
||||||
Gst
|
Gst
|
||||||
|
|
|
@ -4,7 +4,6 @@ dependencies = [
|
||||||
dep_gee,
|
dep_gee,
|
||||||
dep_glib,
|
dep_glib,
|
||||||
dep_gmodule,
|
dep_gmodule,
|
||||||
dep_gnutls,
|
|
||||||
dep_gstreamer,
|
dep_gstreamer,
|
||||||
dep_gstreamer_app,
|
dep_gstreamer_app,
|
||||||
dep_gstreamer_audio,
|
dep_gstreamer_audio,
|
||||||
|
|
Loading…
Reference in a new issue