From f6b74331dae472ad855a6eaa9fb238f609ac04de Mon Sep 17 00:00:00 2001 From: Myaamori Date: Tue, 27 Oct 2020 17:02:31 +0000 Subject: [PATCH] meson: update zlib wrapper --- meson.build | 4 ++-- subprojects/zlib.wrap | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 5ba12f0f0..afcf8e247 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause', - meson_version: '>=0.51.0', + meson_version: '>=0.55.0', default_options: ['c_std=c11', 'cpp_std=c++11', 'b_lto=true'], version: '3.2.2') @@ -69,7 +69,7 @@ if host_machine.system() == 'windows' conf.set('BOOST_USE_WINDOWS_H', '1') endif -deps += dependency('zlib', fallback: ['zlib', 'zlib_dep']) +deps += dependency('zlib') wx_dep = dependency('wxWidgets', version: '>=3.0.0', required: cxx.get_id() != 'msvc', diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index 91c1d4d99..ce20fb053 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,10 +1,12 @@ [wrap-file] directory = zlib-1.2.11 - source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz source_filename = zlib-1.2.11.tar.gz source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip +patch_filename = zlib-1.2.11-5-wrap.zip +patch_hash = 728c8e24acbc2e6682fbd950fec39e2fc77528af361adb87259f8a8511434004 + +[provide] +zlib = zlib_dep -patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/4/get_zip -patch_filename = zlib-1.2.11-4-wrap.zip -patch_hash = f733976fbfc59e0bcde01aa9469a24eeb16faf0a4280b17e9eaa60a301d75657