From e2461cd16d8d2c586267cd08d2fe75f4a1445890 Mon Sep 17 00:00:00 2001 From: chundonglinlin Date: Fri, 21 Mar 2025 19:15:05 +0800 Subject: [PATCH] Build: update build version to v7. v7.0.29 (#4294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the prompt document address to the latest version v7. --------- Co-authored-by: Haibo Chen <495810242@qq.com> Co-authored-by: winlin --------- Co-authored-by: Haibo Chen(陈海博) <495810242@qq.com> Co-authored-by: john --- trunk/auto/options.sh | 6 +++--- trunk/auto/summary.sh | 22 +++++++++++----------- trunk/configure | 2 +- trunk/doc/CHANGELOG.md | 1 + trunk/ide/srs_clion/CMakeLists.txt | 2 +- trunk/src/core/srs_core_version7.hpp | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index e5dcfeda9..e7a512909 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -194,7 +194,7 @@ Features: --jobs[=N] Allow N jobs at once; infinite jobs with no arg. Default: $SRS_JOBS --config= The default config file for SRS. Default: $SRS_DEFAULT_CONFIG -Performance: @see https://ossrs.net/lts/zh-cn/docs/v5/doc/performance +Performance: @see https://ossrs.net/lts/zh-cn/docs/v7/doc/performance --valgrind=on|off Whether build valgrind for memory check. Default: $(value2switch $SRS_VALGRIND) --gperf=on|off Whether build SRS with gperf tools(no gmd/gmc/gmp/gcp, with tcmalloc only). Default: $(value2switch $SRS_GPERF) --gmc=on|off Whether build memory check with gperf tools. Default: $(value2switch $SRS_GPERF_MC) @@ -218,7 +218,7 @@ Toolchain options: --extra-flags= Set EFLAGS as CFLAGS and CXXFLAGS. Also passed to ST as EXTRA_CFLAGS. --extra-ldflags= Set ELDFLAGS as LDFLAGS. -Cross Build options: @see https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs +Cross Build options: @see https://ossrs.net/lts/zh-cn/docs/v7/doc/arm#ubuntu-cross-build-srs --cross=on|off Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD) --cpu= Toolchain: Select the minimum required CPU for cross-build. For example: --cpu=24kc --arch= Toolchain: Select architecture for cross-build. For example: --arch=aarch64 @@ -297,7 +297,7 @@ function parse_user_option() { fi if [[ $option == '--arm' || $option == '--mips' || $option == '--with-arm-ubuntu12' || $option == '--with-mips-ubuntu12' ]]; then - echo "Error: Removed misleading option $option, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs" + echo "Error: Removed misleading option $option, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/arm#ubuntu-cross-build-srs" exit -1 fi diff --git a/trunk/auto/summary.sh b/trunk/auto/summary.sh index 6a27fb18b..bb8f1d331 100755 --- a/trunk/auto/summary.sh +++ b/trunk/auto/summary.sh @@ -34,21 +34,21 @@ BLACK="\\${BLACK}" echo -e "\${GREEN}The build summary:\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${GREEN}For SRS benchmark, gperf, gprof and valgrind, please read:\${BLACK}" -echo -e " \${GREEN} https://www.jianshu.com/p/6d4a89359352\${BLACK}" +echo -e " \${GREEN} https://ossrs.net/lts/zh-cn/docs/v7/doc/performance\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " |\${GREEN}The main server usage: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" -echo -e " | ${SrsHlsSummaryColor}About HLS, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-hls\${BLACK}" -echo -e " | ${SrsDvrSummaryColor}About DVR, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr\${BLACK}" -echo -e " | ${SrsSslSummaryColor}About SSL, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/rtmp-handshake\${BLACK}" -echo -e " | ${SrsTranscodeSummaryColor}About transcoding, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/ffmpeg\${BLACK}" -echo -e " | ${SrsIngestSummaryColor}About ingester, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/ingest\${BLACK}" -echo -e " | ${SrsHttpCallbackSummaryColor}About http-callback, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-callback\${BLACK}" -echo -e " | ${SrsHttpServerSummaryColor}Aoubt http-server, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-server\${BLACK}" -echo -e " | ${SrsHttpApiSummaryColor}About http-api, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/http-api\${BLACK}" -echo -e " | ${SrsStreamConverterSummaryColor}About stream-caster, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/streamer\${BLACK}" +echo -e " | ${SrsHlsSummaryColor}About HLS, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/hls\${BLACK}" +echo -e " | ${SrsDvrSummaryColor}About DVR, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/dvr\${BLACK}" +echo -e " | ${SrsSslSummaryColor}About SSL, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/rtmp-handshake\${BLACK}" +echo -e " | ${SrsTranscodeSummaryColor}About transcoding, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/ffmpeg\${BLACK}" +echo -e " | ${SrsIngestSummaryColor}About ingester, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/ingest\${BLACK}" +echo -e " | ${SrsHttpCallbackSummaryColor}About http-callback, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-callback\${BLACK}" +echo -e " | ${SrsHttpServerSummaryColor}Aoubt http-server, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-server\${BLACK}" +echo -e " | ${SrsHttpApiSummaryColor}About http-api, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/http-api\${BLACK}" +echo -e " | ${SrsStreamConverterSummaryColor}About stream-caster, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/streamer\${BLACK}" echo -e " | ${SrsValgrindSummaryColor}About VALGRIND, please read https://github.com/ossrs/state-threads/issues/2\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e "\${GREEN}binaries, please read https://ossrs.net/lts/zh-cn/docs/v4/doc/install\${BLACK}" +echo -e "\${GREEN}binaries, please read https://ossrs.net/lts/zh-cn/docs/v7/doc/install\${BLACK}" echo "You can:" echo " ./objs/srs -c conf/srs.conf" diff --git a/trunk/configure b/trunk/configure index b7f004059..49a645e86 100755 --- a/trunk/configure +++ b/trunk/configure @@ -670,7 +670,7 @@ install: @mkdir -p \$(__REAL_INSTALL)/usr/lib/systemd/system @cp -f usr/lib/systemd/system/srs.service \$(__REAL_INSTALL)/usr/lib/systemd/system/srs.service @echo "" - @echo "@see: https://ossrs.net/lts/zh-cn/docs/v4/doc/service" + @echo "@see: https://ossrs.net/lts/zh-cn/docs/v7/doc/service" END diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index d4a766a16..7d10a018c 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 7.0 Changelog +* v7.0, 2025-03-21, Merge [#4294](https://github.com/ossrs/srs/pull/4294): Build: update build version to v7. v7.0.29 (#4294) * v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.28 (#4303) * v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.27 (#4303) * v7.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v7.0.26 (#4305) diff --git a/trunk/ide/srs_clion/CMakeLists.txt b/trunk/ide/srs_clion/CMakeLists.txt index 63cb7fd7a..6b55c6652 100755 --- a/trunk/ide/srs_clion/CMakeLists.txt +++ b/trunk/ide/srs_clion/CMakeLists.txt @@ -110,5 +110,5 @@ TARGET_LINK_LIBRARIES(utest -fsanitize=address -fno-omit-frame-pointer) ########################################################### # Done -MESSAGE(STATUS "@see https://ossrs.net/lts/zh-cn/docs/v5/doc/ide") +MESSAGE(STATUS "@see https://ossrs.net/lts/zh-cn/docs/v7/doc/ide") diff --git a/trunk/src/core/srs_core_version7.hpp b/trunk/src/core/srs_core_version7.hpp index 1d74c7fb6..4044c53f2 100644 --- a/trunk/src/core/srs_core_version7.hpp +++ b/trunk/src/core/srs_core_version7.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 7 #define VERSION_MINOR 0 -#define VERSION_REVISION 28 +#define VERSION_REVISION 29 #endif \ No newline at end of file