mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/hls/meson.build: fix dependency logic

Browse source 
Currently, if one was to set -Dhls-crypto to either libgcrypt or openssl
instead of auto, the following lines would fail because hls_crypto_dep is not
yet set:

if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto)
if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto)

Instead, change "if not hls_crypto_dep.found()" to "if not have_hls_crypto"
which fixes the error.
This commit is contained in:
Adam Duskett 2019-05-29 18:33:02 +00:00 committed by Tim-Philipp Müller
parent 1b774e2da8
commit 43eaf5ac4a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/hls/meson.build
View file

@ -23,7 +23,7 @@ if not hls_option.disabled()
endif endif
endif endif
if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto) if not have_hls_crypto and ['auto', 'libgcrypt'].contains(hls_crypto)
hls_crypto_dep = cc.find_library('gcrypt', required : false) hls_crypto_dep = cc.find_library('gcrypt', required : false)
if hls_crypto_dep.found() if hls_crypto_dep.found()
have_hls_crypto = true have_hls_crypto = true
@ -31,7 +31,7 @@ if not hls_option.disabled()
endif endif
endif endif
if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto) if not have_hls_crypto and ['auto', 'openssl'].contains(hls_crypto)
hls_crypto_dep = dependency('openssl', required : false) hls_crypto_dep = dependency('openssl', required : false)
if hls_crypto_dep.found() if hls_crypto_dep.found()
have_hls_crypto = true have_hls_crypto = true