meson: add a zlib subproject
authorDylan Baker <dylan@pnwbakers.com>
Thu, 5 Apr 2018 23:14:07 +0000 (16:14 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Tue, 10 Sep 2019 20:36:47 +0000 (20:36 +0000)
To help windows build

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
meson.build
subprojects/zlib.wrap [new file with mode: 0644]

index 2d6ac036475f8db8a0c36fd8502a2e4b45ae1158..4be5845f2d6e8f79f6c82a89d8f33cf5c5115568 100644 (file)
@@ -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 (file)
index 0000000..f459463
--- /dev/null
@@ -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