Skip to content

Commit e2461cd

Browse files
chundonglinlinduiniuluantanqinxiaozhihong
authored
Build: update build version to v7. v7.0.29 (#4294)
Update the prompt document address to the latest version v7. --------- Co-authored-by: Haibo Chen <[email protected]> Co-authored-by: winlin <[email protected]> --------- Co-authored-by: Haibo Chen(陈海博) <[email protected]> Co-authored-by: john <[email protected]>
1 parent 464a013 commit e2461cd

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

‎trunk/auto/options.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Features:
194194
--jobs[=N] Allow N jobs at once; infinite jobs with no arg. Default: $SRS_JOBS
195195
--config=<path> The default config file for SRS. Default: $SRS_DEFAULT_CONFIG
196196
197-
Performance: @see https://ossrs.net/lts/zh-cn/docs/v5/doc/performance
197+
Performance: @see https://ossrs.net/lts/zh-cn/docs/v7/doc/performance
198198
--valgrind=on|off Whether build valgrind for memory check. Default: $(value2switch $SRS_VALGRIND)
199199
--gperf=on|off Whether build SRS with gperf tools(no gmd/gmc/gmp/gcp, with tcmalloc only). Default: $(value2switch $SRS_GPERF)
200200
--gmc=on|off Whether build memory check with gperf tools. Default: $(value2switch $SRS_GPERF_MC)
@@ -218,7 +218,7 @@ Toolchain options:
218218
--extra-flags=<EFLAGS> Set EFLAGS as CFLAGS and CXXFLAGS. Also passed to ST as EXTRA_CFLAGS.
219219
--extra-ldflags=<ELDFLAGS> Set ELDFLAGS as LDFLAGS.
220220
221-
Cross Build options: @see https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs
221+
Cross Build options: @see https://ossrs.net/lts/zh-cn/docs/v7/doc/arm#ubuntu-cross-build-srs
222222
--cross=on|off Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
223223
--cpu=<CPU> Toolchain: Select the minimum required CPU for cross-build. For example: --cpu=24kc
224224
--arch=<ARCH> Toolchain: Select architecture for cross-build. For example: --arch=aarch64
@@ -297,7 +297,7 @@ function parse_user_option() {
297297
fi
298298

299299
if [[ $option == '--arm' || $option == '--mips' || $option == '--with-arm-ubuntu12' || $option == '--with-mips-ubuntu12' ]]; then
300-
echo "Error: Removed misleading option $option, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs"
300+
echo "Error: Removed misleading option $option, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/arm#ubuntu-cross-build-srs"
301301
exit -1
302302
fi
303303

‎trunk/auto/summary.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ BLACK="\\${BLACK}"
3434
echo -e "\${GREEN}The build summary:\${BLACK}"
3535
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
3636
echo -e " \${GREEN}For SRS benchmark, gperf, gprof and valgrind, please read:\${BLACK}"
37-
echo -e " \${GREEN} https://www.jianshu.com/p/6d4a89359352\${BLACK}"
37+
echo -e " \${GREEN} https://ossrs.net/lts/zh-cn/docs/v7/doc/performance\${BLACK}"
3838
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
3939
echo -e " |\${GREEN}The main server usage: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"
40-
echo -e " | ${SrsHlsSummaryColor}About HLS, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-hls\${BLACK}"
41-
echo -e " | ${SrsDvrSummaryColor}About DVR, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr\${BLACK}"
42-
echo -e " | ${SrsSslSummaryColor}About SSL, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/rtmp-handshake\${BLACK}"
43-
echo -e " | ${SrsTranscodeSummaryColor}About transcoding, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/ffmpeg\${BLACK}"
44-
echo -e " | ${SrsIngestSummaryColor}About ingester, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/ingest\${BLACK}"
45-
echo -e " | ${SrsHttpCallbackSummaryColor}About http-callback, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-callback\${BLACK}"
46-
echo -e " | ${SrsHttpServerSummaryColor}Aoubt http-server, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-server\${BLACK}"
47-
echo -e " | ${SrsHttpApiSummaryColor}About http-api, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-api\${BLACK}"
48-
echo -e " | ${SrsStreamConverterSummaryColor}About stream-caster, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/streamer\${BLACK}"
40+
echo -e " | ${SrsHlsSummaryColor}About HLS, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/hls\${BLACK}"
41+
echo -e " | ${SrsDvrSummaryColor}About DVR, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/dvr\${BLACK}"
42+
echo -e " | ${SrsSslSummaryColor}About SSL, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/rtmp-handshake\${BLACK}"
43+
echo -e " | ${SrsTranscodeSummaryColor}About transcoding, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/ffmpeg\${BLACK}"
44+
echo -e " | ${SrsIngestSummaryColor}About ingester, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/ingest\${BLACK}"
45+
echo -e " | ${SrsHttpCallbackSummaryColor}About http-callback, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-callback\${BLACK}"
46+
echo -e " | ${SrsHttpServerSummaryColor}Aoubt http-server, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-server\${BLACK}"
47+
echo -e " | ${SrsHttpApiSummaryColor}About http-api, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-api\${BLACK}"
48+
echo -e " | ${SrsStreamConverterSummaryColor}About stream-caster, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/streamer\${BLACK}"
4949
echo -e " | ${SrsValgrindSummaryColor}About VALGRIND, please read https://github.com/ossrs/state-threads/issues/2\${BLACK}"
5050
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
51-
echo -e "\${GREEN}binaries, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/install\${BLACK}"
51+
echo -e "\${GREEN}binaries, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/install\${BLACK}"
5252
5353
echo "You can:"
5454
echo " ./objs/srs -c conf/srs.conf"

‎trunk/configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ install:
670670
@mkdir -p \$(__REAL_INSTALL)/usr/lib/systemd/system
671671
@cp -f usr/lib/systemd/system/srs.service \$(__REAL_INSTALL)/usr/lib/systemd/system/srs.service
672672
@echo ""
673-
@echo "@see: https://ossrs.net/lts/zh-cn/docs/v4/doc/service"
673+
@echo "@see: https://ossrs.net/lts/zh-cn/docs/v7/doc/service"
674674
675675
END
676676

‎trunk/doc/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v7-changes"></a>
88

99
## SRS 7.0 Changelog
10+
* v7.0, 2025-03-21, Merge [#4294](https://github.com/ossrs/srs/pull/4294): Build: update build version to v7. v7.0.29 (#4294)
1011
* v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.28 (#4303)
1112
* v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.27 (#4303)
1213
* v7.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v7.0.26 (#4305)

‎trunk/ide/srs_clion/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ TARGET_LINK_LIBRARIES(utest -fsanitize=address -fno-omit-frame-pointer)
110110

111111
###########################################################
112112
# Done
113-
MESSAGE(STATUS "@see https://ossrs.net/lts/zh-cn/docs/v5/doc/ide")
113+
MESSAGE(STATUS "@see https://ossrs.net/lts/zh-cn/docs/v7/doc/ide")
114114

‎trunk/src/core/srs_core_version7.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 7
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 28
12+
#define VERSION_REVISION 29
1313

1414
#endif

0 commit comments

Comments
 (0)