From 942a2c80cc5110f9c8640ffe1925600182ae2284 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Tue, 6 Oct 2026 02:28:20 -0400
Subject: [PATCH] Release: ALSA build/runtime deps (Linux, FreeBSD, deb/rpm);
 vendor Flatpak crate sources on a plain runner

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/release.yml | 37 +++++++++++++++++++++++++----------
 packaging/freebsd/package.sh  |  3 ++-
 packaging/linux/nfpm.yaml     |  2 ++
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 11616f0..eec3be5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -204,7 +204,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
-            libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev \
+            libasound2-dev libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev \
             desktop-file-utils appstream python3-yaml
           curl -fsSL -o "$RUNNER_TEMP/nfpm.deb" \
             "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_${{ matrix.deb }}.deb"
@@ -236,9 +236,29 @@ jobs:
           path: dist/release/*
           if-no-files-found: error
 
+  flatpak-sources:
+    name: Flatpak crate sources
+    needs: version
+    runs-on: ubuntu-latest
+    environment: release
+    steps:
+      - uses: actions/checkout@v4
+      - name: Vendor the crate sources (flatpak builds run offline)
+        run: |
+          python3 -m venv "$RUNNER_TEMP/venv"
+          "$RUNNER_TEMP/venv/bin/pip" install --quiet aiohttp tomlkit
+          curl -fsSL -o "$RUNNER_TEMP/flatpak-cargo-generator.py" \
+            https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py
+          "$RUNNER_TEMP/venv/bin/python" "$RUNNER_TEMP/flatpak-cargo-generator.py" Cargo.lock -o cargo-sources.json
+      - uses: actions/upload-artifact@v4
+        with:
+          name: flatpak-cargo-sources
+          path: cargo-sources.json
+          if-no-files-found: error
+
   flatpak:
     name: Linux Flatpak
-    needs: version
+    needs: [version, flatpak-sources]
     runs-on: ubuntu-latest
     environment: release
     # Best effort: Flathub builds from source itself (playbook §7); the bundle is a convenience.
@@ -256,13 +276,10 @@ jobs:
           # No cargo in this container: the same edit `cargo xtask version set` makes.
           sed -i "0,/^version = \".*\"/s//version = \"$DECKCRAFT_VERSION\"/" Cargo.toml
           grep -m1 '^version' Cargo.toml
-      - name: Vendor the crate sources (flatpak builds run offline)
-        run: |
-          dnf install -y python3-pip
-          pip3 install --quiet aiohttp tomlkit
-          curl -fsSL -o "$RUNNER_TEMP/flatpak-cargo-generator.py" \
-            https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py
-          python3 "$RUNNER_TEMP/flatpak-cargo-generator.py" Cargo.lock -o packaging/linux/flatpak/cargo-sources.json
+      - uses: actions/download-artifact@v4
+        with:
+          name: flatpak-cargo-sources
+          path: packaging/linux/flatpak
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           manifest-path: packaging/linux/flatpak/ai.storyteller.deckcraft.yml
@@ -305,7 +322,7 @@ jobs:
           # copy stays small.
           copyback: true
           prepare: |
-            pkg install -y bash git curl pkgconf cmake python3 libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader fontconfig freetype2
+            pkg install -y bash git curl pkgconf cmake python3 libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader fontconfig freetype2 alsa-lib
             curl -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal
           run: |
             . "$HOME/.cargo/env"
diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.sh
index 9f6caac..a8c0549 100755
--- a/packaging/freebsd/package.sh
+++ b/packaging/freebsd/package.sh
@@ -6,7 +6,8 @@
 # Usage: packaging/freebsd/package.sh [--skip-build]
 #
 # Run on FreeBSD (CI: a FreeBSD 14 VM via vmactions/freebsd-vm). Runtime needs: libxkbcommon,
-# wayland or libX11, and mesa (Vulkan or EGL): `pkg install libxkbcommon libX11 mesa-libs vulkan-loader`.
+# wayland or libX11, mesa (Vulkan or EGL) and alsa-lib:
+# `pkg install libxkbcommon libX11 mesa-libs vulkan-loader alsa-lib`.
 set -euo pipefail
 # shellcheck source=../common.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../common.sh"
diff --git a/packaging/linux/nfpm.yaml b/packaging/linux/nfpm.yaml
index 6542a35..0d41fc7 100644
--- a/packaging/linux/nfpm.yaml
+++ b/packaging/linux/nfpm.yaml
@@ -32,6 +32,7 @@ overrides:
       - libc6 (>= 2.35)
       - libgcc-s1
       - libxkbcommon0
+      - libasound2 | libasound2t64
       - libvulkan1 | libegl1
     recommends:
       - libwayland-client0
@@ -45,6 +46,7 @@ overrides:
   rpm:
     depends:
       - libxkbcommon
+      - alsa-lib
       - (vulkan-loader or libglvnd-egl)
     recommends:
       - libwayland-client