Skip to content

Commit 7deb0f7

Browse files
committed
Update ST for AppleM1/M2/M3.
1 parent 4cb96bd commit 7deb0f7

40 files changed

+2782
-1287
lines changed

3rdparty/st-srs/Dockerfile.cov

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM ossrs/srs:dev-gcc7
2+
3+
# Install depends tools.
4+
RUN yum install -y gcc make gcc-c++ patch unzip perl git
5+
6+
# Build and install SRS.
7+
COPY . /st
8+
WORKDIR /st
9+
10+
# Note that we must enable the gcc7 or link failed.
11+
RUN scl enable devtoolset-7 -- make linux-debug-gcov
12+

3rdparty/st-srs/Dockerfile.test

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM ossrs/srs:dev-gcc7
2+
3+
# Install depends tools.
4+
RUN yum install -y gcc make gcc-c++ patch unzip perl git
5+
6+
# Build and install SRS.
7+
COPY . /st
8+
WORKDIR /st
9+
10+
# Note that we must enable the gcc7 or link failed.
11+
RUN scl enable devtoolset-7 -- make linux-debug-utest
12+
13+
# Run utest
14+
RUN ./obj/st_utest
15+

3rdparty/st-srs/LICENSE

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
The state-threads is provided under the terms of the MPL-1.1 or the
2+
GPL-2.0-or-later. For more information about these licenses, please see
3+
https://spdx.org/licenses/MPL-1.1.html and
4+
https://spdx.org/licenses/GPL-2.0-or-later.html
5+
6+
Individual files contain the following tag instead of the full license text.
7+
8+
SPDX-License-Identifier: MPL-1.1 OR GPL-2.0-or-later
9+
10+
New source code and all source code in the "tools" and "utest" directory
11+
is distributed under the MIT style license.
12+
13+
SPDX-License-Identifier: MIT
14+
15+
This enables machine processing of license information based on the SPDX
16+
License Identifiers that are here available: http://spdx.org/licenses/
17+
18+
---------------------------------------------------------------------------
19+
Note: https://github.com/ossrs/state-threads/blob/srs/README#L68
20+
21+
The State Threads library is a derivative of the Netscape Portable
22+
Runtime library (NSPR). All source code in this directory is
23+
distributed under the terms of the Mozilla Public License (MPL) version
24+
1.1 or the GNU General Public License (GPL) version 2 or later. For
25+
more information about these licenses please see
26+
http://www.mozilla.org/MPL/ and http://www.gnu.org/copyleft/.
27+
28+
All source code in the "examples" directory is distributed under the BSD
29+
style license.
30+

0 commit comments

Comments
 (0)