diff --git a/README.md b/README.md index 5d170ac25..a19b56fc4 100755 --- a/README.md +++ b/README.md @@ -388,6 +388,8 @@ Supported operating systems and hardware: ## History +* v1.0, 2015-03-17, remove the osx for 1.0.30. +* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. * v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines. * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. * v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 05ccc196d..b5659d2da 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -299,6 +299,11 @@ function OSX_prepare() } OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi +# by winlin, disable other system. +if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $SRS_EMBEDED_CPU = NO ]]; then + echo "only support Centos and Ubuntu, actual is `uname -s`" + exit 1 +fi ##################################################################################### # st-1.9 diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 66d358edd..8110b5f3b 100644 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -161,7 +161,6 @@ Options: Presets: --x86-x64 [default] for x86/x64 cpu, common pc and servers. - --osx for IOS(darwin) to build SRS. --pi for raspberry-pi(directly build), open features hls/ssl/static. --cubie for cubieboard(directly build), open features except ffmpeg/nginx. --arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild @@ -252,7 +251,6 @@ function parse_user_option() { --log-trace) SRS_LOG_TRACE=YES ;; --x86-x64) SRS_X86_X64=YES ;; - --osx) SRS_OSX=YES ;; --arm) SRS_ARM_UBUNTU12=YES ;; --mips) SRS_MIPS_UBUNTU12=YES ;; --pi) SRS_PI=YES ;; diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index bc18333f0..99fc70028 100644 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -120,7 +120,11 @@ void SrsThread::stop() st_thread_interrupt(tid); // wait the thread to exit. - st_thread_join(tid, NULL); + int ret = st_thread_join(tid, NULL); + // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. + if (ret != 0) { + srs_warn("join thread failed. code=%d", ret); + } tid = NULL; } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 6109a6454..10f705ee2 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 1 #define VERSION_MINOR 0 -#define VERSION_REVISION 27 +#define VERSION_REVISION 30 // server info. #define RTMP_SIG_SRS_KEY "SRS"