diff --git a/releases.json b/releases.json index 7cadb03220..56733ef7b8 100644 --- a/releases.json +++ b/releases.json @@ -3548,6 +3548,7 @@ "libzstd" ], "versions": [ + "1.5.6-2", "1.5.6-1", "1.5.5-1", "1.5.4-1", diff --git a/subprojects/packagefiles/zstd/meson.build b/subprojects/packagefiles/zstd/meson.build index b96f7ae1b8..90725a3283 100644 --- a/subprojects/packagefiles/zstd/meson.build +++ b/subprojects/packagefiles/zstd/meson.build @@ -86,8 +86,13 @@ feature_lz4 = get_option('lz4') # ============================================================================= libm_dep = cc.find_library('m', required: false) -thread_dep = dependency('threads', required: feature_multi_thread) -use_multi_thread = thread_dep.found() +if host_machine_os == os_windows + thread_dep = dependency('', required: false) + use_multi_thread = not feature_multi_thread.disabled() +else + thread_dep = dependency('threads', required: feature_multi_thread) + use_multi_thread = thread_dep.found() +endif # Arguments in dependency should be equivalent to those passed to pkg-config zlib_dep = dependency('zlib', required: feature_zlib) use_zlib = zlib_dep.found() diff --git a/subprojects/packagefiles/zstd/meson_options.txt b/subprojects/packagefiles/zstd/meson_options.txt index f35cd5fc8b..4705178279 100644 --- a/subprojects/packagefiles/zstd/meson_options.txt +++ b/subprojects/packagefiles/zstd/meson_options.txt @@ -27,7 +27,7 @@ option('bin_contrib', type: 'boolean', value: false, description: 'Enable contrib build') option('multi_thread', type: 'feature', value: 'enabled', - description: 'Enable multi-threading when pthread is detected') + description: 'Enable multi-threading when pthread or Windows is detected') option('zlib', type: 'feature', value: 'auto', description: 'Enable zlib support') option('lzma', type: 'feature', value: 'auto',