From 13af54171f2f809015560db88a55252c28c9ab85 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 10 Oct 2020 16:20:05 +0800 Subject: [PATCH 1/4] For #1780, build fail on ubuntu:focal. 3.0.144 --- trunk/src/core/srs_core.hpp | 2 +- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/protocol/srs_protocol_utility.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 9a60cb8c5..fb6699fe5 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -48,7 +48,7 @@ // The current stable release. #define VERSION_STABLE 2 -#define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE)".0release" +#define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE) ".0release" // For 32bit os, 2G big file limit for unistd io, // ie. read/write/lseek to use 64bits size for huge file. diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 1d91b72bd..fb9dd07ff 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -125,7 +125,7 @@ srs_utime_t srs_get_system_startup_time() // For utest to mock it. #ifndef SRS_AUTO_OSX -_srs_gettimeofday_t _srs_gettimeofday = ::gettimeofday; +_srs_gettimeofday_t _srs_gettimeofday = (_srs_gettimeofday_t)::gettimeofday; #endif srs_utime_t srs_update_system_time() diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp index 2582a0c1a..57e65ecf0 100644 --- a/trunk/src/protocol/srs_protocol_utility.cpp +++ b/trunk/src/protocol/srs_protocol_utility.cpp @@ -122,7 +122,7 @@ void srs_discovery_tc_url(string tcUrl, string& schema, string& host, string& vh srs_vhost_resolve(vhost, stream, param); // Ignore when the param only contains the default vhost. - if (param == "?vhost="SRS_CONSTS_RTMP_DEFAULT_VHOST) { + if (param == "?vhost=" SRS_CONSTS_RTMP_DEFAULT_VHOST) { param = ""; } } From 726ac03e2279793ba513493a2dfaa9cda7a078fa Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 10 Oct 2020 16:38:59 +0800 Subject: [PATCH 2/4] Change stable release to 3.0 --- trunk/configure | 2 +- trunk/src/core/srs_core.hpp | 2 +- trunk/src/main/srs_main_server.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/configure b/trunk/configure index 3566c7816..36b90ae10 100755 --- a/trunk/configure +++ b/trunk/configure @@ -401,7 +401,7 @@ destroy: clean_st clean_openssl clean_ffmpeg clean_nginx clean_cherrypy clean_srs: (cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest) - (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf src include lib utest) + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf src/* include/* lib/* utest/*) clean_modules: (cd ${SRS_OBJS_DIR} && rm -rf $__mdefaults) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index fb6699fe5..664e1484a 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -47,7 +47,7 @@ #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY "/" RTMP_SIG_SRS_VERSION "(" RTMP_SIG_SRS_CODE ")" // The current stable release. -#define VERSION_STABLE 2 +#define VERSION_STABLE 3 #define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE) ".0release" // For 32bit os, 2G big file limit for unistd io, diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index d5cdbd182..17752e6d7 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -331,8 +331,8 @@ void show_macro_features() #endif #if VERSION_MAJOR > VERSION_STABLE - #warning "Current branch is beta." - srs_warn("%s/%s is beta", RTMP_SIG_SRS_KEY, RTMP_SIG_SRS_VERSION); + #warning "Current branch is not stable." + srs_warn("%s/%s is not stable", RTMP_SIG_SRS_KEY, RTMP_SIG_SRS_VERSION); #endif #if defined(SRS_PERF_SO_SNDBUF_SIZE) && !defined(SRS_PERF_MW_SO_SNDBUF) From 5342596fc07de2f524dcf9be3b4283ec3dd4146d Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 10 Oct 2020 16:47:25 +0800 Subject: [PATCH 3/4] Update README for #1780 --- README.md | 2 ++ trunk/src/core/srs_core_version3.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7783cd0e1..a8e8f4e14 100755 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-10, Fix [#1780][bug #1780], build fail on Ubuntu20(focal). 3.0.144 * v3.0, 2020-09-14, Prevent stop ingest for multiple times. 3.0.143 * v3.0, 2020-09-10, RTC: Change SO_REUSEPORT fail to warning. 3.0.142 * v3.0, 2020-06-27, [3.0 release0(3.0.141)][r3.0r0] released. 122674 lines. @@ -1695,6 +1696,7 @@ Winlin [bug #1651]: https://github.com/ossrs/srs/issues/1651 [bug #1619]: https://github.com/ossrs/srs/issues/1619 [bug #1629]: https://github.com/ossrs/srs/issues/1629 +[bug #1780]: https://github.com/ossrs/srs/issues/1780 [bug #yyyyyyyyyyyyy]: https://github.com/ossrs/srs/issues/yyyyyyyyyyyyy [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index b5a54ac4b..ef1590d42 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 143 +#define SRS_VERSION3_REVISION 144 #endif From 3809d43ee5a721f25d4d3ca985dfffd306d22166 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 10 Oct 2020 16:50:19 +0800 Subject: [PATCH 4/4] Release 3.0r1, 3.0.144 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a8e8f4e14..a39abde0b 100755 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-10, [3.0 release1(3.0.144)][r3.0r1] released. 122674 lines. * v3.0, 2020-10-10, Fix [#1780][bug #1780], build fail on Ubuntu20(focal). 3.0.144 * v3.0, 2020-09-14, Prevent stop ingest for multiple times. 3.0.143 * v3.0, 2020-09-10, RTC: Change SO_REUSEPORT fail to warning. 3.0.142 @@ -767,6 +768,7 @@ For previous versions, please read: ## Releases +* 2020-10-10, [Release v3.0-r1][r3.0r1], 3.0 release1, 3.0.144, 122674 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. * 2020-03-18, [Release v3.0-b3][r3.0b3], 3.0 beta3, 3.0.134, 122509 lines. @@ -1701,6 +1703,7 @@ Winlin [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r3.0r1]: https://github.com/ossrs/srs/releases/tag/v3.0-r1 [r3.0r0]: https://github.com/ossrs/srs/releases/tag/v3.0-r0 [r3.0b4]: https://github.com/ossrs/srs/releases/tag/v3.0-b4 [r3.0b3]: https://github.com/ossrs/srs/releases/tag/v3.0-b3