diff --git a/README.md b/README.md index 0c4751be0..ba0439450 100755 --- a/README.md +++ b/README.md @@ -234,6 +234,8 @@ Please select according to languages: ### V2 changes +* v2.0, 2018-10-28, [2.0 release5(2.0.258)][r2.0r5] released. 86916 lines. +* v2.0, 2018-10-28, Fix [#1250][bug #1250], Support build on OSX10.14 Mojave. 2.0.258 * v2.0, 2018-10-08, Merge [#1236][bug #1236], Fix sleep bug in us. 2.0.257 * v2.0, 2018-10-08, Merge [#1237][bug #1237], Support param for transcoder. 2.0.256 * v2.0, 2018-08-12, [2.0 release4(2.0.255)][r2.0r4] released. 86915 lines. @@ -1457,6 +1459,7 @@ Winlin [bug #1202]: https://github.com/ossrs/srs/issues/1202 [bug #1237]: https://github.com/ossrs/srs/issues/1237 [bug #1236]: https://github.com/ossrs/srs/issues/1236 +[bug #1250]: https://github.com/ossrs/srs/issues/1250 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #735]: https://github.com/ossrs/srs/issues/735 @@ -1479,6 +1482,7 @@ Winlin [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r2.0r5]: https://github.com/ossrs/srs/releases/tag/v2.0-r5 [r2.0r4]: https://github.com/ossrs/srs/releases/tag/v2.0-r4 [r2.0r3]: https://github.com/ossrs/srs/releases/tag/v2.0-r3 [r2.0r2]: https://github.com/ossrs/srs/releases/tag/v2.0-r2 diff --git a/trunk/3rdparty/patches/6.st.osx10.14.build.patch b/trunk/3rdparty/patches/6.st.osx10.14.build.patch new file mode 100644 index 000000000..a6e376171 --- /dev/null +++ b/trunk/3rdparty/patches/6.st.osx10.14.build.patch @@ -0,0 +1,13 @@ +--- 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 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index d3de37619..a1d908a7d 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -464,6 +464,7 @@ 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} CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} 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 && @@ -478,6 +479,7 @@ 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 &&