Support macOS OSX

trunk/3rdparty/st-srs/Makefile

@@ -128,6 +128,7 @@ OTHER_FLAGS = -Wall
 endif
 
 ifeq ($(OS), DARWIN)
+EXTRA_OBJS  = $(TARGETDIR)/md_darwin.o
 LD          = cc
 SFLAGS      = -fPIC -fno-common
 DSO_SUFFIX  = dylib
@@ -139,8 +140,8 @@ CFLAGS      += -arch ppc
 LDFLAGS     += -arch ppc
 endif
 ifeq ($(INTEL), yes)
-CFLAGS      += -arch i386 -arch x86_64
-LDFLAGS     += -arch i386 -arch x86_64
+CFLAGS      += -arch x86_64
+LDFLAGS     += -arch x86_64
 endif
 LDFLAGS     += -dynamiclib -install_name /sw/lib/libst.$(MAJOR).$(DSO_SUFFIX) -compatibility_version $(MAJOR) -current_version $(VERSION)
 OTHER_FLAGS = -Wall
@@ -313,7 +314,9 @@ endif
 # for SRS
 # disable examples for ubuntu crossbuild failed.
 # @see https://github.com/winlinvip/simple-rtmp-server/issues/308
+ifeq ($(OS), LINUX)
 EXAMPLES =
+endif
 
 ifeq ($(OS), DARWIN)
 LINKNAME    = libst.$(DSO_SUFFIX)
@@ -369,10 +372,13 @@ $(HEADER): public.h
 $(TARGETDIR)/md.o: md.S
 	$(CC) $(CFLAGS) -c $< -o $@
 
+$(TARGETDIR)/md_darwin.o: md_darwin.S
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(TARGETDIR)/%.o: %.c common.h md.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
-examples::
+examples: $(SLIBRARY)
 	@echo Making $@
 	@cd $@; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" OS="$(OS)" TARGETDIR="$(TARGETDIR)"
 

trunk/3rdparty/st-srs/md.h

@@ -120,26 +120,30 @@
     #define MD_ALWAYS_UNSERIALIZED_ACCEPT
     #define MD_HAVE_SOCKLEN_T
 
-    #define MD_SETJMP(env) _setjmp(env)
-    #define MD_LONGJMP(env, val) _longjmp(env, val)
+    #define MD_USE_BUILTIN_SETJMP
 
-    #if defined(__ppc__)
-        #define MD_JB_SP  0
-    #elif defined(__i386__)
-        #define MD_JB_SP  9
-    #elif defined(__x86_64__)
-        #define MD_JB_SP  4
+    #if defined(__amd64__) || defined(__x86_64__)
+        #define JB_SP  12
+        #define MD_GET_SP(_t) *((long *)&((_t)->context[JB_SP]))
     #else
         #error Unknown CPU architecture
     #endif
-
-    #define MD_INIT_CONTEXT(_thread, _sp, _main)   \
-        ST_BEGIN_MACRO                               \
-        if (MD_SETJMP((_thread)->context))           \
-            _main();                                   \
-        *((long *)&((_thread)->context[MD_JB_SP])) = (long) (_sp); \
+    
+    #define MD_INIT_CONTEXT(_thread, _sp, _main) \
+        ST_BEGIN_MACRO                             \
+        if (MD_SETJMP((_thread)->context))         \
+            _main();                                 \
+        MD_GET_SP(_thread) = (long) (_sp);         \
         ST_END_MACRO
 
+    #if defined(MD_USE_BUILTIN_SETJMP)
+        #define MD_SETJMP(env) _st_md_cxt_save(env)
+        #define MD_LONGJMP(env, val) _st_md_cxt_restore(env, val)
+
+        extern int _st_md_cxt_save(jmp_buf env);
+        extern void _st_md_cxt_restore(jmp_buf env, int val);
+    #endif
+
     #define MD_GET_UTIME()            \
         struct timeval tv;              \
         (void) gettimeofday(&tv, NULL); \

trunk/3rdparty/st-srs/md_darwin.S

@@ -0,0 +1,76 @@
+
+/* If user disable the ASM, such as avoiding bugs in ASM, donot compile it. */
+#if !defined(MD_ST_NO_ASM)
+
+#if defined(__amd64__) || defined(__x86_64__)
+
+    /****************************************************************/
+
+    /*
+     * Internal __jmp_buf layout
+     */
+    #define JB_RBX  0
+    #define JB_RBP  1
+    #define JB_R12  2                   /* Backup IP, https://www.cnblogs.com/Five100Miles/p/8458561.html */
+    #define JB_R13  3                   /* Backup SP, https://www.cnblogs.com/Five100Miles/p/8458561.html */
+    #define JB_R14  4                   /* Backup LR, https://www.cnblogs.com/Five100Miles/p/8458561.html */
+    #define JB_R15  5                   /* Backup PC, https://www.cnblogs.com/Five100Miles/p/8458561.html */
+    #define JB_RSP  6
+    #define JB_PC   7
+
+    .file "md_darwin.S"
+    .text
+
+    /* _st_md_cxt_save(__jmp_buf env) */ /* The env is rdi, http://blog.chinaunix.net/uid-20157960-id-1974354.html */
+    .globl __st_md_cxt_save
+        .align 16
+    __st_md_cxt_save:
+        /*
+         * Save registers.
+         */
+        movq %rbx, (JB_RBX*8)(%rdi)     /* Save rbx to env[0], *(int64_t*)(rdi+0)=rbx */
+        movq %rbp, (JB_RBP*8)(%rdi)     /* Save rbp to env[1], *(int64_t*)(rdi+1)=rbp */
+        movq %r12, (JB_R12*8)(%rdi)     /* Save r12 to env[2], *(int64_t*)(rdi+2)=r12 */
+        movq %r13, (JB_R13*8)(%rdi)     /* Save r13 to env[3], *(int64_t*)(rdi+3)=r13 */
+        movq %r14, (JB_R14*8)(%rdi)     /* Save r14 to env[4], *(int64_t*)(rdi+4)=r14 */
+        movq %r15, (JB_R15*8)(%rdi)     /* Save r15 to env[5], *(int64_t*)(rdi+5)=r15 */
+        /* Save SP */
+        leaq 8(%rsp), %rdx              /* Save *(int64_t*)(rsp+8) to rdx, https://my.oschina.net/guonaihong/blog/508907 */
+        movq %rdx, (JB_RSP*8)(%rdi)     /* Save rdx(rsp) to env[6], *(int64_t*)(rdi+6)=rdx */
+        /* Save PC we are returning to */
+        movq (%rsp), %rax               /* Save PC(parent function address) %(rsp) to rax */
+        movq %rax, (JB_PC*8)(%rdi)      /* Save rax(PC) to env[7], *(int64_t*)(rdi+7)=rax */
+        xorq %rax, %rax                 /* Reset rax to 0 */
+        ret
+
+
+    /****************************************************************/
+
+    /* _st_md_cxt_restore(__jmp_buf env, int val) */ /* The env is rdi, val is esi/rsi, http://blog.chinaunix.net/uid-20157960-id-1974354.html */
+    .globl __st_md_cxt_restore
+        .align 16
+    __st_md_cxt_restore:
+        /*
+         * Restore registers.
+         */
+        movq (JB_RBX*8)(%rdi), %rbx     /* Load rbx from env[0] */
+        movq (JB_RBP*8)(%rdi), %rbp     /* Load rbp from env[1] */
+        movq (JB_R12*8)(%rdi), %r12     /* Load r12 from env[2] */
+        movq (JB_R13*8)(%rdi), %r13     /* Load r13 from env[3] */
+        movq (JB_R14*8)(%rdi), %r14     /* Load r14 from env[4] */
+        movq (JB_R15*8)(%rdi), %r15     /* Load r15 from env[5] */
+        /* Set return value */          /* The esi is param1 val, the eax is return value */
+        test %esi, %esi                 /*      if (!val) {         */
+        mov $01, %eax                   /*          val=1;          */
+        cmove %eax, %esi                /*      }                   */
+        mov %esi, %eax                  /*      return val;         */
+        movq (JB_PC*8)(%rdi), %rdx      /* Load rdx(PC) from env[7] */
+        movq (JB_RSP*8)(%rdi), %rsp     /* Load rsp from env[6] */
+        /* Jump to saved PC */
+        jmpq *%rdx                      /* Jump to rdx(PC) */
+
+    /****************************************************************/
+
+#endif
+
+#endif

trunk/auto/auto_headers.sh

@@ -137,6 +137,11 @@ if [ $SRS_CROSS_BUILD = YES ]; then
 else
     srs_undefine_macro "SRS_AUTO_CROSSBUILD" $SRS_AUTO_HEADERS_H
 fi
+if [ $SRS_OSX = YES ]; then
+    srs_define_macro "SRS_AUTO_OSX" $SRS_AUTO_HEADERS_H
+else
+    srs_undefine_macro "SRS_AUTO_OSX" $SRS_AUTO_HEADERS_H
+fi
 
 # prefix
 echo "" >> $SRS_AUTO_HEADERS_H

trunk/auto/depends.sh

@@ -109,6 +109,7 @@ function Ubuntu_prepare()
 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
     Ubuntu_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Install tools for ubuntu failed, ret=$ret"; exit $ret; fi
 fi
+
 #####################################################################################
 # for Centos, auto install tools by yum
 #####################################################################################
@@ -182,14 +183,105 @@ function Centos_prepare()
 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
     Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Install tools for CentOS failed, ret=$ret"; exit $ret; fi
 fi
+
+#####################################################################################
+# For OSX, auto install tools by brew
+#####################################################################################
+OS_IS_OSX=NO
+function OSX_prepare()
+{
+    uname -s|grep Darwin >/dev/null 2>&1
+    ret=$?; if [[ 0 -ne $ret ]]; then
+        if [ $SRS_OSX = YES ]; then
+            echo "OSX check failed, actual is `uname -s`"
+            exit 1;
+        fi
+        return 0;
+    fi
+
+    # cross build for arm, install the cross build tool chain.
+    if [ $SRS_CROSS_BUILD = YES ]; then
+        echo "embeded(arm/mips) is invalid for OSX"
+        return 1
+    fi
+
+    OS_IS_OSX=YES
+    echo "OSX detected, install tools if needed"
+    # requires the osx when os
+    if [ $OS_IS_OSX = YES ]; then
+        if [ $SRS_OSX = NO ]; then
+            echo "OSX detected, must specifies the --osx"
+            exit 1
+        fi
+    fi
+
+    brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install brew"
+        echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
+        ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install brew success"
+    fi
+
+    gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install gcc"
+        echo "brew install gcc"
+        brew install gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install gcc success"
+    fi
+
+    g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install gcc-c++"
+        echo "brew install gcc-c++"
+        brew install gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install gcc-c++ success"
+    fi
+
+    make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install make"
+        echo "brew install make"
+        brew install make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install make success"
+    fi
+
+    patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install patch"
+        echo "brew install patch"
+        brew install patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install patch success"
+    fi
+
+    unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install unzip"
+        echo "brew install unzip"
+        brew install unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install unzip success"
+    fi
+
+    echo "OSX install tools success"
+    return 0
+}
+# donot prepare tools, for srs-librtmp depends only gcc and g++.
+if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
+    OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
+fi
+
 #####################################################################################
 # for Centos, auto install tools by yum
 #####################################################################################
 # We must use a bash function instead of variable.
 function sed_utility() {
-    sed -i "$@"
+    if [ $OS_IS_OSX = YES ]; then
+        sed -i '' "$@"
+    else
+        sed -i "$@"
+    fi
+
     ret=$?; if [[ $ret -ne 0 ]]; then
-        echo "sed -i \"$@\""
+        if [ $OS_IS_OSX = YES ]; then
+            echo "sed -i '' \"$@\""
+        else
+            echo "sed -i \"$@\""
+        fi
         return $ret
     fi
 }
@@ -204,7 +296,7 @@ SED="sed_utility" && echo "SED is $SED"
 #       directly build on arm/mips, for example, pi or cubie,
 #       export srs-librtmp
 # others is invalid.
-if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then
+if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $OS_IS_OSX = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then
     if [[ $SRS_PI = NO && $SRS_CUBIE = NO && $SRS_CROSS_BUILD = NO ]]; then
         echo "Your OS `uname -s` is not supported."
         exit 1

trunk/auto/options.sh

@@ -284,18 +284,16 @@ function parse_user_option() {
         --with-hls)                     SRS_HLS=YES                 ;;
         --with-dvr)                     SRS_DVR=YES                 ;;
 
-        --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\""
-        ;;
+        --without-stream-caster)        echo "ignore option \"$option\"" ;;
+        --without-ingest)               echo "ignore option \"$option\"" ;;
+        --without-ssl)                  echo "ignore option \"$option\"" ;;
+        --without-stat)                 echo "ignore option \"$option\"" ;;
+        --without-transcode)            echo "ignore option \"$option\"" ;;
+        --without-http-callback)        echo "ignore option \"$option\"" ;;
+        --without-http-server)          echo "ignore option \"$option\"" ;;
+        --without-http-api)             echo "ignore option \"$option\"" ;;
+        --without-hls)                  echo "ignore option \"$option\"" ;;
+        --without-dvr)                  echo "ignore option \"$option\"" ;;
 
         *)
             echo "$0: error: invalid option \"$option\""
@@ -562,16 +560,16 @@ function check_option_conflicts() {
         echo "For crossbuild, must not use default toolchain, cc: $SRS_TOOL_CC, cxx: $SRS_TOOL_CXX, ar: $SRS_TOOL_AR"; exit -1
     fi
 
-    if [ $SRS_OSX = YES ]; then
-        echo "We don't support OSX, please use docker https://github.com/ossrs/srs-docker"; exit -1
-    fi
-
     if [[ $SRS_NGINX == YES ]]; then
-        echo "Don't support building NGINX, please use docker https://github.com/ossrs/srs-docker"; exit -1
+        echo "Don't support building NGINX, please use docker https://github.com/ossrs/srs-docker"; exit -1;
     fi
 
     if [[ $SRS_FFMPEG_TOOL == YES ]]; then
-        echo "Don't support building FFMPEG, please use docker https://github.com/ossrs/srs-docker"; exit -1
+        echo "Don't support building FFMPEG, please use docker https://github.com/ossrs/srs-docker"; exit -1;
+    fi
+
+    if [[ $SRS_OSX == YES && $SRS_UTEST == YES ]]; then
+        echo "Mac does not support utest."; exit -1;
     fi
 
     # TODO: FIXME: check more os.