From f1033296bbdeb068e895fab550a02d83c7371767 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 1 Dec 2018 20:21:35 +0800 Subject: [PATCH 1/2] Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 --- README.md | 2 ++ trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a3bd520e5..6f3bbaa43 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Remark: ## History +* v2.0, 2018-12-01, Merge [#1274][bug #1274], Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 * v2.0, 2018-11-11, Merge [#1261][bug #1261], Support `_definst_` for Wowza. 2.0.260 * v2.0, 2018-11-11, Merge [#1263][bug #1263], Fix string trim bug. 2.0.259 * v2.0, 2018-10-28, [2.0 release5(2.0.258)][r2.0r5] released. 86916 lines. @@ -1339,6 +1340,7 @@ Winlin [bug #1250]: https://github.com/ossrs/srs/issues/1250 [bug #1263]: https://github.com/ossrs/srs/issues/1263 [bug #1261]: https://github.com/ossrs/srs/issues/1261 +[bug #1274]: https://github.com/ossrs/srs/pull/1274 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 66c39960b..a2728fdc2 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 260 +#define VERSION_REVISION 261 // generated by configure, only macros. #include From f2a93755c26b56ccb623906168ad16529664558b Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 9 Dec 2018 19:39:36 +0800 Subject: [PATCH 2/2] Allow OSX for utest --- trunk/auto/options.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index a0928c9e1..1e994556f 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -74,6 +74,7 @@ SRS_EXPORT_LIBRTMP_SINGLE=NO SRS_X86_X64=NO # for osx system SRS_OSX=NO +SRS_ALLOW_OSX=NO # armhf(v7cpu) built on ubuntu12 SRS_ARM_UBUNTU12=NO # mips built on ubuntu12 @@ -272,6 +273,7 @@ function parse_user_option() { --x86-x64) SRS_X86_X64=YES ;; --osx) SRS_OSX=YES ;; + --allow-osx) SRS_ALLOW_OSX=YES ;; --arm) SRS_ARM_UBUNTU12=YES ;; --mips) SRS_MIPS_UBUNTU12=YES ;; --pi) SRS_PI=YES ;; @@ -602,9 +604,9 @@ function apply_user_presets() { SRS_HTTP_SERVER=YES SRS_STREAM_CASTER=NO SRS_HTTP_API=YES - SRS_LIBRTMP=YES + SRS_LIBRTMP=NO SRS_RESEARCH=NO - SRS_UTEST=NO + SRS_UTEST=YES SRS_GPERF=NO SRS_GPERF_MC=NO SRS_GPERF_MP=NO @@ -922,7 +924,7 @@ function check_option_conflicts() { exit 1; fi - if [[ $SRS_OSX == YES ]]; then + if [[ $SRS_OSX == YES && $SRS_ALLOW_OSX == NO ]]; then macOSVersion=`sw_vers -productVersion` macOSVersionMajor=`echo $macOSVersion|awk -F '.' '{print $1}'` macOSVersionMinor=`echo $macOSVersion|awk -F '.' '{print $2}'`