From b4b79179a7393f98ef7b6f0d26e36a2924dcc1ad Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Apr 2021 15:52:28 +0800 Subject: [PATCH 1/2] SuqashSRS4: Update players --- README.md | 4 ++++ trunk/auto/depends.sh | 4 +--- trunk/src/core/srs_core_version3.hpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1a5e5d217..6119ddd47 100755 --- a/README.md +++ b/README.md @@ -244,6 +244,8 @@ Other important wiki: ## V3 changes +* v3.0, 2021-04-28, [3.0 release5(3.0.161)][r3.0r5] released. 122750 lines. +* v3.0, 2021-04-28, Upgrade players. 3.0.161 * v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines. * v3.0, 2021-04-24, Package players and console to zip and docker. 3.0.160 * v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159 @@ -882,6 +884,7 @@ Other important wiki: ## Releases +* 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines. * 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines. * 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines. * 2020-10-31, [Release v3.0-r2][r3.0r2], 3.0 release2, 3.0.153, 122663 lines. @@ -1873,6 +1876,7 @@ Winlin [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r3.0r5]: https://github.com/ossrs/srs/releases/tag/v3.0-r5 [r3.0r4]: https://github.com/ossrs/srs/releases/tag/v3.0-r4 [r3.0r3]: https://github.com/ossrs/srs/releases/tag/v3.0-r3 [r3.0r2]: https://github.com/ossrs/srs/releases/tag/v3.0-r2 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 0f6ee1a8d..3d67b4998 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -422,9 +422,7 @@ html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=l # copy players to nginx html dir. rm -rf ${SRS_OBJS}/nginx/html/players && -ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && -rm -f ${SRS_OBJS}/nginx/crossdomain.xml && -ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml +ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players # for favicon.ico rm -rf ${SRS_OBJS}/nginx/html/favicon.ico && diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 0283d647b..dce1ed4d0 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define SRS_VERSION3_REVISION 160 +#define SRS_VERSION3_REVISION 161 #endif From 84e649be8bbb2ecec95b2b8d3f406fd6a20c17da Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Apr 2021 17:19:24 +0800 Subject: [PATCH 2/2] SquashSRS4: Update gitee url --- README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6119ddd47..6e6daf59c 100755 --- a/README.md +++ b/README.md @@ -43,9 +43,8 @@ Play the following streams by [players](https://ossrs.net): It's also very easy to build from source: ``` -git clone -b develop https://gitee.com/winlinvip/srs.oschina.git srs && -cd srs/trunk && git remote set-url origin https://github.com/ossrs/srs.git && -./configure && make && ./objs/srs -c conf/srs.conf +git clone -b develop https://gitee.com/ossrs/srs.git srs && +cd srs/trunk && ./configure && make && ./objs/srs -c conf/srs.conf ``` > Note: We use [mirrors(gitee)](#mirrors) here, but it's also ok to `git clone https://github.com/ossrs/srs.git` @@ -1275,10 +1274,10 @@ A big THANK YOU goes to: ## Mirrors -OSChina: [https://gitee.com/winlinvip/srs.oschina][oschina], the GIT usage([CN][v4_CN_Git], [EN][v4_EN_Git]) +Gitee: [https://gitee.com/ossrs/srs][gitee], the GIT usage([CN][v4_CN_Git], [EN][v4_EN_Git]) ``` -git clone https://gitee.com/winlinvip/srs.oschina.git srs && +git clone https://gitee.com/ossrs/srs.git && cd srs && git remote set-url origin https://github.com/ossrs/srs.git && git pull ``` @@ -1299,12 +1298,12 @@ git clone https://github.com/ossrs/srs.git | Branch | Cost | Size | CMD | | --- | --- | --- | --- | -| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/winlinvip/srs.oschina.git | -| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/winlinvip/srs.oschina.git | -| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/winlinvip/srs.oschina.git | -| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/winlinvip/srs.oschina.git | -| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/winlinvip/srs.oschina.git | -| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/winlinvip/srs.oschina.git | +| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/ossrs/srs.git | +| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/ossrs/srs.git | +| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/ossrs/srs.git | +| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/ossrs/srs.git | +| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/ossrs/srs.git | +| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/ossrs/srs.git | ## System Requirements @@ -1355,7 +1354,7 @@ Winlin [libx264]: http://www.videolan.org/ [srs]: https://github.com/ossrs/srs [csdn]: https://code.csdn.net/winlinvip/srs-csdn -[oschina]: https://gitee.com/winlinvip/srs.oschina +[gitee]: https://gitee.com/ossrs/srs [srs-dolphin]: https://github.com/ossrs/srs-dolphin [oryx]: https://github.com/ossrs/go-oryx [srs-bench]: https://github.com/ossrs/srs-bench