Updated wrap definitions to the latest in wrapdb.

manual tests/2 multiwrap/meson.build

@@ -1,18 +1,12 @@
-project('multiwrap', 'c')
+project('multiwrap', 'c',
+  default_options : 'c_std=c99')
 
 # Using multiple downloaded projects for great justice.
 
-if meson.get_compiler('c').get_id() != 'msvc'
-  add_global_arguments('-std=c99', language : 'c')
-  extra_libs = ['-lm']
-else
-  extra_libs = []
-endif
+cc = meson.get_compiler('c')
 
-luap = subproject('lua')
-pngp = subproject('libpng')
+luadep = dependency('lua', fallback : ['lua', 'lua_dep'])
+pngdep = dependency('libpng', fallback : ['libpng', 'pngdep'])
 
 executable('prog', 'prog.c',
-include_directories : [pngp.get_variable('incdir'), luap.get_variable('incdir')],
-link_with :[pngp.get_variable('libpng'), luap.get_variable('lualib')],
-link_args : extra_libs)
+  dependencies : [pngdep, luadep])

manual tests/2 multiwrap/subprojects/libpng.wrap

@@ -5,6 +5,6 @@ source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng16/lib
 source_filename = libpng-1.6.17.tar.xz
 source_hash = 98507b55fbe5cd43c51981f2924e4671fd81fe35d52dc53357e20f2c77fa5dfd
 
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.17/5/get_zip
-patch_filename = libpng-1.6.17-5-wrap.zip
-patch_hash = 952c0a2664cca835c98a10829e169cff29342601e9d5b237dc71a500ac67c80f
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.17/6/get_zip
+patch_filename = libpng-1.6.17-6-wrap.zip
+patch_hash = 8bd272e28e6ae84691935e84bca9f5eb02632221e6faccf427eb71bf745a7295

manual tests/2 multiwrap/subprojects/lua.wrap

@@ -6,6 +6,6 @@ source_filename = lua-5.3.0.tar.gz
 source_hash = ae4a5eb2d660515eb191bfe3e061f2b8ffe94dce73d32cfd0de090ddcc0ddb01
 
 
-patch_url = http://wrapdb.mesonbuild.com/v1/projects/lua/5.3.0/2/get_zip
-patch_filename = lua-5.3.0-2-wrap.zip
-patch_hash = f7bc18b6a6487dd7d78b5d3b2d49861a76212dfd79b40e32f4b1e5655361ffb5
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/lua/5.3.0/5/get_zip
+patch_filename = lua-5.3.0-5-wrap.zip
+patch_hash = 439038309a0700adfb67d764b3fe935ed8601b31f819fc369e1438c6e79334dd

manual tests/2 multiwrap/subprojects/zlib.wrap

@@ -1,10 +1,10 @@
 [wrap-file]
 directory = zlib-1.2.8
 
-source_url = http://zlib.net/zlib-1.2.8.tar.gz
+source_url = http://zlib.net/fossils/zlib-1.2.8.tar.gz
 source_filename = zlib-1.2.8.tar.gz
 source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
 
-patch_url = http://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/4/get_zip
-patch_filename = zlib-1.2.8-4-wrap.zip
-patch_hash = 2327a42c8f73a4289ee8c9cd4abc43b324d0decc28d6e609e927f0a50321af4a
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/8/get_zip
+patch_filename = zlib-1.2.8-8-wrap.zip
+patch_hash = 17c52a0e0c59ce926d3959005d5cd8178c6c7e2c9a4a1304279a8320c955ac60