diff --git a/README.md b/README.md index c25da2bc6..ef585f734 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Remark: ## History +* v2.0, 2019-04-05, Merge [#1312][bug #1312], Fix GCC7 build error, this statement may fall through. 2.0.263 * v2.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 2.0.262 * 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 @@ -1344,6 +1345,7 @@ Winlin [bug #1261]: https://github.com/ossrs/srs/issues/1261 [bug #1274]: https://github.com/ossrs/srs/pull/1274 [bug #1339]: https://github.com/ossrs/srs/pull/1339 +[bug #1312]: https://github.com/ossrs/srs/pull/1312 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/3rdparty/patches/7.http.parser.patch b/trunk/3rdparty/patches/7.http.parser.patch new file mode 100644 index 000000000..89655993c --- /dev/null +++ b/trunk/3rdparty/patches/7.http.parser.patch @@ -0,0 +1,12 @@ +--- 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 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 8f0922f48..a7fc91655 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -482,6 +482,8 @@ if [ $SRS_HTTP_CORE = YES ]; then rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip && cd http-parser-2.1 && patch -p0 < ../../3rdparty/patches/2.http.parser.patch && + # Patch build error for https://github.com/ossrs/srs/pull/1312#issuecomment-480243404 + patch -p0 < ../../3rdparty/patches/7.http.parser.patch && make package && cd .. && rm -rf hp && ln -sf http-parser-2.1 hp && cd .. && rm -f ${SRS_OBJS}/_flag.st.hp.tmp diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 07d075ed7..70de12135 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 262 +#define VERSION_REVISION 263 // generated by configure, only macros. #include