Fix #1221, remove complex configure options. 3.0.104

ossrs · Jan 21, 2020 · ba61fe8 · ba61fe8
1 parent 0df1087
commit ba61fe8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -146,6 +146,7 @@ For previous versions, please read:
 
 ## V3 changes
 
+* v3.0, 2020-01-21, Fix [#1221][bug #1221], remove complex configure options. 3.0.104
 * v3.0, 2020-01-21, Fix [#1547][bug #1547], support crossbuild for ARM/MIPS.
 * v3.0, 2020-01-21, For [#1547][bug #1547], support setting cc/cxx/ar/ld/randlib tools. 3.0.103
 * v3.0, 2020-01-19, For [#1580][bug #1580], fix cid range problem. 3.0.102
@@ -1605,6 +1606,7 @@ Winlin
 [bug #1070]: https://github.com/ossrs/srs/issues/1070
 [bug #1580]: https://github.com/ossrs/srs/issues/1580
 [bug #1547]: https://github.com/ossrs/srs/issues/1547
+[bug #1221]: https://github.com/ossrs/srs/issues/1221
 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -320,7 +320,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
 fi
 
 #####################################################################################
-# openssl, for rtmp complex handshake
+# openssl, for rtmp complex handshake and HLS encryption.
 #####################################################################################
 if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == YES ]]; then
     echo "Warning: Use system libssl, without compiling openssl."
@@ -364,10 +364,11 @@ fi
 #####################################################################################
 # live transcoding, ffmpeg-4.1, x264-core157, lame-3.99.5, libaacplus-2.0.2.
 #####################################################################################
+# Always link the ffmpeg tools if exists.
+if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then
+    mkdir -p ${SRS_OBJS}/ffmpeg/bin && ln -sf /usr/local/bin/ffmpeg ${SRS_OBJS}/ffmpeg/bin/ffmpeg
+fi
 if [ $SRS_FFMPEG_TOOL = YES ]; then
-    if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then
-        mkdir -p ${SRS_OBJS}/ffmpeg/bin && ln -sf /usr/local/bin/ffmpeg ${SRS_OBJS}/ffmpeg/bin/ffmpeg
-    fi
     if [[ -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then
         echo "ffmpeg-4.1 is ok.";
     else

diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
@@ -219,15 +219,10 @@ function parse_user_option() {
         --with-gprof)                   SRS_GPROF=YES               ;;
         --with-arm-ubuntu12)            SRS_CROSS_BUILD=YES         ;;
         --with-mips-ubuntu12)           SRS_CROSS_BUILD=YES         ;;
-
-        --without-ssl)                  SRS_SSL=NO                  ;;
+
         --without-hds)                  SRS_HDS=NO                  ;;
         --without-nginx)                SRS_NGINX=NO                ;;
         --without-ffmpeg)               SRS_FFMPEG_TOOL=NO          ;;
-        --without-transcode)            SRS_TRANSCODE=NO            ;;
-        --without-ingest)               SRS_INGEST=NO               ;;
-        --without-stat)                 SRS_STAT=NO                 ;;
-        --without-stream-caster)        SRS_STREAM_CASTER=NO        ;;
         --without-librtmp)              SRS_LIBRTMP=NO              ;;
         --without-research)             SRS_RESEARCH=NO             ;;
         --without-utest)                SRS_UTEST=NO                ;;
@@ -283,11 +278,19 @@ function parse_user_option() {
         --with-http-server)             SRS_HTTP_SERVER=YES         ;;
         --with-hls)                     SRS_HLS=YES                 ;;
         --with-dvr)                     SRS_DVR=YES                 ;;
-        --without-http-callback)        SRS_HTTP_CALLBACK=NO        ;;
-        --without-http-api)             SRS_HTTP_API=NO             ;;
-        --without-http-server)          SRS_HTTP_SERVER=NO          ;;
-        --without-hls)                  SRS_HLS=NO                  ;;
-        --without-dvr)                  SRS_DVR=NO                  ;;
+
+        --without-stream-caster) ;&
+        --without-ingest) ;&
+        --without-ssl) ;&
+        --without-stat) ;&
+        --without-transcode) ;&
+        --without-http-callback) ;&
+        --without-http-server) ;&
+        --without-http-api) ;&
+        --without-hls) ;&
+        --without-dvr)
+            echo "ignore option \"$option\""
+        ;;
 
         *)
             echo "$0: error: invalid option \"$option\""

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
@@ -27,7 +27,7 @@
 // The version config.
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
-#define VERSION_REVISION    103
+#define VERSION_REVISION    104
 
 // The macros generated by configure script.
 #include <srs_auto_headers.hpp>

diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
@@ -119,7 +119,7 @@ srs_error_t do_main(int argc, char** argv)
 
     // config already applied to log.
     srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE);
-    srs_trace("contributors: " SRS_AUTO_CONSTRIBUTORS);
+    srs_trace("contributors: %s", SRS_AUTO_CONSTRIBUTORS);
     srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s",
         _srs_config->cwd().c_str(), cwd.c_str(), SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME);
     srs_trace("configure detail: " SRS_AUTO_CONFIGURE);