diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22d7ee569..e7d32625f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,7 +126,7 @@ jobs: which make gcc g++ patch cmake pkg-config uname grep sed && (make --version; gcc --version; patch --version; cmake --version; pkg-config --version) && (aclocal --version; autoconf --version; automake --version; uname -a) && - cd $(cygpath -u $SRS_WORKSPACE)/trunk && ./configure && make + cd $(cygpath -u $SRS_WORKSPACE)/trunk && ./configure --gb28181=on && make ################################################################################################################## - name: Package SRS env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bd37fd20..6b97af453 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: run: | WORKDIR=$(cygpath -u $SRS_WORKSPACE) && export PATH=/usr/bin:/usr/local/bin && cd ${WORKDIR} && pwd && ls -lh && rm -rf trunk/objs && tar xf objs.tar.bz2 -C trunk/ && du -sh trunk/* && - cd ${WORKDIR}/trunk && ./configure --utest=on && make utest && ./objs/srs_utest + cd ${WORKDIR}/trunk && ./configure --gb28181=on --utest=on && make utest && ./objs/srs_utest outputs: SRS_CYGWIN_DONE: ok diff --git a/trunk/Dockerfile b/trunk/Dockerfile index 2bb31c558..d27c3c63d 100644 --- a/trunk/Dockerfile +++ b/trunk/Dockerfile @@ -23,7 +23,7 @@ WORKDIR /srs/trunk # Build and install SRS. # Note that SRT is enabled by default, so we configure without --srt=on. -RUN ./configure --gb28181=on --sanitizer-static=on && make && make install +RUN ./configure --gb28181=on --sanitizer-static=on && make && make install # All config files for SRS. RUN cp -R conf /usr/local/srs/conf && \ diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index ca01eb61d..1b22f0256 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2022-12-04, Cygwin: Enable gb28181 for Windows. v5.0.105 * v5.0, 2022-12-04, Asan: Set asan loging callback. v5.0.104 * v5.0, 2022-12-02, GB28181: Enable GB for CentOS 7 package. v5.0.103 * v5.0, 2022-12-02, Package script support extra options. v5.0.102 diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index bf3c9656c..968e7c692 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 104 +#define VERSION_REVISION 105 #endif