Skip to content

Commit 8219e22

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #35 from libxengine/develop
V2.13 Merge
2 parents ceb5eb8 + 876487f commit 8219e22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+692
-93
lines changed

‎.github/workflows/Alma_build.yml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: alma build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: almalinux:${{ matrix.version }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
artifact: x86-64
33+
version: 10
34+
- arch: arm64
35+
runner: ubuntu-24.04-arm
36+
platform: linux/arm64
37+
artifact: Arm64
38+
version: 9
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
version: 10
44+
45+
steps:
46+
- name: Checkout main repository code
47+
uses: actions/checkout@v4
48+
49+
- name: Checkout dependency repository (xengine)
50+
uses: actions/checkout@v4
51+
with:
52+
repository: libxengine/libxengine
53+
path: libxengine
54+
55+
- name: sub module checkout (opensource)
56+
uses: actions/checkout@v4
57+
with:
58+
repository: libxengine/XEngine_OPenSource
59+
path: XEngine_Source/XEngine_DependLibrary
60+
61+
- name: Set TERM variable
62+
run: echo "TERM=xterm" >> $GITHUB_ENV
63+
64+
- name: install system package
65+
run: |
66+
dnf update -y
67+
dnf install gcc g++ make git jq unzip wget -y
68+
69+
- name: install xengine library
70+
run: |
71+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
72+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
73+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
74+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
75+
76+
chmod 777 *
77+
./XEngine_LINEnv.sh -i 3
78+
79+
- name: install depend library
80+
run: dnf install libsrtp-devel srt-devel -y
81+
82+
- name: make
83+
run: |
84+
cd XEngine_Source
85+
make RELEASE=1
86+
make FLAGS=InstallAll
87+
make FLAGS=CleanAll
88+
cd ..
89+
- name: test
90+
run: |
91+
cd XEngine_Release
92+
./XEngine_StreamMediaApp -t
93+
94+
- name: Upload folder as artifact
95+
uses: actions/upload-artifact@v4
96+
with:
97+
name: XEngine_StreamMediaApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
98+
path: XEngine_Release/

‎.github/workflows/Centos_build.yml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
name: centos build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: quay.io/centos/centos:${{ matrix.stream }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
stream: stream9
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
version: 10
35+
stream: stream10
36+
- arch: arm64
37+
runner: ubuntu-24.04-arm
38+
platform: linux/arm64
39+
artifact: Arm64
40+
version: 9
41+
stream: stream9
42+
- arch: arm64
43+
runner: ubuntu-24.04-arm
44+
platform: linux/arm64
45+
artifact: Arm64
46+
version: 10
47+
stream: stream10
48+
49+
steps:
50+
- name: Checkout main repository code
51+
uses: actions/checkout@v4
52+
53+
- name: Checkout dependency repository (xengine)
54+
uses: actions/checkout@v4
55+
with:
56+
repository: libxengine/libxengine
57+
path: libxengine
58+
59+
- name: sub module checkout (opensource)
60+
uses: actions/checkout@v4
61+
with:
62+
repository: libxengine/XEngine_OPenSource
63+
path: XEngine_Source/XEngine_DependLibrary
64+
65+
- name: Set TERM variable
66+
run: echo "TERM=xterm" >> $GITHUB_ENV
67+
68+
- name: install system package
69+
run: |
70+
dnf update -y
71+
dnf install gcc g++ make git jq unzip wget -y
72+
73+
- name: install xengine library
74+
run: |
75+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
76+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
77+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
78+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
79+
80+
chmod 777 *
81+
./XEngine_LINEnv.sh -i 3
82+
83+
- name: install depend library
84+
run: dnf install libsrtp-devel srt-devel -y
85+
86+
- name: make
87+
run: |
88+
cd XEngine_Source
89+
make RELEASE=1
90+
make FLAGS=InstallAll
91+
make FLAGS=CleanAll
92+
cd ..
93+
- name: test
94+
run: |
95+
cd XEngine_Release
96+
./XEngine_StreamMediaApp -t
97+
98+
- name: Upload folder as artifact
99+
uses: actions/upload-artifact@v4
100+
with:
101+
name: XEngine_StreamMediaApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
102+
path: XEngine_Release/

‎.github/workflows/Rocky_build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ jobs:
6565

6666
- name: install system package
6767
run: |
68-
dnf clean all
69-
dnf makecache
70-
dnf distro-sync -y
7168
dnf update -y
7269
dnf install gcc g++ make git jq unzip wget -y
7370
- name: install xengine library
@@ -79,6 +76,7 @@ jobs:
7976
8077
chmod 777 *
8178
./XEngine_LINEnv.sh -i 3
79+
8280
- name: install depend library
8381
run: dnf install libsrtp-devel srt-devel -y
8482

‎.github/workflows/debian_build.yml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: debian:bookworm
19+
image: debian:${{ matrix.name }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
@@ -25,6 +25,14 @@ jobs:
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
2727
artifact: x86-64
28+
name: bookworm
29+
version: 12
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
name: trixie
35+
version: 13
2836

2937
steps:
3038
- name: Checkout main repository code
@@ -50,18 +58,22 @@ jobs:
5058
- name: install system package
5159
run: |
5260
apt update -y
61+
apt upgrade -y
5362
apt install gcc g++ make git jq unzip curl wget -y
54-
apt install libsrt-gnutls-dev libsrtp2-dev -y
5563
5664
- name: install xengine library
5765
run: |
5866
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
59-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
60-
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
61-
cd XEngine_Debian_12_${{ matrix.artifact }}
67+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
68+
unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
69+
cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
6270
6371
chmod 777 *
6472
./XEngine_LINEnv.sh -i 3
73+
74+
- name: install system package
75+
run: apt install libsrt-gnutls-dev libsrtp2-dev -y
76+
6577
- name: make
6678
run: |
6779
cd XEngine_Source
@@ -81,6 +93,6 @@ jobs:
8193
- name: Upload folder as artifact
8294
uses: actions/upload-artifact@v4
8395
with:
84-
name: XEngine_StreamMediaApp-Debian_12_x86-64
96+
name: XEngine_StreamMediaApp-Debian_${{ matrix.version }}_x86-64
8597
path: XEngine_Release/
8698
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- os: macos-13
21-
- os: macos-14
20+
- os: macos-15
21+
- os: macos-15-intel
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:
@@ -48,13 +48,13 @@ jobs:
4848
run: echo "TERM=xterm" >> $GITHUB_ENV
4949

5050
- name: Set up Dependency x86_64 Environment
51-
if: matrix.os == 'macos-13'
51+
if: matrix.os == 'macos-15-intel'
5252
run: |
5353
cd libxengine
5454
chmod 777 *
5555
./XEngine_LINEnv.sh -i 3
5656
- name: Set up Dependency Arm64 Environment
57-
if: matrix.os == 'macos-14'
57+
if: matrix.os == 'macos-15'
5858
run: |
5959
latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
6060
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -83,14 +83,14 @@ jobs:
8383
#./XEngine_StreamMediaApp -t
8484
8585
- name: Upload folder as artifact with mac x64
86-
if: matrix.os == 'macos-13'
86+
if: matrix.os == 'macos-15-intel'
8787
uses: actions/upload-artifact@v4
8888
with:
8989
name: XEngine_StreamMediaApp-Mac_x86_64
9090
path: XEngine_Release/
9191
retention-days: 1
9292
- name: Upload folder as artifact with mac arm
93-
if: matrix.os == 'macos-14'
93+
if: matrix.os == 'macos-15'
9494
uses: actions/upload-artifact@v4
9595
with:
9696
name: XEngine_StreamMediaApp-Mac_Arm64

‎.github/workflows/release.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,24 @@ jobs:
5151
skip_unpack: true
5252
if_no_artifact_found: fail
5353
path: ./XRelease/
54+
- name: Download Alma build
55+
uses: dawidd6/action-download-artifact@v6
56+
with:
57+
workflow: Alma_build.yml
58+
workflow_conclusion: success
59+
check_artifacts: false
60+
skip_unpack: true
61+
if_no_artifact_found: fail
62+
path: ./XRelease/
63+
- name: Download CentOS build
64+
uses: dawidd6/action-download-artifact@v6
65+
with:
66+
workflow: Centos_build.yml
67+
workflow_conclusion: success
68+
check_artifacts: false
69+
skip_unpack: true
70+
if_no_artifact_found: fail
71+
path: ./XRelease/
5472
- name: Download macbuild
5573
uses: dawidd6/action-download-artifact@v6
5674
with:
@@ -85,7 +103,7 @@ jobs:
85103
build=$(echo $latest_tag | cut -d '.' -f 4)
86104
87105
new_minor=$((minor + 1))
88-
new_version="$major.$new_minor.0.$build"
106+
new_version="$major.$new_minor.$patch.$build"
89107
echo "New version: $new_version"
90108
echo "new_tag=$new_version" >> $GITHUB_OUTPUT
91109
echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT

‎CHANGELOG‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
XEngine_StreamMedia V2.13.0.1001
2+
3+
ci:增加了centos alma系统支持
4+
增加:http验证功能支持
5+
更新:依赖库
6+
修改:启动参数不区分大小写
7+
修改:统一Http错误码
8+
修正:某些时候配置读取问题
9+
10+
ci:add alma and centos and debian 13 system support
11+
added:http basic and digest verification
12+
update:depend library
13+
modify:start parameter does not case sensitive
14+
modify:Unify HTTP error code definitions
15+
fixed:sometime configure read memory leak
16+
=======================================================
117
XEngine_StreamMedia V2.12.0.1001
218

319
added:webrtc push stream test code

‎XEngine_Docment/Docment_en.docx‎

-400 Bytes
Binary file not shown.

‎XEngine_Docment/Docment_zh.docx‎

-798 Bytes
Binary file not shown.

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
"LogLeave": 17,
8181
"LogType": 32
8282
},
83+
"XVerification": {
84+
"bEnable": false,
85+
"tszUser": "xengine",
86+
"tszPass": "123123aa",
87+
"tszAPIUrl": "",
88+
"nVerType": 2
89+
},
8390
"XReport":{
8491
"bEnable":true,
8592
"tszServiceName":"XEngine_StreamMedia",

0 commit comments

Comments
 (0)