From: Daniel Wagner <dwagner@suse.de>
Date: Tue, 16 Nov 2021 21:25:45 +0000 (+0100)
Subject: build: Update json-c dependencies
X-Git-Tag: v2.0-rc0~52^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ccf05b4f150f8e56a7ba756f7d4355faa64d5d5f;p=users%2Fsagi%2Fnvme-cli.git

build: Update json-c dependencies

With commit 0b63a8b7cfb7 ("Check json-c libversion, recover commit
d127537") with increased the minimum version of json-c. Let's update
the meson wrapper.

While at it also update the min version in meson.build to 0.14.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/meson.build b/meson.build
index d1f1437e..498f7a40 100644
--- a/meson.build
+++ b/meson.build
@@ -31,7 +31,7 @@ libuuid = dependency('uuid', required: true)
 conf.set('CONFIG_LIBUUID', libuuid.found(), description: 'Is libuuid required?')
 
 # Check for libjson-c availability
-json_c = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c'])
+json_c = dependency('json-c', version: '>=0.14', fallback : ['json-c', 'json_c_dep'])
 conf.set('CONFIG_JSONC', json_c.found(), description: 'Is json-c required?')
 
 # Check for libhugetlbfs  availability
diff --git a/subprojects/json-c.wrap b/subprojects/json-c.wrap
index db391e06..90089e23 100644
--- a/subprojects/json-c.wrap
+++ b/subprojects/json-c.wrap
@@ -1,9 +1,12 @@
 [wrap-file]
-directory = json-c-0.13.1
-source_url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz
-source_filename = json-c-0.13.1.tar.gz
-source_hash = b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
-patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.13.1-1/get_patch
-patch_filename = json-c-0.13.1-1-wrap.zip
-patch_hash = 213a735c3c5f7ff4aa38850cd7bf236337c47fd553b9fcded64e709cab66b9fd
+directory = json-c-0.15
+source_url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
+source_filename = json-c-0.15.tar.gz
+source_hash = b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
+patch_filename = json-c_0.15-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.15-1/get_patch
+patch_hash = 002b44f87063a129b5f518ffb2dba7d107ecc665ba29f97e5547ffcae41de3a9
+
+[provide]
+json-c = json_c_dep