Support porting srs on MacOS OSX system Platform

Add the OSX platform cross complie options into srs

Support porting srs on MacOS OSX system Platform
Add the OSX platform cross complie options into srs
Steven Liu
Commit b50ecd6dbeef62913d38fa9e758cdb29fcdf8c6f b50ecd6d 1 parent 6f700f3f
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/src/app/srs_app_json.cpp
trunk/src/app/srs_app_server.cpp
--- a/trunk/auto/depends.sh
查看文件 @b50ecd6
+++ b/trunk/auto/depends.sh
查看文件 @b50ecd6
@@ -214,6 +214,91 @@ function Centos_prepare()
     return 0
 }
 Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "CentOS prepare failed, ret=$ret"; exit $ret; fi
+#####################################################################################
+# for OSX, auto install tools by brew
+#####################################################################################
+OS_IS_OSX=NO
+function OSX_prepare()
+{
+    SYS_NAME=`uname -s`
+    if [ $SYS_NAME != Darwin ]; then
+        echo "This is not Darwin OSX"
+        return 0;
+    fi
+
+    OS_IS_OSX=YES
+    echo "OSX detected, install tools if needed"
+    
+    gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        echo "install gcc"
+        require_sudoer "sudo brew install gcc"
+        sudo 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++"
+        require_sudoer "sudo brew install gcc-c++"
+        sudo 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"
+        require_sudoer "sudo brew install make"
+        sudo 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"
+        require_sudoer "sudo brew install patch"
+        sudo brew install patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+        echo "install patch success"
+    fi
+    
+    if [ $SRS_FFMPEG_TOOL = YES ]; then
+        automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+            echo "install automake"
+            require_sudoer "sudo brew install automake"
+            sudo brew install automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+            echo "install automake success"
+        fi
+        
+        autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+            echo "install autoconf"
+            require_sudoer "sudo brew install autoconf"
+            sudo brew install autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+            echo "install autoconf success"
+        fi
+        
+        libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+            echo "install libtool"
+            require_sudoer "sudo brew install libtool"
+            sudo brew install libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+            echo "install libtool success"
+        fi
+        
+        if [[ ! -f /usr/include/pcre.h ]]; then
+            echo "install pcre-devel"
+            require_sudoer "sudo brew install pcre-devel"
+            sudo brew install pcre-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+            echo "install pcre-devel success"
+        fi
+        
+        if [[ ! -f /usr/include/zlib.h ]]; then
+            echo "install zlib-devel"
+            require_sudoer "sudo brew install zlib-devel"
+            sudo brew install zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
+            echo "install zlib-devel success"
+        fi
+    fi
+    
+    echo "OSX install tools success"
+    return 0
+}
+OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
+
 #####################################################################################
 # st-1.9
@@ -237,6 +322,23 @@ if [ $SRS_EMBEDED_CPU = YES ]; then
         )
     fi
 else
+    if [ $OS_IS_OSX = YES ]; then
+        if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a && -f ${SRS_OBJS}/st/libst.so ]]; then
+            echo "st-1.9t is ok.";
+        else
+            echo "build st-1.9t"; 
+            (
+                rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 
+                unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && 
+                echo "we alaways patch the st, for we may build srs under arm directly" &&
+                echo "the 1.st.arm.patch is ok for x86 because it's only modify code under macro linux arm" &&
+                patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
+                make darwin-debug &&
+                cd .. && rm -rf st && ln -sf st-1.9/obj st &&
+                cd .. && rm -f ${SRS_OBJS}/_flag.st.arm.tmp
+            )
+        fi
+    else
         # arm not specified, if exists flag, need to rebuild for no-arm platform.
         if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a && -f ${SRS_OBJS}/st/libst.so ]]; then
             echo "st-1.9t is ok.";
@@ -253,11 +355,16 @@ else
                 cd .. && rm -f ${SRS_OBJS}/_flag.st.arm.tmp
             )
         fi
+    fi
 fi
 # check status
 ret=$?; if [[ $ret -ne 0 ]]; then echo "build st-1.9 failed, ret=$ret"; exit $ret; fi
-if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 failed."; exit -1; fi
-if [ ! -f ${SRS_OBJS}/st/libst.so ]; then echo "build st-1.9 failed."; exit -1; fi
+if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 static lib failed."; exit -1; fi
+if [ OS_IS_OSX = Darwin ] then
+    if [ ! -f ${SRS_OBJS}/st/libst.dylib ]; then echo "build st-1.9 shared lib failed."; exit -1; fi
+else
+    if [ ! -f ${SRS_OBJS}/st/libst.so ]; then echo "build st-1.9 shared lib failed."; exit -1; fi
+fi
 #####################################################################################
 # http-parser-2.1
--- a/trunk/auto/options.sh
查看文件 @b50ecd6
+++ b/trunk/auto/options.sh
查看文件 @b50ecd6
@@ -252,6 +252,7 @@ function parse_user_option() {
         --cubie)                        SRS_CUBIE=YES               ;;
         --dev)                          SRS_DEV=YES                 ;;
         --fast-dev)                     SRS_FAST_DEV=YES            ;;
+        --osx-dev)                      SRS_OSX_DEV=YES             ;;
         --demo)                         SRS_DEMO=YES                ;;
         --fast)                         SRS_FAST=YES                ;;
         --disable-all)                  SRS_DISABLE_ALL=YES         ;;
@@ -579,6 +580,32 @@ function apply_user_presets() {
         SRS_STATIC=NO
     fi
+    # if osx dev specified, open main server features.
+    if [ $SRS_OSX_DEV = YES ]; then
+        SRS_HLS=YES
+        SRS_DVR=YES
+        SRS_NGINX=NO
+        SRS_SSL=NO
+        SRS_FFMPEG_TOOL=NO
+        SRS_TRANSCODE=YES
+        SRS_INGEST=NO
+        SRS_HTTP_PARSER=NO
+        SRS_HTTP_CALLBACK=NO
+        SRS_HTTP_SERVER=NO
+        SRS_HTTP_API=NO
+        SRS_LIBRTMP=NO
+        SRS_RESEARCH=NO
+        SRS_UTEST=NO
+        SRS_GPERF=NO
+        SRS_GPERF_MC=NO
+        SRS_GPERF_MP=NO
+        SRS_GPERF_CP=NO
+        SRS_GPROF=NO
+        SRS_STATIC=NO
+    fi
+
+
+
     # for srs demo
     if [ $SRS_DEMO = YES ]; then
         SRS_HLS=YES
--- a/trunk/src/app/srs_app_json.cpp
查看文件 @b50ecd6
+++ b/trunk/src/app/srs_app_json.cpp
查看文件 @b50ecd6
@@ -526,7 +526,6 @@ extern "C" {
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include <assert.h>
 //#include "nxjson.h"
--- a/trunk/src/app/srs_app_server.cpp
查看文件 @b50ecd6
+++ b/trunk/src/app/srs_app_server.cpp
查看文件 @b50ecd6
@@ -476,7 +476,7 @@ int SrsServer::acquire_pid_file()
     }
     // require write lock
-    flock lock;
+    struct flock lock;
     lock.l_type = F_WRLCK; // F_RDLCK, F_WRLCK, F_UNLCK
     lock.l_start = 0; // type offset, relative to l_whence