Skip to content

Commit 5a4373d

Browse files
committed
Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.
1 parent b6a4aac commit 5a4373d

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cd simple-rtmp-server/trunk
6565
[Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)<br/>
6666
[Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)<br/>
6767
[Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime)<br/>
68+
[Usage: How to deploy srs on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM)<br/>
6869
[Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)<br/>
6970
[Usage: Who is using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)<br/>
7071

trunk/3rdparty/patches/1.st.arm.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Only in .: 1.st.arm.patch
2+
diff -r -c ./md.h ../st-1.9-patch-arm/md.h
3+
*** ./md.h 2009-10-02 02:46:43.000000000 +0800
4+
--- ../st-1.9-patch-arm/md.h 2014-03-16 20:49:03.845344804 +0800
5+
***************
6+
*** 422,428 ****
7+
#define MD_STACK_GROWS_DOWN
8+
9+
#if defined(__GLIBC__) && __GLIBC__ >= 2
10+
! #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[20]
11+
#else
12+
#error "ARM/Linux pre-glibc2 not supported yet"
13+
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
14+
--- 422,428 ----
15+
#define MD_STACK_GROWS_DOWN
16+
17+
#if defined(__GLIBC__) && __GLIBC__ >= 2
18+
! #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[8]
19+
#else
20+
#error "ARM/Linux pre-glibc2 not supported yet"
21+
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */

trunk/auto/depends.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
209209
(
210210
rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
211211
unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
212+
patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
212213
make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} linux-debug &&
213214
cd .. && rm -f st && ln -sf st-1.9/obj st &&
214215
cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp

trunk/src/core/srs_core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
// current release version
3232
#define VERSION_MAJOR "0"
3333
#define VERSION_MINOR "9"
34-
#define VERSION_REVISION "17"
34+
#define VERSION_REVISION "18"
3535
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
3636
// server info.
3737
#define RTMP_SIG_SRS_KEY "srs"

0 commit comments

Comments
 (0)