From f6d15c41c55c7eee285e6cd55c7436b162a1207e Mon Sep 17 00:00:00 2001
From: CDrummond <craig.p.drummond@gmail.com>
Date: Sat, 20 Sep 2025 09:24:06 +0100
Subject: [PATCH] Re-enable more builds

---
 .github/workflows/build.yml | 105 +++++++++++++++++++++++++++++++++---
 1 file changed, 97 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4f17d8..3cf58b1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  Linux_x86:
+  Linux_x86_symphonia:
     runs-on: ubuntu-latest
 
     steps:
@@ -30,11 +30,38 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: bliss-analyser-linux-x86
+        name: bliss-analyser-linux-x86-symphonia
         path: releases/
 
 
-  Linux_arm:
+  Linux_x86_ffmpeg:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Packages
+      run: sudo apt-get update && sudo apt-get install build-essential yasm -y
+
+    - name: Build x86 static-ffmpeg version
+      run: |
+        cargo build --release --features=libav,staticlibav
+        strip target/release/bliss-analyser
+        mkdir releases
+        cp target/release/bliss-analyser releases/bliss-analyser
+        cp UserGuide.md releases/README.md
+        cp LICENSE releases/
+        cp configs/linux.ini releases/config.ini
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: bliss-analyser-linux-x86-ffmpeg
+        path: releases/
+
+
+  Linux_arm_symphonia:
     runs-on: ubuntu-latest
 
     steps:
@@ -49,11 +76,30 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: bliss-analyser-linux-arm
+        name: bliss-analyser-linux-arm-symphonia
         path: releases/
 
 
-  macOS:
+  Linux_arm_ffmpeg:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Build ARM static-ffmpeg on Debian
+      run: |
+        docker build -t bliss-analyser-cross - < docker/Dockerfile_Bullseye_static
+        docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-cross
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: bliss-analyser-linux-arm-ffmpeg
+        path: releases/
+
+
+  macOS_symphonia:
     runs-on: macos-13
 
     steps:
@@ -100,11 +146,11 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: bliss-analyser-mac
+        name: bliss-analyser-mac-symphonia
         path: releases/
 
 
-  Windows:
+  Windows_symphonia:
     runs-on: windows-2022
 
     steps:
@@ -131,5 +177,48 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: bliss-analyser-windows
+        name: bliss-analyser-windows-symphonia
         path: releases/
+
+
+  Windows_ffmpeg:
+    runs-on: windows-2022
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install deps
+      run: |
+        $VCINSTALLDIR = $(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath)
+        Add-Content $env:GITHUB_ENV "LIBCLANG_PATH=${VCINSTALLDIR}\VC\Tools\LLVM\x64\bin`n"
+        Invoke-WebRequest "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" -OutFile ffmpeg-shared.7z
+        7z x ffmpeg-shared.7z
+        mkdir deps
+        mv ffmpeg-*/* deps/
+        Add-Content $env:GITHUB_ENV "FFMPEG_DIR=${pwd}\deps`n"
+        Add-Content $env:GITHUB_PATH "${pwd}\deps\bin`n"
+
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+        components: rustfmt, clippy
+
+    - name: Build
+      run: |
+        cargo build --release --features=libav
+        mkdir releases
+        cp target/release/bliss-analyser.exe releases/bliss-analyser.exe
+        cp deps/bin/*.dll releases/
+        cp UserGuide.md releases/README.md
+        cp LICENSE releases/
+        cp configs/windows.ini releases/config.ini
+        cp c:\Windows\system32\vcruntime140.dll releases
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: bliss-analyser-windows-ffmpeg
+        path: releases/
\ No newline at end of file