diff --git a/README.md b/README.md index 5d4aace86..93d739436 100755 --- a/README.md +++ b/README.md @@ -201,6 +201,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-23, Refine build script, use libssl in docker. 3.0.146 * v3.0, 2020-10-14, Fix [#1987][bug #1987], Fix Kbps resample bug. 3.0.145 * 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 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index d646dbf33..5e4b29c32 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -475,15 +475,7 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then if [[ $SRS_CROSS_BUILD == YES ]]; then OPENSSL_CONFIG="./Configure linux-armv4" elif [[ ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then - # For older docker, which does not support SRTP asm optimization. - if [[ -f /usr/local/lib64/libssl.a ]]; then - (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && - ln -sf /usr/local/lib64/libssl.a && ln -sf /usr/local/lib64/libcrypto.a && - mkdir -p /usr/local/lib64/pkgconfig && ln -sf /usr/local/lib64/pkgconfig) - (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && - ln -sf /usr/local/include/openssl) - fi - # Try to use files for openssl 1.0.* + # Try to use exists libraries. if [[ -f /usr/local/ssl/lib/libssl.a ]]; then (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && ln -sf /usr/local/ssl/lib/libssl.a && ln -sf /usr/local/ssl/lib/libcrypto.a && diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index da062849a..736547445 100644 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -5,6 +5,7 @@ listen 1935; max_connections 1000; srs_log_tank file; srs_log_file ./objs/srs.log; +daemon on; http_api { enabled on; listen 1985; @@ -19,4 +20,11 @@ stats { disk sda sdb xvda xvdb; } vhost __defaultVhost__ { + hls { + enabled on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } } diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 6b933fbfc..4f18f8a52 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 145 +#define SRS_VERSION3_REVISION 146 #endif