diff --git a/CHANGELOG.md b/CHANGELOG.md index cc794932d..4209f50f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-07-25, Fix build failed. 4.0.146 * v4.0, 2021-07-24, Merge [#2373](https://github.com/ossrs/srs/pull/2373), RTC: Fix NACK negotiation bug for Firefox. 4.0.145 * v4.0, 2021-07-24, Merge [#2483](https://github.com/ossrs/srs/pull/2483), RTC: Support statistic for HTTP-API, HTTP-Callback and Security. 4.0.144 * v4.0, 2021-07-21, Merge [#2474](https://github.com/ossrs/srs/pull/2474), SRT: Use thread-safe log for multiple-threading SRT module. 4.0.143 diff --git a/README.md b/README.md index 9e77bdad2..0f628eacb 100755 --- a/README.md +++ b/README.md @@ -219,6 +219,7 @@ Please read [CHANGELOG](CHANGELOG.md#changelog). ## Releases +* 2020-07-25, Release [v4.0.146](https://github.com/ossrs/srs/releases/tag/v4.0.146), 4.0 dev1, v4.0.146, 144026 lines. * 2020-07-04, Release [v4.0.139](https://github.com/ossrs/srs/releases/tag/v4.0.139), 4.0 dev0, v4.0.139, 143245 lines. * 2020-06-27, [Release v3.0-r0][r3.0r0], 3.0 release0, 3.0.141, 122674 lines. * 2020-03-29, [Release v3.0-b3][r3.0b4], 3.0 beta4, 3.0.139, 122674 lines. diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 0bba98f8f..fac9b4583 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -503,8 +503,6 @@ if [[ $SRS_CHERRYPY == YES ]]; then echo "Link players to cherrypy static-dir" rm -rf research/api-server/static-dir/players && ln -sf `pwd`/research/players research/api-server/static-dir/players && - rm -f research/api-server/static-dir/crossdomain.xml && - ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml && rm -rf research/api-server/static-dir/live && mkdir -p `pwd`/${SRS_OBJS}/nginx/html/live && ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live && diff --git a/trunk/configure b/trunk/configure index 911e2c242..df28f047e 100755 --- a/trunk/configure +++ b/trunk/configure @@ -575,7 +575,7 @@ install: @echo "Now make the http root dir" @mkdir -p \$(__REAL_INSTALL)/objs/nginx/html @cp -f research/api-server/static-dir/index.html \$(__REAL_INSTALL)/objs/nginx/html - @cp -f research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html + @cp -f research/players/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html @cp -f research/api-server/static-dir/favicon.ico \$(__REAL_INSTALL)/objs/nginx/html @cp -Rf research/players \$(__REAL_INSTALL)/objs/nginx/html/ @cp -Rf research/console \$(__REAL_INSTALL)/objs/nginx/html/ diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index d11822368..cea4ed720 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 145 +#define VERSION_REVISION 146 #endif