V2.13 Merge

.github/workflows/Alma_build.yml

@@ -0,0 +1,98 @@
+name: alma build workflows
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.runner }}
+    container:
+      image: almalinux:${{ matrix.version }}
+      options: --platform ${{ matrix.platform }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 9
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 10
+          - arch: arm64
+            runner: ubuntu-24.04-arm 
+            platform: linux/arm64
+            artifact: Arm64
+            version: 9
+          - arch: arm64
+            runner: ubuntu-24.04-arm 
+            platform: linux/arm64
+            artifact: Arm64
+            version: 10
+
+    steps:
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/libxengine
+          path: libxengine
+
+      - name: sub module checkout (opensource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_DependLibrary
+
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
+      - name: install system package
+        run: |
+            dnf update -y
+            dnf install gcc g++ make git jq unzip wget -y
+
+      - name: install xengine library
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 3
+
+      - name: install depend library
+        run: dnf install libsrtp-devel srt-devel -y
+
+      - name: make
+        run: |
+            cd XEngine_Source
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+            cd ..
+      - name: test
+        run: |
+            cd XEngine_Release
+            ./XEngine_StreamMediaApp -t
+
+      - name: Upload folder as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_StreamMediaApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
+          path: XEngine_Release/

.github/workflows/Centos_build.yml

@@ -0,0 +1,102 @@
+name: centos build workflows
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.runner }}
+    container:
+      image: quay.io/centos/centos:${{ matrix.stream }}
+      options: --platform ${{ matrix.platform }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 9
+            stream: stream9
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 10
+            stream: stream10
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
+            version: 9
+            stream: stream9
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
+            version: 10
+            stream: stream10
+
+    steps:
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/libxengine
+          path: libxengine
+
+      - name: sub module checkout (opensource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_DependLibrary
+
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
+      - name: install system package
+        run: |
+            dnf update -y
+            dnf install gcc g++ make git jq unzip wget -y
+
+      - name: install xengine library
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 3
+
+      - name: install depend library
+        run: dnf install libsrtp-devel srt-devel -y
+
+      - name: make
+        run: |
+            cd XEngine_Source
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+            cd ..
+      - name: test
+        run: |
+            cd XEngine_Release
+            ./XEngine_StreamMediaApp -t
+
+      - name: Upload folder as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_StreamMediaApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
+          path: XEngine_Release/

.github/workflows/Rocky_build.yml

@@ -65,9 +65,6 @@ jobs:
 
       - name: install system package
         run: |
-            dnf clean all
-            dnf makecache
-            dnf distro-sync -y
             dnf update -y
             dnf install gcc g++ make git jq unzip wget -y
       - name: install xengine library
@@ -79,6 +76,7 @@ jobs:
 
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
+
       - name: install depend library
         run: dnf install libsrtp-devel srt-devel -y
 

.github/workflows/debian_build.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     container:
-      image: debian:bookworm
+      image: debian:${{ matrix.name }}
       options: --platform ${{ matrix.platform }}
     strategy:
       matrix:
@@ -25,6 +25,14 @@ jobs:
             runner: ubuntu-24.04
             platform: linux/amd64
             artifact: x86-64
+            name: bookworm
+            version: 12
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            name: trixie
+            version: 13
 
     steps:
       - name: Checkout main repository code
@@ -50,18 +58,22 @@ jobs:
       - name: install system package
         run: |
             apt update -y
+            apt upgrade -y
             apt install gcc g++ make git jq unzip curl wget -y
-            apt install libsrt-gnutls-dev libsrtp2-dev -y
 
       - name: install xengine library
         run: |
             latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
-            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
-            unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
-            cd XEngine_Debian_12_${{ matrix.artifact }}
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
 
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
+
+      - name: install system package
+        run: apt install libsrt-gnutls-dev libsrtp2-dev -y
+
       - name: make
         run: |
             cd XEngine_Source
@@ -81,6 +93,6 @@ jobs:
       - name: Upload folder as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_StreamMediaApp-Debian_12_x86-64
+          name: XEngine_StreamMediaApp-Debian_${{ matrix.version }}_x86-64
           path: XEngine_Release/
           retention-days: 1

.github/workflows/macbuild.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-          - os: macos-14
+          - os: macos-15
+          - os: macos-15-intel
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -48,13 +48,13 @@ jobs:
         run: echo "TERM=xterm" >> $GITHUB_ENV
 
       - name: Set up Dependency x86_64 Environment 
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
             cd libxengine
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
       - name: Set up Dependency Arm64 Environment 
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-15'
         run: |
             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)
             wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -83,14 +83,14 @@ jobs:
             #./XEngine_StreamMediaApp -t
 
       - name: Upload folder as artifact with mac x64
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_StreamMediaApp-Mac_x86_64
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with mac arm
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-15'
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_StreamMediaApp-Mac_Arm64

.github/workflows/release.yml

@@ -51,6 +51,24 @@ jobs:
           skip_unpack: true
           if_no_artifact_found: fail
           path: ./XRelease/
+      - name: Download Alma build
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: Alma_build.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./XRelease/
+      - name: Download CentOS build
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: Centos_build.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./XRelease/
       - name: Download macbuild
         uses: dawidd6/action-download-artifact@v6
         with:
@@ -85,7 +103,7 @@ jobs:
           build=$(echo $latest_tag | cut -d '.' -f 4)
 
           new_minor=$((minor + 1))
-          new_version="$major.$new_minor.0.$build"
+          new_version="$major.$new_minor.$patch.$build"
           echo "New version: $new_version"
           echo "new_tag=$new_version" >> $GITHUB_OUTPUT
           echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT

CHANGELOG

@@ -1,3 +1,19 @@
+XEngine_StreamMedia V2.13.0.1001
+
+ci:增加了centos alma系统支持
+增加:http验证功能支持
+更新:依赖库
+修改:启动参数不区分大小写
+修改:统一Http错误码
+修正:某些时候配置读取问题
+
+ci:add alma and centos and debian 13 system support
+added:http basic and digest verification
+update:depend library
+modify:start parameter does not case sensitive
+modify:Unify HTTP error code definitions
+fixed:sometime configure read memory leak
+=======================================================
 XEngine_StreamMedia V2.12.0.1001
 
 added:webrtc push stream test code

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -80,6 +80,13 @@
         "LogLeave": 17,
         "LogType": 32
     },
+    "XVerification": {
+        "bEnable": false,
+        "tszUser": "xengine",
+        "tszPass": "123123aa",
+        "tszAPIUrl": "",
+        "nVerType": 2
+    },
     "XReport":{
         "bEnable":true,
         "tszServiceName":"XEngine_StreamMedia",