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
2015-09-21 12:01:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d8a64aaab50cc0aca253e5f2d57ee567583444f2
d8a64aaa
1 parent
8c2c5984
fix #484, hotfix the openssl build script 2.0.190
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
6 行增加
和
4 行删除
README.md
trunk/auto/depends.sh
trunk/src/core/srs_core.hpp
README.md
查看文件 @
d8a64aa
...
...
@@ -344,6 +344,7 @@ Remark:
## History
*
v2.0, 2015-09-21, fix
[
#484
][
bug #484
]
hotfix the openssl build script 2.0.190
*
<strong>
v2.0, 2015-09-14,
[
2.0 alpha1(2.0.189)
][
r2.0a1
]
released. 89269 lines.
</strong>
*
v2.0, 2015-09-14, fix
[
#474
][
bug #474
]
config to donot parse width/height from sps. 2.0.189
*
v2.0, 2015-09-14, for
[
#474
][
bug #474
]
always release publish for source.
...
...
trunk/auto/depends.sh
查看文件 @
d8a64aa
...
...
@@ -601,7 +601,8 @@ fi
if
[
$SRS_OSX
=
YES
]
;
then
CONFIGURE_TOOL
=
"./Configure darwin64-
`
uname -m
`
-cc"
fi
# @see http://www.openssl.org/news/secadv_20140407.txt
OPENSSL_HOTFIX
=
"-DOPENSSL_NO_HEARTBEATS"
# @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.
if
[
$SRS_SSL
=
YES
]
;
then
...
...
@@ -618,7 +619,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_TOOL
--prefix
=
`
pwd
`
/_release -no-shared no-asm
&&
$CONFIGURE_TOOL
--prefix
=
`
pwd
`
/_release -no-shared no-asm
$OPENSSL_HOTFIX
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
\
LD
=
${
SrsArmLD
}
LINK
=
${
SrsArmGCC
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install_sw
&&
...
...
@@ -635,7 +636,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_TOOL
--prefix
=
`
pwd
`
/_release -no-shared
&&
$CONFIGURE_TOOL
--prefix
=
`
pwd
`
/_release -no-shared
$OPENSSL_HOTFIX
&&
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/src/core/srs_core.hpp
查看文件 @
d8a64aa
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 1
89
#define VERSION_REVISION 1
90
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论