From d0fd0c4639cf1b175611062697c55c53abd72419 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 25 Apr 2021 08:59:26 +0800
Subject: [PATCH 1/3] SquashSRS4: Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f67cfa179..769a7e18a 100755
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@
 [![](https://codecov.io/gh/ossrs/srs/branch/develop/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/develop)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 
-SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181/RTSP。
+SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181。
 
-SRS is a simple, high efficiency and realtime video server, supports RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181/RTSP.
+SRS is a simple, high efficiency and realtime video server, supports RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181.
 
 > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].
 

From 00a8eef580a0931a46eeb7690918ef8e39cdcfe3 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 25 Apr 2021 12:07:00 +0800
Subject: [PATCH 2/3] Fix utest fail

---
 trunk/auto/utest.sh | 12 ++++++++----
 trunk/configure     |  6 ++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh
index f29d698ba..970d93844 100755
--- a/trunk/auto/utest.sh
+++ b/trunk/auto/utest.sh
@@ -118,7 +118,11 @@ done
 #
 # depends library header files
 for item in ${ModuleLibIncs[*]}; do
-    echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
+    if [[ "${item:0:1}" == "/" ]]; then
+        echo -n "-I${item} " >> ${FILE}
+    else
+        echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
+    fi
 done
 echo "" >> ${FILE}; echo "" >> ${FILE}
 
@@ -164,10 +168,10 @@ echo "" >> ${FILE}
 echo "# link all depends libraries" >> ${FILE}
 echo -n "DEPS_LIBRARIES_FILES = " >> ${FILE}
 for item in ${ModuleLibFiles[*]}; do
-    if [[ -f ${item} ]]; then
-        echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
-    else
+    if [[ "${item:0:1}" == "/" ]]; then
         echo -n "${item} " >> ${FILE}
+    else
+        echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
     fi
 done
 echo "" >> ${FILE}; echo "" >> ${FILE}
diff --git a/trunk/configure b/trunk/configure
index 6d6ca4a11..b77baca7b 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -395,6 +395,9 @@ fi
 if [[ $SRS_FFMPEG_FIT == YES ]]; then
     ModuleLibFiles+=("${LibFfmpegFile[*]}")
 fi
+if [[ $SRS_GB28181 == YES ]]; then
+    ModuleLibFiles+=("${LibIconvfile[*]}")
+fi
 #
 for SRS_MODULE in ${SRS_MODULES[*]}; do
     . auto/reset_module.sh && . $SRS_MODULE/config
@@ -433,6 +436,9 @@ if [ $SRS_UTEST = YES ]; then
     if [[ $SRS_SRT == YES ]]; then
         ModuleLibFiles+=("${LibSRTfile[*]}")
     fi
+    if [[ $SRS_GB28181 == YES ]]; then
+        ModuleLibFiles+=("${LibIconvfile[*]}")
+    fi
     MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
     if [[ $SRS_SRT == YES ]]; then
         MODULE_DEPENDS+=("SRT")

From f9d9f3a373f3e9204001e50e109c3ddfe9ee2ab7 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 25 Apr 2021 13:34:57 +0800
Subject: [PATCH 3/3] Modules: Fix build fail for global variables.

---
 trunk/src/main/srs_main_ingest_hls.cpp | 3 +++
 trunk/src/main/srs_main_mp4_parser.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
index cbc69119b..6eda7b2bd 100644
--- a/trunk/src/main/srs_main_ingest_hls.cpp
+++ b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -58,6 +58,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
 // @global config object for app module.
 SrsConfig* _srs_config = new SrsConfig();
 
+// @global Other variables.
+bool _srs_in_docker = false;
+
 /**
  * main entrance.
  */
diff --git a/trunk/src/main/srs_main_mp4_parser.cpp b/trunk/src/main/srs_main_mp4_parser.cpp
index d9ecc36e5..a7aec32d4 100644
--- a/trunk/src/main/srs_main_mp4_parser.cpp
+++ b/trunk/src/main/srs_main_mp4_parser.cpp
@@ -44,6 +44,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
 // @global config object for app module.
 SrsConfig* _srs_config = new SrsConfig();
 
+// @global Other variables.
+bool _srs_in_docker = false;
+
 srs_error_t parse(std::string mp4_file, bool verbose)
 {
     srs_error_t err = srs_success;