Windows: Patch is not available, use sed instead.

ossrs · Nov 16, 2022 · acbb9a0 · acbb9a0
1 parent ceaed78
commit acbb9a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/trunk/3rdparty/libsrtp-2-fit/crypto/math/datatypes.c b/trunk/3rdparty/libsrtp-2-fit/crypto/math/datatypes.c
@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
 
 /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
 
-static char bit_string[MAX_PRINT_STRING_LEN];
+char bit_string[MAX_PRINT_STRING_LEN];
 
 uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
 {

diff --git a/trunk/3rdparty/st-srs/Makefile b/trunk/3rdparty/st-srs/Makefile
@@ -126,15 +126,6 @@ OTHER_FLAGS = -Wall
 DEFINES     += -DMD_HAVE_SELECT
 endif
 
-ifeq ($(OS), CYGWIN64)
-EXTRA_OBJS  = $(TARGETDIR)/md_cygwin64.o
-SFLAGS      = -fPIC
-DSO_SUFFIX  = dll
-LDFLAGS     = -shared -soname=$(SONAME) -lc
-OTHER_FLAGS = -Wall
-DEFINES     += -DMD_HAVE_SELECT
-endif
-
 #
 # End of platform section.
 ##########################

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -661,8 +661,15 @@ if [[ $SRS_RTC == YES ]]; then
             rm -rf libsrtp-2-fit &&
             cp -R ${SRS_WORKDIR}/3rdparty/libsrtp-2-fit . &&
             cd libsrtp-2-fit &&
+            # For cygwin64, the patch is not available, so use sed instead.
+            if [[ $SRS_CYGWIN64 == YES ]]; then
+                sed -i 's/char bit_string/static char bit_string/g' crypto/math/datatypes.c
+            else
+                patch -p0 crypto/math/datatypes.c ${SRS_WORKDIR}/3rdparty/patches/srtp/gcc10-01.patch
+            fi &&
+            # Patch the cpu arch guessing for RISCV.
             if [[ $OS_IS_RISCV == YES ]]; then
-                patch -p0 crypto/math/datatypes.c ${SRS_WORKDIR}/3rdparty/patches/srtp/config.guess-02.patch;
+                patch -p0 config.guess ${SRS_WORKDIR}/3rdparty/patches/srtp/config.guess-02.patch
             fi &&
             $SRTP_CONFIGURE ${SRTP_OPTIONS} --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2 &&
             make ${SRS_JOBS} && make install &&