meson: Replace in-tree nlohmann_json with a subproject wrap

scripts/archive-source.sh

@@ -36,7 +36,7 @@ sub_deinit=""
 # xemu only
 subprojects="keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3
   glslang SPIRV-Reflect  volk VulkanMemoryAllocator nv2a_vsh_cpu
-  tomlplusplus xxhash imgui implot genconfig"
+  tomlplusplus xxhash imgui implot genconfig json"
 
 function cleanup() {
     local status=$?

subprojects/.gitignore

@@ -29,3 +29,4 @@ imgui
 implot
 genconfig
 curl-*
+json-*

subprojects/json.wrap

@@ -0,0 +1,11 @@
+[wrap-file]
+directory = json-3.2.0
+source_url = https://github.com/nlohmann/json/archive/v3.2.0/json-3.2.0.tar.gz
+source_filename = json-3.2.0.tar.gz
+source_hash = 2de558ff3b3b32eebfb51cf2ceb835a0fa5170e6b8712b02be9c2c07fcfe52a1
+patch_url = https://wrapdb.mesonbuild.com/v2/json_3.2.0-1/get_patch
+patch_filename = json-3.2.0-1-wrap.zip
+patch_hash = f601837156f1f391ea9923c6d602450b1357537b1821d727251e75d97cb10f67
+
+[provide]
+nlohmann_json = nlohmann_json_dep

ui/thirdparty/meson.build

@@ -29,10 +29,6 @@ endif
 libfpng = static_library('fpng', sources: 'fpng/fpng.cpp', cpp_args: libfpng_cpp_args)
 fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
 
-json = dependency('nlohmann_json', required: false)
-if not json.found()
-  json = declare_dependency(include_directories: 'json')
-endif
-
+json = dependency('nlohmann_json', required: true)
 libfatx = static_library('fatx', sources: files('fatx/fatx.c') + genh)
 fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)