winlin

Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.

@@ -65,6 +65,7 @@ cd simple-rtmp-server/trunk @@ -65,6 +65,7 @@ cd simple-rtmp-server/trunk
65 [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)<br/> 65 [Usage: How to transode RTMP stream by SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleFFMPEG)<br/>
66 [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)<br/> 66 [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward)<br/>
67 [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime)<br/> 67 [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/>
68 [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)<br/> 69 [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo)<br/>
69 [Usage: Who is using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)<br/> 70 [Usage: Who is using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)<br/>
70 71
  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 */
@@ -209,6 +209,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then @@ -209,6 +209,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
209 ( 209 (
210 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 210 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
211 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && 211 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
  212 + patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
212 make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} linux-debug && 213 make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} linux-debug &&
213 cd .. && rm -f st && ln -sf st-1.9/obj st && 214 cd .. && rm -f st && ln -sf st-1.9/obj st &&
214 cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp 215 cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "17" 34 +#define VERSION_REVISION "18"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"