From 012a8e178cbd5829913c2bc646bc2bca69ccf901 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Fri, 26 Jan 2024 23:26:47 +0100 Subject: [PATCH] meson: upgrade zlib wrap to 1.3.1 `$ meson wrap update zlib` Cc: mesa-stable Reviewed-by: Dylan Baker Acked-by: Erik Faye-Lund Signed-off-by: David Heidelberg Part-of: (cherry picked from commit 56f31d1847ba04c8214c68581a3a3c292fd300f4) --- .pick_status.json | 2 +- subprojects/zlib.wrap | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bc7f9e67454..e144e4a5da2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -224,7 +224,7 @@ "description": "meson: upgrade zlib wrap to 1.3.1", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index 0482386869b..aa14de17740 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,12 +1,13 @@ [wrap-file] -directory = zlib-1.2.13 -source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz -source_filename = zlib-1.2.13.tar.gz -source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 -patch_filename = zlib_1.2.13-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch -patch_hash = 73a0103df54133b10f8774f92e23da048bd22554523e2b833cdb72b2702c0628 -wrapdb_version = 1.2.13-1 +directory = zlib-1.3.1 +source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz +source_filename = zlib-1.3.1.tar.gz +source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 +patch_filename = zlib_1.3.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch +patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095 +wrapdb_version = 1.3.1-1 [provide] zlib = zlib_dep