From 0a848430e916b66ee82e862fc570d0eaaf601038 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 15 Feb 2022 18:35:25 +0800 Subject: [PATCH] Refine build script for SRT to avoid warnings. v4.0.243 --- trunk/auto/depends.sh | 6 ++++++ trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/srt/srt_to_rtmp.hpp | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 4e174310f..c774dd746 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -603,6 +603,12 @@ fi # srtp ##################################################################################### SRTP_OPTIONS="" +# To eliminate warnings, see https://stackoverflow.com/a/34208904/17679565 +# was built for newer macOS version (11.6) than being linked (11.0) +if [[ $SRS_OSX == YES ]]; then + export MACOSX_DEPLOYMENT_TARGET=11.0 + echo "Set MACOSX_DEPLOYMENT_TARGET to avoid warnings" +fi # If use ASM for SRTP, we enable openssl(with ASM). if [[ $SRS_SRTP_ASM == YES ]]; then SRTP_OPTIONS="--enable-openssl" diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index da7e5b596..f898dd45b 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2022-02-15, Refine build script for SRT to avoid warnings. v4.0.243 * v4.0, 2022-02-11, Support new fields for feature query. v4.0.241 * v4.0, 2022-02-09, Mirror docker images in TCR Singapore. v4.0.240 * v4.0, 2022-02-08, Refine the error for WebRTC H5 publisher. v4.0.239 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index c1eeab9f8..a10cfac07 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 242 +#define VERSION_REVISION 243 #endif diff --git a/trunk/src/srt/srt_to_rtmp.hpp b/trunk/src/srt/srt_to_rtmp.hpp index 0cfa15c5a..3bf98e103 100644 --- a/trunk/src/srt/srt_to_rtmp.hpp +++ b/trunk/src/srt/srt_to_rtmp.hpp @@ -69,7 +69,7 @@ private: class rtmp_client : public ts_media_data_callback_I, public std::enable_shared_from_this { public: rtmp_client(std::string key_path); - ~rtmp_client(); + virtual ~rtmp_client(); void receive_ts_data(SRT_DATA_MSG_PTR data_ptr); int64_t get_last_live_ts();