external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Build: Support --shared-srt to link with *.so for MPL license. 4.0.125

Browse source
This commit is contained in:
winlin 2021-06-01 11:37:34 +08:00
parent 8434271578
commit f44224a2a1
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -180,6 +180,7 @@ For external services to work with SRS:
## V4 changes ## V4 changes
* v4.0, 2021-06-01, Support --shared-srt to link with *.so for MPL license. 4.0.125
* v4.0, 2021-05-31, Use [SPDX-License-Identifier: MIT](https://spdx.dev/ids/). 4.0.124 * v4.0, 2021-05-31, Use [SPDX-License-Identifier: MIT](https://spdx.dev/ids/). 4.0.124
* v4.0, 2021-05-28, Fix bugs for GB28181 and RTC. 4.0.123 * v4.0, 2021-05-28, Fix bugs for GB28181 and RTC. 4.0.123
* v4.0, 2021-05-21, Fix [#2370][bug #2370] bug for Firefox play stream(published by Chrome). 4.0.121 * v4.0, 2021-05-21, Fix [#2370][bug #2370] bug for Firefox play stream(published by Chrome). 4.0.121

9
trunk/auto/depends.sh
View file

@ -657,7 +657,7 @@ if [[ $SRS_RTC == YES ]]; then
fi fi
##################################################################################### #####################################################################################
# ffmpeg-fix, for WebRTC to transcode AAC with Opus. # ffmpeg-fit, for WebRTC to transcode AAC with Opus.
##################################################################################### #####################################################################################
if [[ $SRS_FFMPEG_FIT == YES ]]; then if [[ $SRS_FFMPEG_FIT == YES ]]; then
FFMPEG_OPTIONS="" FFMPEG_OPTIONS=""
@ -744,7 +744,12 @@ if [[ $SRS_SRT == YES ]]; then
exit -1; exit -1;
fi fi
# Always disable c++11 for libsrt, because only the srt-app requres it. # Always disable c++11 for libsrt, because only the srt-app requres it.
LIBSRT_OPTIONS="--disable-app --enable-shared=0 --enable-static --enable-c++11=0" LIBSRT_OPTIONS="--disable-app --enable-static --enable-c++11=0"
if [[ $SRS_SHARED_SRT == YES ]]; then
LIBSRT_OPTIONS="$LIBSRT_OPTIONS --enable-shared=1"
else
LIBSRT_OPTIONS="$LIBSRT_OPTIONS --enable-shared=0"
fi
# Start build libsrt. # Start build libsrt.
rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/srt-1-fit && cd ${SRS_OBJS}/${SRS_PLATFORM} && rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/srt-1-fit && cd ${SRS_OBJS}/${SRS_PLATFORM} &&
cp -R ../../3rdparty/srt-1-fit srt-1-fit && cd srt-1-fit && cp -R ../../3rdparty/srt-1-fit srt-1-fit && cd srt-1-fit &&

3
trunk/configure vendored
View file

@ -135,7 +135,7 @@ END
# #
# st(state-threads) the basic network library for SRS. # st(state-threads) the basic network library for SRS.
LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a" LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a"
if [[ $SRS_SHARED_ST == YES ]]; then LibSTfile="-lst"; fi if [[ $SRS_SHARED_ST == YES ]]; then LibSTfile="-L${LibSTRoot} -lst"; fi
# srtp # srtp
if [[ $SRS_RTC == YES ]]; then if [[ $SRS_RTC == YES ]]; then
@ -167,6 +167,7 @@ fi
if [[ $SRS_SRT == YES ]]; then if [[ $SRS_SRT == YES ]]; then
SrsSRTRoot="${SRS_WORKDIR}/src/srt" SrsSRTRoot="${SRS_WORKDIR}/src/srt"
LibSRTRoot="${SRS_OBJS_DIR}/srt/include"; LibSRTfile="${SRS_OBJS_DIR}/srt/lib/libsrt.a" LibSRTRoot="${SRS_OBJS_DIR}/srt/include"; LibSRTfile="${SRS_OBJS_DIR}/srt/lib/libsrt.a"
if [[ $SRS_SHARED_SRT == YES ]]; then LibSRTfile="-L${SRS_OBJS_DIR}/srt/lib -lsrt"; fi
fi fi
# For iconv on macOS only, CentOS seems ok. # For iconv on macOS only, CentOS seems ok.

2
trunk/src/core/srs_core_version4.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 124 #define VERSION_REVISION 125
#endif #endif