external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-10-26 13:34:44 +08:00
commit 11979229e6
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/auto/depends.sh
View file

@ -361,6 +361,9 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
fi fi
# the sed command
SED="sed -i" && if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi
##################################################################################### #####################################################################################
# check the os. # check the os.
##################################################################################### #####################################################################################
@ -513,7 +516,7 @@ if [ $__SRS_BUILD_NGINX = YES ]; then
# srs will write ts/m3u8 file use current user, # srs will write ts/m3u8 file use current user,
# nginx default use nobody, so cannot read the ts/m3u8 created by srs. # nginx default use nobody, so cannot read the ts/m3u8 created by srs.
cp ${SRS_OBJS}/nginx/conf/nginx.conf ${SRS_OBJS}/nginx/conf/nginx.conf.bk cp ${SRS_OBJS}/nginx/conf/nginx.conf ${SRS_OBJS}/nginx/conf/nginx.conf.bk
$SED '' "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf $SED "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf
fi fi
# the demo dir. # the demo dir.

4
trunk/auto/generate-srs-librtmp-single.sh
View file

@ -7,10 +7,6 @@ ret=$?; if [[ 0 -eq $ret ]]; then
fi fi
echo "Is OSX: ${OS_IS_OSX}" echo "Is OSX: ${OS_IS_OSX}"
# the sed command
SED="sed -i"
if [ $OS_IS_OSX = YES ]; then SED="sed -i ''"; fi
# when export srs-librtmp single files # when export srs-librtmp single files
# package the whole project to srs_librtmp.h and srs_librtmp.cpp # package the whole project to srs_librtmp.h and srs_librtmp.cpp
# #