mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-11-25 13:01:07 +00:00
meson: Enable the RTP option when WebRTC is enabled
And make the webrtc option yielding, see: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5505 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1363>
This commit is contained in:
parent
c4a788b97b
commit
84b0dd8980
2 changed files with 7 additions and 4 deletions
|
@ -65,11 +65,14 @@ deps = [
|
||||||
['gstreamer-video-1.0', 'gst-plugins-base', 'video_dep', 'gstvideo']
|
['gstreamer-video-1.0', 'gst-plugins-base', 'video_dep', 'gstvideo']
|
||||||
]
|
]
|
||||||
|
|
||||||
|
webrtc_option = get_option('webrtc')
|
||||||
|
rtp_option = get_option('rtp').enable_if(webrtc_option.enabled(), error_message: 'webrtc option is enabled')
|
||||||
|
|
||||||
if get_option('threadshare').allowed() \
|
if get_option('threadshare').allowed() \
|
||||||
or get_option('onvif').allowed() \
|
or get_option('onvif').allowed() \
|
||||||
or get_option('raptorq').allowed() \
|
or get_option('raptorq').allowed() \
|
||||||
or get_option('rtp').allowed() \
|
or rtp_option.allowed() \
|
||||||
or get_option('webrtc').allowed()
|
or webrtc_option.allowed()
|
||||||
deps += [['gstreamer-rtp-1.0', 'gst-plugins-base', 'rtp_dep', 'gst_rtp']]
|
deps += [['gstreamer-rtp-1.0', 'gst-plugins-base', 'rtp_dep', 'gst_rtp']]
|
||||||
endif
|
endif
|
||||||
if get_option('webrtc').allowed() \
|
if get_option('webrtc').allowed() \
|
||||||
|
@ -351,7 +354,7 @@ if get_option('default_library') == 'static'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
foreach plugin_name, details: plugins
|
foreach plugin_name, details: plugins
|
||||||
plugin_opt = get_option(plugin_name)
|
plugin_opt = get_variable(f'@plugin_name@_option', get_option(plugin_name))
|
||||||
if plugin_opt.allowed()
|
if plugin_opt.allowed()
|
||||||
plugin_deps_found = true
|
plugin_deps_found = true
|
||||||
foreach dep_name, dep_ver: details.get('extra-deps', {})
|
foreach dep_name, dep_ver: details.get('extra-deps', {})
|
||||||
|
|
|
@ -29,7 +29,7 @@ option('onvif', type: 'feature', value: 'auto', description: 'Build onvif plugin
|
||||||
option('raptorq', type: 'feature', value: 'auto', description: 'Build raptorq plugin')
|
option('raptorq', type: 'feature', value: 'auto', description: 'Build raptorq plugin')
|
||||||
option('reqwest', type: 'feature', value: 'auto', description: 'Build reqwest plugin')
|
option('reqwest', type: 'feature', value: 'auto', description: 'Build reqwest plugin')
|
||||||
option('rtp', type: 'feature', value: 'auto', description: 'Build rtp plugin')
|
option('rtp', type: 'feature', value: 'auto', description: 'Build rtp plugin')
|
||||||
option('webrtc', type: 'feature', value: 'auto', description: 'Build webrtc plugin')
|
option('webrtc', type: 'feature', value: 'auto', yield: true, description: 'Build webrtc plugin')
|
||||||
option('webrtchttp', type: 'feature', value: 'auto', description: 'Build webrtchttp plugin')
|
option('webrtchttp', type: 'feature', value: 'auto', description: 'Build webrtchttp plugin')
|
||||||
|
|
||||||
# text
|
# text
|
||||||
|
|
Loading…
Reference in a new issue