mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
This commit is contained in:
parent
d8f52918aa
commit
bc93147426
7 changed files with 112 additions and 34 deletions
6
trunk/3rdparty/patches/1.st.arm.patch
vendored
6
trunk/3rdparty/patches/1.st.arm.patch
vendored
|
@ -1,7 +1,5 @@
|
|||
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
|
||||
*** md.h Fri Oct 2 02:46:43 2009
|
||||
--- ../st-1.9-patch/md.h Mon Mar 16 15:11:49 2015
|
||||
***************
|
||||
*** 422,428 ****
|
||||
#define MD_STACK_GROWS_DOWN
|
||||
|
|
19
trunk/3rdparty/patches/2.http.parser.patch
vendored
19
trunk/3rdparty/patches/2.http.parser.patch
vendored
|
@ -1,17 +1,16 @@
|
|||
diff -r -c ./Makefile ../http-parser-2.1/Makefile
|
||||
*** ./Makefile Tue Mar 10 10:44:19 2015
|
||||
--- ../http-parser-2.1/Makefile Wed Mar 27 06:35:20 2013
|
||||
*** Makefile Wed Mar 27 06:35:20 2013
|
||||
--- ../http-parser-2.1-patch/Makefile Mon Mar 16 15:25:59 2015
|
||||
***************
|
||||
*** 12,22 ****
|
||||
*** 12,17 ****
|
||||
--- 12,22 ----
|
||||
CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
|
||||
CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
|
||||
|
||||
- # patch by winlin
|
||||
- CPPFLAGS_FAST = $(CPPFLAGS_DEBUG)
|
||||
- CFLAGS_FAST = $(CFLAGS_DEBUG)
|
||||
- CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
|
||||
-
|
||||
+ # patch by winlin
|
||||
+ CPPFLAGS_FAST = $(CPPFLAGS_DEBUG)
|
||||
+ CFLAGS_FAST = $(CFLAGS_DEBUG)
|
||||
+ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
|
||||
+
|
||||
test: test_g test_fast
|
||||
./test_g
|
||||
./test_fast
|
||||
--- 12,17 ----
|
||||
|
|
19
trunk/3rdparty/patches/3.st.osx.kqueue.patch
vendored
Normal file
19
trunk/3rdparty/patches/3.st.osx.kqueue.patch
vendored
Normal file
|
@ -0,0 +1,19 @@
|
|||
*** io.c Fri Oct 2 06:49:07 2009
|
||||
--- ../st-1.9-patch/io.c Mon Mar 16 15:06:28 2015
|
||||
***************
|
||||
*** 89,94 ****
|
||||
--- 89,102 ----
|
||||
if (fdlim > 0 && rlim.rlim_max > (rlim_t) fdlim) {
|
||||
rlim.rlim_max = fdlim;
|
||||
}
|
||||
+
|
||||
+ /* when rlimit max is negative, for example, osx, use cur directly. */
|
||||
+ /* @see https://github.com/winlinvip/simple-rtmp-server/issues/336 */
|
||||
+ if ((int)rlim.rlim_max < 0) {
|
||||
+ _st_osfd_limit = (int)(fdlim > 0? fdlim : rlim.rlim_cur);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
rlim.rlim_cur = rlim.rlim_max;
|
||||
if (setrlimit(RLIMIT_NOFILE, &rlim) < 0)
|
||||
return -1;
|
15
trunk/3rdparty/patches/4.st.disable.examples.patch
vendored
Normal file
15
trunk/3rdparty/patches/4.st.disable.examples.patch
vendored
Normal file
|
@ -0,0 +1,15 @@
|
|||
*** Makefile Fri Oct 2 06:55:03 2009
|
||||
--- ../st-1.9-patch/Makefile Mon Mar 16 15:30:35 2015
|
||||
***************
|
||||
*** 310,315 ****
|
||||
--- 310,319 ----
|
||||
EXAMPLES =
|
||||
endif
|
||||
|
||||
+ # disable examples for ubuntu crossbuild failed.
|
||||
+ # @see https://github.com/winlinvip/simple-rtmp-server/issues/308
|
||||
+ EXAMPLES =
|
||||
+
|
||||
ifeq ($(OS), DARWIN)
|
||||
LINKNAME = libst.$(DSO_SUFFIX)
|
||||
SONAME = libst.$(MAJOR).$(DSO_SUFFIX)
|
Loading…
Add table
Add a link
Reference in a new issue