⬆️ Update dependencies

.github/workflows/build.yml

@@ -27,15 +27,15 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: cisco/libsrtp
-        ref: v2.3.0
+        ref: v2.4.2
         path: libsrtp
     - name: Build and Install libsrtp
       run: cd libsrtp && ./configure --prefix=/usr --enable-openssl && make shared_library && sudo make install
     - name: Clone Janus
       uses: actions/checkout@v2
       with:
         repository: meetecho/janus-gateway
-        ref: v0.10.10
+        ref: v0.11.6
         path: janus
     - name: Build and Install Janus
       run: cd janus && sh autogen.sh && ./configure --prefix=/opt/janus && make && sudo make install

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "cpp-httplib"]
-	path = vendor/cpp-httplib
-	url = https://github.com/yhirose/cpp-httplib
 [submodule "janus-ftl-orchestrator"]
 	path = vendor/janus-ftl-orchestrator
 	url = https://github.com/Glimesh/janus-ftl-orchestrator

Dockerfile

@@ -11,7 +11,7 @@ WORKDIR /tmp
 
 ENV LIBNICE_VERSION=0.1.18
 ENV LIBSRTP_VERSION=v2.4.2
-ENV JANUSGATEWAY_VERSION=v0.11.4
+ENV JANUSGATEWAY_VERSION=v0.11.6
 
 RUN \
     DIR=/tmp/libnice && \

meson.build

@@ -58,6 +58,7 @@ sources = files([
 ])
 
 # Pull in subprojects
+cpp_httplib_wrap = subproject('cpp-httplib')
 fmt_wrap = subproject('fmt', default_options: 'default_library=static')
 meson.override_dependency('fmt', fmt_wrap.get_variable('fmt_dep')) # Use our copy of fmt for spdlog
 spdlog_wrap = subproject('spdlog', default_options: ['default_library=static', 'compile_library=true', 'external_fmt=true'] )
@@ -82,13 +83,13 @@ deps = [
     dependency('libavcodec'),
     dependency('libavutil'),
     # Meson wrapped dependencies
+    cpp_httplib_wrap.get_variable('cpp_httplib_dep'),
     fmt_wrap.get_variable('fmt_dep'),
     spdlog_wrap.get_variable('spdlog_dep'),
     systemd_dep,
 ]
 
 incdir = include_directories(
-    './vendor/cpp-httplib',
     './vendor/janus-ftl-orchestrator/inc',
     './vendor/eventpp/include',
     janusincludepath,

src/JanusFtl.cpp

@@ -215,7 +215,7 @@ void JanusFtl::IncomingRtcp(janus_plugin_session* handle, janus_plugin_rtcp* pac
             handlePsfbRtcpPacket(handle, rtcpHeader);
             break;
         default:
-            spdlog::info("Got unknown RTCP packet! Type: {}", rtcpHeader->type);
+            spdlog::info("Got unknown RTCP packet! Type: {}", (uint16_t)rtcpHeader->type);
             break;
         }
 

subprojects/catch2.wrap

@@ -1,12 +1,12 @@
 [wrap-file]
-directory = Catch2-2.13.3
-source_url = https://github.com/catchorg/Catch2/archive/v2.13.3.zip
-source_filename = Catch2-2.13.3.zip
-source_hash = 1804feb72bc15c0856b4a43aa586c661af9c3685a75973b6a8fc0b950c7cfd13
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/catch2/2.13.3/1/get_zip
-patch_filename = catch2-2.13.3-1-wrap.zip
-patch_hash = eec2db9d30d6d722a78160e24ae3382623cc4dda1f9536407548af0b60db56c0
+directory = Catch2-2.13.7
+source_url = https://github.com/catchorg/Catch2/archive/v2.13.7.zip
+source_filename = Catch2-2.13.7.zip
+source_hash = 3f3ccd90ad3a8fbb1beeb15e6db440ccdcbebe378dfd125d07a1f9a587a927e9
+patch_filename = catch2_2.13.7-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/catch2_2.13.7-1/get_patch
+patch_hash = 2f7369645d747e5bd866317ac1dd4c3d04dc97d3aad4fc6b864bdf75d3b57158
 
 [provide]
-dependency_names = catch2_dep
+catch2 = catch2_dep
 

subprojects/cpp-httplib.wrap

@@ -0,0 +1,12 @@
+[wrap-file]
+directory = cpp-httplib-0.8.9
+source_url = https://github.com/yhirose/cpp-httplib/archive/v0.8.9.tar.gz
+source_filename = cpp-httplib-0.8.9.tar.gz
+source_hash = 3c5e0d6784d04b0b3d10f60fa2a26ef2a968fb80f434c4d117c2811f9e3a5ed7
+patch_filename = cpp-httplib_0.8.9-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/cpp-httplib_0.8.9-2/get_patch
+patch_hash = d9306eb0a049be9ddb10337405d1635c33d6f133d4c08769c4a61e7135d48874
+
+[provide]
+cpp-httplib = cpp_httplib_dep
+

subprojects/fmt.wrap

@@ -1,11 +1,12 @@
 [wrap-file]
-directory = fmt-7.1.3
-source_url = https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz
-source_filename = fmt-7.1.3.tar.gz
-source_hash = 5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/7.1.3/1/get_zip
-patch_filename = fmt-7.1.3-1-wrap.zip
-patch_hash = 6eb951a51806fd6ffd596064825c39b844c1fe1799840ef507b61a53dba08213
+directory = fmt-8.0.1
+source_url = https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
+source_filename = fmt-8.0.1.tar.gz
+source_hash = b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+patch_filename = fmt_8.0.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_8.0.1-1/get_patch
+patch_hash = 8fab9a5d4d0971770262fef3149ef8764e5c7ba717f59afef119731197ec4ec4
 
 [provide]
 fmt = fmt_dep
+

subprojects/spdlog.wrap

@@ -1,11 +1,12 @@
 [wrap-file]
-directory = spdlog-1.8.1
-source_url = https://github.com/gabime/spdlog/archive/v1.8.1.tar.gz
-source_filename = v1.8.1.tar.gz
-source_hash = 5197b3147cfcfaa67dd564db7b878e4a4b3d9f3443801722b3915cdeced656cb
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.8.1/1/get_zip
-patch_filename = spdlog-1.8.1-1-wrap.zip
-patch_hash = 76844292a8e912aec78450618271a311841b33b17000988f215ddd6c64dd71b3
+directory = spdlog-1.9.2
+source_url = https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz
+source_filename = v1.9.2.tar.gz
+source_hash = 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38
+patch_filename = spdlog_1.9.2-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.9.2-1/get_patch
+patch_hash = 77182bd65366818ef61fd5bd1745fedd4a6d4aeefc03f34a1ddb05ef9c944c95
 
 [provide]
-dependency_names = spdlog
+spdlog = spdlog_dep
+