Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-08-17 19:12:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5e4dad210a862ecf5f3179824ae6d8c33f2f7136
5e4dad21
1 parent
8d5016f1
build openssl for osx, for bug #155.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
17 行增加
和
4 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/src/core/srs_core.hpp
trunk/auto/depends.sh
查看文件 @
5e4dad2
...
...
@@ -554,6 +554,19 @@ fi
#####################################################################################
# openssl, for rtmp complex handshake
#####################################################################################
# extra configure options
EXTRA_CONFIGURE
=
""
if
[
$SRS_OSX
=
YES
]
;
then
arch
=
`
uname -m
`
&&
echo
"OSX
$arch
"
;
if
[
$arch
=
x86_64
]
;
then
echo
"configure 64bit openssl"
;
EXTRA_CONFIGURE
=
darwin64-x86_64-cc
else
echo
"configure 32bit openssl"
;
EXTRA_CONFIGURE
=
darwin-i386-cc
fi
echo
"openssl extra config options:
$EXTRA_CONFIGURE
"
fi
# @see http://www.openssl.org/news/secadv_20140407.txt
# Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
# upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
...
...
@@ -571,7 +584,7 @@ if [ $SRS_SSL = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/openssl-1.0.1f
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/openssl-1.0.1f.zip
&&
cd
openssl-1.0.1f
&&
./Configure --prefix
=
`
pwd
`
/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS
&&
./Configure --prefix
=
`
pwd
`
/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS
${
EXTRA_CONFIGURE
}
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
\
LD
=
${
SrsArmLD
}
LINK
=
${
SrsArmGCC
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install_sw
&&
...
...
@@ -588,7 +601,7 @@ if [ $SRS_SSL = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/openssl-1.0.1f
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/openssl-1.0.1f.zip
&&
cd
openssl-1.0.1f
&&
./
config --prefix
=
`
pwd
`
/_release -no-shared -DOPENSSL_NO_HEARTBEATS
&&
./
Configure --prefix
=
`
pwd
`
/_release -no-shared -DOPENSSL_NO_HEARTBEATS
${
EXTRA_CONFIGURE
}
&&
make
&&
make install_sw
&&
cd
..
&&
rm -rf openssl
&&
ln -sf openssl-1.0.1f/_release openssl
&&
cd
..
&&
rm -f
${
SRS_OBJS
}
/_flag.ssl.arm.tmp
...
...
trunk/auto/options.sh
查看文件 @
5e4dad2
...
...
@@ -590,7 +590,7 @@ function apply_user_presets() {
SRS_HLS
=
YES
SRS_DVR
=
YES
SRS_NGINX
=
NO
SRS_SSL
=
NO
SRS_SSL
=
YES
SRS_FFMPEG_TOOL
=
NO
SRS_TRANSCODE
=
YES
SRS_INGEST
=
NO
...
...
trunk/src/core/srs_core.hpp
查看文件 @
5e4dad2
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "19
6
"
#define VERSION_REVISION "19
7
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论