From e1ff69f292ead7b660241495c1b466739b310b47 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 21:14:40 +0800 Subject: [PATCH] Refine build script, use libssl in docker. 3.0.146 --- README.md | 1 + trunk/auto/depends.sh | 4 ++-- trunk/src/core/srs_core_version3.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c8e5be6a..d45fecb37 100755 --- a/README.md +++ b/README.md @@ -145,6 +145,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 b5d5aa627..0fbe764df 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -447,9 +447,9 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then OPENSSL_CONFIG="./Configure linux-armv4" else # If not crossbuild, try to use exists libraries. - if [[ -f /usr/local/lib64/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then + if [[ -f /usr/local/ssl/lib/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/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) + ln -sf /usr/local/ssl/lib/libssl.a && ln -sf /usr/local/ssl/lib/libcrypto.a) (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && ln -sf /usr/local/include/openssl) fi 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