For #1537, #1282, remove not used patches, note the patch for ARM alr…

…eady merged to ST in SRS3
ossrs · Dec 25, 2019 · c91ffbe · c91ffbe
1 parent a0c631d
commit c91ffbe
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 128 deletions.
diff --git a/trunk/3rdparty/patches/1.st.arm.patch b/trunk/3rdparty/patches/1.st.arm.patch
diff --git a/trunk/3rdparty/patches/2.http.parser.patch b/trunk/3rdparty/patches/2.http.parser.patch
diff --git a/trunk/3rdparty/patches/3.st.osx.kqueue.patch b/trunk/3rdparty/patches/3.st.osx.kqueue.patch
diff --git a/trunk/3rdparty/patches/4.st.disable.examples.patch b/trunk/3rdparty/patches/4.st.disable.examples.patch
diff --git a/trunk/3rdparty/patches/5.x264.osx.gcc.patch b/trunk/3rdparty/patches/5.x264.osx.gcc.patch
diff --git a/trunk/3rdparty/patches/6.ffmpeg.speex.patch b/trunk/3rdparty/patches/6.ffmpeg.speex.patch
diff --git a/trunk/3rdparty/patches/6.st.osx10.14.build.patch b/trunk/3rdparty/patches/6.st.osx10.14.build.patch
diff --git a/trunk/3rdparty/patches/7.http.parser.patch b/trunk/3rdparty/patches/7.http.parser.patch
diff --git a/trunk/auto/build_ffmpeg.sh b/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 && 

diff --git a/trunk/auto/depends.sh b/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