From cc99226ed5e5334a49e4eb1223baa15fa43d0a87 Mon Sep 17 00:00:00 2001 From: HungMingWu Date: Sat, 30 Oct 2021 08:40:25 +0800 Subject: [PATCH] SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189 --- trunk/3rdparty/patches/srtp/gcc10-01.patch | 4 ++++ trunk/auto/depends.sh | 1 + trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 trunk/3rdparty/patches/srtp/gcc10-01.patch diff --git a/trunk/3rdparty/patches/srtp/gcc10-01.patch b/trunk/3rdparty/patches/srtp/gcc10-01.patch new file mode 100644 index 000000000..cd9fa2f3d --- /dev/null +++ b/trunk/3rdparty/patches/srtp/gcc10-01.patch @@ -0,0 +1,4 @@ +82c82 +< char bit_string[MAX_PRINT_STRING_LEN]; +--- +> static char bit_string[MAX_PRINT_STRING_LEN]; diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 1fb18643f..0cd3106ef 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -608,6 +608,7 @@ else ( rm -rf ${SRS_OBJS}/srtp2 && cd ${SRS_OBJS}/${SRS_PLATFORM} && rm -rf libsrtp-2-fit && cp -R ../../3rdparty/libsrtp-2-fit . && cd libsrtp-2-fit && + patch -p0 crypto/math/datatypes.c ../../../3rdparty/patches/srtp/gcc10-01.patch && $SRTP_CONFIGURE ${SRTP_OPTIONS} --prefix=`pwd`/_release && make ${SRS_JOBS} && make install && cd .. && rm -rf srtp2 && ln -sf libsrtp-2-fit/_release srtp2 diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index e4f3f0ff8..a0a532c1f 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, 2021-10-30, Merge [#2397](https://github.com/ossrs/srs/pull/2397): SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189 * v4.0, 2021-10-30, Merge [#2284](https://github.com/ossrs/srs/pull/2284): Forward: Fast quit when cycle fail. v4.0.188 * v4.0, 2021-10-28, Merge [#2186](https://github.com/ossrs/srs/pull/2186): Gop: Ignore zero timestamp when shrinking. v4.0.187 * v4.0, 2021-10-27, Merge [#1963](https://github.com/ossrs/srs/pull/1963): Cluster: Origin server shouldn't be it's own coworker. v4.0.186 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 4a9b70d90..02549b6c9 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 188 +#define VERSION_REVISION 189 #endif