ci(cd): add libdrm-dev to the debian list and use a committed icon on Windows

vcpkg's vaapi feature builds libva, which needs libdrm headers: the CI
Linux job installs libdrm-dev and the CD debian container did not
(fedora/arch already carry libdrm-devel/libdrm), so its vcpkg install
failed with "You will need to install libdrm dependencies".

Windows has no rsvg-convert either: vcpkg's librsvg port is built with
-Drsvg-convert=disabled, so the icon step now copies the committed
512x512 render (assets/app-icon.png); the Linux icon step falls back to
it too when librsvg2-bin is missing.
This commit is contained in:
2026-09-24 17:17:31 +08:00
parent ea96357806
commit 5fd1c151da
2 changed files with 7 additions and 4 deletions
+7 -4
View File
@@ -109,7 +109,7 @@ jobs:
libasound2-dev libpulse-dev libsndfile1-dev \
libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \
libvulkan-dev libxkbcommon-dev libxkbcommon-x11-dev \
gdb xvfb librsvg2-bin autoconf autoconf-archive automake libtool
gdb xvfb libdrm-dev librsvg2-bin autoconf autoconf-archive automake libtool
;;
fedora)
dnf install -y \
@@ -205,8 +205,8 @@ jobs:
rsvg-convert -w 512 -h 512 Oak_Icon.svg -o icons/icon.png
else
# Defensive: some containers (openKylin) may not carry
# librsvg2-bin; the scalable icon still installs.
echo "::warning::rsvg-convert is unavailable; packaging the scalable icon only"
# librsvg2-bin; fall back to the committed 512x512 render.
cp assets/app-icon.png icons/icon.png
fi
- name: Package
@@ -541,8 +541,11 @@ jobs:
- name: Generate app icon (PNG from Oak_Icon.svg)
run: |
# vcpkg's librsvg port builds with -Drsvg-convert=disabled (it
# ships the library only and provides no rsvg-convert.exe), so
# use the committed 512x512 render of Oak_Icon.svg.
New-Item -ItemType Directory -Force icons | Out-Null
& "vcpkg_installed\x64-windows\tools\librsvg\rsvg-convert.exe" -w 512 -h 512 Oak_Icon.svg -o icons/icon.png
Copy-Item assets/app-icon.png icons/icon.png
- name: Build (release)
run: |