From bee401cce98d2bea6c4879861b4a5b41f2d2afad Mon Sep 17 00:00:00 2001 From: Stephan Hesse Date: Mon, 26 Oct 2020 16:49:39 +0100 Subject: [PATCH] fix macOS Catalina build: the CMake config on previous versions doesn't (#14) find the XCode/Clang SDK anymore, this however works fine with latest SRT v1.4.2. Now this however breaks support for the SRTO_TSBPDDELAY sock opt flag. --- scripts/build-srt-sdk.js | 2 +- src/srt-enums.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build-srt-sdk.js b/scripts/build-srt-sdk.js index b6259d3..ca38664 100755 --- a/scripts/build-srt-sdk.js +++ b/scripts/build-srt-sdk.js @@ -12,7 +12,7 @@ const os = require('os'); const env = process.env; const SRT_REPO = env.NODE_SRT_REPO || "https://github.com/Haivision/srt.git"; -const SRT_CHECKOUT = "v1.4.1"; +const SRT_CHECKOUT = "v1.4.2"; const srtRepoPath = env.NODE_SRT_LOCAL_REPO ? `file://${path.join(__dirname, env.NODE_SRT_LOCAL_REPO)}` : SRT_REPO; const srtCheckout = env.NODE_SRT_CHECKOUT || SRT_CHECKOUT; diff --git a/src/srt-enums.h b/src/srt-enums.h index 74e0e57..475c2ea 100644 --- a/src/srt-enums.h +++ b/src/srt-enums.h @@ -24,7 +24,6 @@ ENUM(SRTO_RCVDATA), \ ENUM(SRTO_SENDER), \ ENUM(SRTO_TSBPDMODE), \ - ENUM(SRTO_TSBPDDELAY), \ ENUM(SRTO_INPUTBW), \ ENUM(SRTO_OHEADBW), \ ENUM(SRTO_PASSPHRASE), \ @@ -64,4 +63,4 @@ ENUM(SRTS_CONNECTED), \ ENUM(SRTS_BROKEN), \ ENUM(SRTS_CLOSING), \ - ENUM(SRTS_CLOSED) \ No newline at end of file + ENUM(SRTS_CLOSED)