Update nghttp2 1.60->1.61
They seem to have gotten rid of the nghttp2_static target, so go back to
relying on the "normal" target.
Change-Id: Ic44d9ffe5fa2d88f38c018756738197371b0dc89
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/meson.build b/meson.build
index ee8a91f..cabb65f 100644
--- a/meson.build
+++ b/meson.build
@@ -289,9 +289,14 @@
if not nghttp2.found()
cmake = import('cmake')
opt_var = cmake.subproject_options()
- opt_var.add_cmake_defines({'ENABLE_LIB_ONLY': true, 'ENABLE_STATIC_LIB': true})
+ opt_var.add_cmake_defines(
+ {
+ 'ENABLE_LIB_ONLY': true,
+ 'ENABLE_STATIC_LIB': true,
+ },
+ )
nghttp2_ex = cmake.subproject('nghttp2', options: opt_var)
- nghttp2 = nghttp2_ex.dependency('nghttp2_static')
+ nghttp2 = nghttp2_ex.dependency('nghttp2')
endif
bmcweb_dependencies += nghttp2
diff --git a/subprojects/nghttp2.wrap b/subprojects/nghttp2.wrap
index 1bc4649..a2df323 100644
--- a/subprojects/nghttp2.wrap
+++ b/subprojects/nghttp2.wrap
@@ -1,5 +1,5 @@
[wrap-file]
-directory = nghttp2-1.60.0
-source_url = https://github.com/nghttp2/nghttp2/releases/download/v1.60.0/nghttp2-1.60.0.tar.xz
-source_filename = nghttp2-1.60.0.tar.xz
-source_hash = 625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261bf4e
+directory = nghttp2-1.61.0
+source_url = https://github.com/nghttp2/nghttp2/releases/download/v1.61.0/nghttp2-1.61.0.tar.xz
+source_filename = nghttp2-1.61.0.tar.xz
+source_hash = c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654