From 8ba86ad55c5a0a5a6c4ed25443d06442caa5072d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 5 Apr 2018 16:14:07 -0700 Subject: [PATCH] meson: add a zlib subproject To help windows build Reviewed-by: Eric Anholt Reviewed-by: Eric Engestrom --- meson.build | 2 +- subprojects/zlib.wrap | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 subprojects/zlib.wrap diff --git a/meson.build b/meson.build index 2d6ac036475..4be5845f2d6 100644 --- a/meson.build +++ b/meson.build @@ -1139,7 +1139,7 @@ else endif # TODO: some of these may be conditional -dep_zlib = dependency('zlib', version : '>= 1.2.3') +dep_zlib = dependency('zlib', version : '>= 1.2.3', fallback : ['zlib', 'zlib_dep']) pre_args += '-DHAVE_ZLIB' dep_thread = dependency('threads') if dep_thread.found() and host_machine.system() != 'windows' diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap new file mode 100644 index 00000000000..f459463bb59 --- /dev/null +++ b/subprojects/zlib.wrap @@ -0,0 +1,10 @@ +[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/2/get_zip +patch_filename = zlib-1.2.11-2-wrap.zip +patch_hash = aed811a48707be2a374a230c01e2efa17b385fe7e88f4ac0ee122093766aab2b -- 2.30.2