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-03-16 20:58:04 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5a4373d4835758188b9a1f03005cea0b6ddc62aa
5a4373d4
1 parent
b6a4aac1
Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
24 行增加
和
1 行删除
README.md
trunk/3rdparty/patches/1.st.arm.patch
trunk/auto/depends.sh
trunk/src/core/srs_core.hpp
README.md
查看文件 @
5a4373d
...
...
@@ -65,6 +65,7 @@ cd simple-rtmp-server/trunk
[
Usage: How to transode RTMP stream by SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG
)
<br/>
[
Usage: How to forward stream to other server?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward
)
<br/>
[
Usage: How to deploy low lantency application?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime
)
<br/>
[
Usage: How to deploy srs on ARM?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM
)
<br/>
[
Usage: How to show the demo of SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo
)
<br/>
[
Usage: Who is using SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Sample
)
<br/>
...
...
trunk/3rdparty/patches/1.st.arm.patch
0 → 100644
查看文件 @
5a4373d
Only in .: 1.st.arm.patch
diff -r -c ./md.h ../st-1.9-patch-arm/md.h
*** ./md.h 2009-10-02 02:46:43.000000000 +0800
--- ../st-1.9-patch-arm/md.h 2014-03-16 20:49:03.845344804 +0800
***************
*** 422,428 ****
#define MD_STACK_GROWS_DOWN
#if defined(__GLIBC__) && __GLIBC__ >= 2
! #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[20]
#else
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
--- 422,428 ----
#define MD_STACK_GROWS_DOWN
#if defined(__GLIBC__) && __GLIBC__ >= 2
! #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[8]
#else
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
...
...
trunk/auto/depends.sh
查看文件 @
5a4373d
...
...
@@ -209,6 +209,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/st-1.9
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/st-1.9.zip
&&
cd
st-1.9
&&
patch -p0 < ../../3rdparty/patches/1.st.arm.patch
&&
make
CC
=
${
SrsArmCC
}
AR
=
${
SrsArmAR
}
LD
=
${
SrsArmLD
}
RANDLIB
=
${
SrsArmRANDLIB
}
linux-debug
&&
cd
..
&&
rm -f st
&&
ln -sf st-1.9/obj st
&&
cd
..
&&
touch
${
SRS_OBJS
}
/_flag.st.arm.tmp
...
...
trunk/src/core/srs_core.hpp
查看文件 @
5a4373d
...
...
@@ -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 "1
7
"
#define VERSION_REVISION "1
8
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论