For #1537, #1282, remove not used patches, note the patch for ARM already merged to ST in SRS3

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

@@ -1,19 +0,0 @@
-*** 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
-  
-  #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/3rdparty/patches/2.http.parser.patch

@@ -1,16 +0,0 @@
-*** Makefile	Wed Mar 27 06:35:20 2013
---- ../http-parser-2.1-patch/Makefile	Mon Mar 16 15:25:59 2015
-***************
-*** 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
-+ 
-  test: test_g test_fast
-  	./test_g
-  	./test_fast

trunk/3rdparty/patches/3.st.osx.kqueue.patch

@@ -1,19 +0,0 @@
-*** 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;

trunk/3rdparty/patches/4.st.disable.examples.patch

@@ -1,15 +0,0 @@
-*** 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)

trunk/3rdparty/patches/5.x264.osx.gcc.patch

@@ -1,19 +0,0 @@
-*** configure	Sat Nov 30 05:45:08 2013
---- ../x264-snapshot-20131129-2245-stable-patch/configure	Tue Mar 17 21:42:24 2015
-***************
-*** 466,472 ****
-          ;;
-      darwin*)
-          SYS="MACOSX"
-!         CFLAGS="$CFLAGS -falign-loops=16"
-          libm="-lm"
-          if [ "$pic" = "no" ]; then
-              cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"
---- 466,472 ----
-          ;;
-      darwin*)
-          SYS="MACOSX"
-!         CFLAGS="$CFLAGS"
-          libm="-lm"
-          if [ "$pic" = "no" ]; then
-              cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"

trunk/3rdparty/patches/6.ffmpeg.speex.patch

@@ -1,13 +0,0 @@
---- configure	2017-02-10 21:25:25.000000000 +0800
-+++ ../ffmpeg-3.2.4-patch/configure	2017-02-13 22:39:22.676288196 +0800
-@@ -5739,7 +5739,9 @@
- enabled libsnappy         && require snappy snappy-c.h snappy_compress -lsnappy
- enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
- enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
--enabled libspeex          && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
-+enabled libspeex          && { use_pkg_config speex speex/speex.h speex_decoder_init -lspeex ||
-+                                { require libspeex speex/speex.h speex_decoder_init -lspeex &&
-+                                 warn "using libspeex without pkg-config"; } }
- enabled libtesseract      && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
- enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
- enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&

trunk/3rdparty/patches/6.st.osx10.14.build.patch

@@ -1,13 +0,0 @@
---- Makefile	2018-10-28 13:49:27.000000000 +0800
-+++ ../st-1.9-patch/Makefile	2018-10-28 13:50:07.000000000 +0800
-@@ -139,8 +139,8 @@ CFLAGS      += -arch ppc
- LDFLAGS     += -arch ppc
- endif
- ifeq ($(INTEL), yes)
--CFLAGS      += -arch i386 -arch x86_64
--LDFLAGS     += -arch i386 -arch x86_64
-+CFLAGS      += -arch x86_64
-+LDFLAGS     += -arch x86_64
- endif
- LDFLAGS     += -dynamiclib -install_name /sw/lib/libst.$(MAJOR).$(DSO_SUFFIX) -compatibility_version $(MAJOR) -current_version $(VERSION)
- OTHER_FLAGS = -Wall

trunk/3rdparty/patches/7.http.parser.patch

@@ -1,12 +0,0 @@
---- Makefile	2019-04-05 19:43:32.000000000 +0800
-+++ ../http-parser-2.1-patch/Makefile	2019-04-05 19:50:26.000000000 +0800
-@@ -7,7 +7,8 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA
- CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
- CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
- 
--CFLAGS += -Wall -Wextra -Werror
-+# patch by winlin
-+CFLAGS += -Wall -Wextra
- CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
- CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
- CFLAGS_LIB = $(CFLAGS_FAST) -fPIC

trunk/auto/build_ffmpeg.sh

@@ -76,7 +76,6 @@ else
     cd $ff_current_dir &&
     rm -rf x264-snapshot-20181116-2245 && unzip -q ${ff_src_dir}/x264-snapshot-20181116-2245.zip &&
     cd x264-snapshot-20181116-2245 && 
-#    chmod +w configure && patch -p0 <../../../3rdparty/patches/5.x264.osx.gcc.patch &&
     ./configure --prefix=${ff_release_dir} --disable-opencl --bit-depth=all \
         --enable-static --disable-avs  --disable-swscale  --disable-lavf \
         --disable-ffms  --disable-gpac --disable-cli && 

trunk/auto/depends.sh

@@ -436,7 +436,6 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
         (
             rm -rf ${SRS_OBJS}/state-threads-1.9.1 && cd ${SRS_OBJS} &&
             tar xf ../3rdparty/state-threads-1.9.1.tar.gz && cd state-threads-1.9.1 && chmod +w * &&
-            patch -p0 < ../../3rdparty/patches/6.st.osx10.14.build.patch &&
             make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" &&
             cd .. && rm -f st && ln -sf state-threads-1.9.1/obj st &&
             rm -f state-threads && ln -sf state-threads-1.9.1 state-threads