build: revert to explicit fallback for libzstd

Implicit fallback causes conflicts in the basis_universal subproject

https://github.com/mesonbuild/meson/issues/11189
This commit is contained in:
Andrei Alexeyev 2022-12-17 07:33:30 +01:00
parent b2de61f5c5
commit a345f21b35
No known key found for this signature in database
GPG key ID: 72D26128040B9690
2 changed files with 1 additions and 4 deletions

View file

@ -172,7 +172,7 @@ dep_sdl2 = dependency('sdl2', version : '>=2.0.10',required : t
dep_webp = dependency('libwebp', version : '>=0.5', required : true)
dep_webpdecoder = dependency('libwebpdecoder', version : '>=0.5', required : false)
dep_zlib = dependency('zlib', required : true)
dep_zstd = dependency('libzstd', version : '>=1.4.0', required : true)
dep_zstd = dependency('libzstd', version : '>=1.4.0', fallback : ['libzstd', 'libzstd_dep'])
dep_zip = dependency('libzip', version : '>=1.5.0', required : opt_vfs_zip, allow_fallback : true)
dep_cglm = dependency('cglm', version : '>=0.7.8', required : true)
dep_crypto = dependency('libcrypto', required : get_option('use_libcrypto'))

View file

@ -3,6 +3,3 @@ directory=libzstd
url=https://github.com/taisei-project/zstd.git
push-url=git@github.com:taisei-project/zstd.git
revision=meson-1.4.9
[provide]
libzstd=libzstd_dep