external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Disable CherryPy by --cherrypy=off. 4.0.90

Browse source
This commit is contained in:
winlin 2021-04-24 19:26:24 +08:00
parent de1c7522f0
commit 5232f9e043
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -191,6 +191,7 @@ Other documents:
## V4 changes ## V4 changes
* v4.0, 2021-04-24, Disable CherryPy by --cherrypy=off. 4.0.90
* v4.0, 2021-04-01, RTC: Refine TWCC and SDP exchange. 4.0.88 * v4.0, 2021-04-01, RTC: Refine TWCC and SDP exchange. 4.0.88
* v4.0, 2021-03-24, RTC: Support WebRTC re-publish stream. 4.0.87 * v4.0, 2021-03-24, RTC: Support WebRTC re-publish stream. 4.0.87
* v4.0, 2021-03-24, RTC: Use fast parse TWCC-ID, ignore in packet parsing. 4.0.86 * v4.0, 2021-03-24, RTC: Use fast parse TWCC-ID, ignore in packet parsing. 4.0.86

2
trunk/auto/options.sh
View file

@ -46,7 +46,7 @@ SRS_HTTP_API=YES
SRS_HTTP_CORE=YES SRS_HTTP_CORE=YES
SRS_HLS=YES SRS_HLS=YES
SRS_DVR=YES SRS_DVR=YES
SRS_CHERRYPY=YES SRS_CHERRYPY=NO
# #
################################################################ ################################################################
# FFmpeg stub is the stub code in SRS for ingester or encoder. # FFmpeg stub is the stub code in SRS for ingester or encoder.

19
trunk/configure vendored
View file

@ -505,7 +505,6 @@ doclean:
(cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players)
clean: clean_srs clean_modules clean: clean_srs clean_modules
@echo "You can clean each some components, see make help"
destroy: destroy:
(cd ${SRS_OBJS_DIR} && rm -rf ${SRS_PLATFORM}) (cd ${SRS_OBJS_DIR} && rm -rf ${SRS_PLATFORM})
@ -567,7 +566,7 @@ echo "" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
server: _prepare_dir server: _prepare_dir
@echo "Build the srs(simple rtmp server) over ST(state-threads)" @echo "Build the SRS server"
\$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs
END END
@ -786,20 +785,22 @@ done
# Do cleanup when configure done. # Do cleanup when configure done.
##################################################################################### #####################################################################################
if [[ $SRS_CLEAN == YES && -f Makefile ]]; then if [[ $SRS_CLEAN == YES && -f Makefile ]]; then
echo "Do full cleanup, you can disable it by: --clean=off" #echo "Do full cleanup, you can disable it by: --clean=off"
make clean make clean
fi fi
##################################################################################### #####################################################################################
# next step # next step
##################################################################################### #####################################################################################
echo "" if [[ $SRS_CHERRYPY == YES ]]; then
echo "You can run 3rdparty applications:" echo ""
if [ $SRS_HTTP_CALLBACK = YES ]; then echo "You can run 3rdparty applications:"
echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" if [ $SRS_HTTP_CALLBACK = YES ]; then
echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server"
fi
fi fi
echo "" echo ""
echo "You can build SRS:" echo "You can build SRS:"
echo "\" make \" to build the srs(simple rtmp server)." echo "\" make \" to build the SRS server"
echo "\" make help \" to get the usage of make" echo "\" make help \" to get some help"

2
trunk/src/core/srs_core_version4.hpp
View file

@ -26,6 +26,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 89 #define VERSION_REVISION 90
#endif #endif