Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: ./.github/workflows/_meta.yaml
with:
distro: 'ubuntu'
codenames: '["jammy", "noble"]'
codenames: '["jammy", "noble", "resolute"]'
architectures: '["amd64", "arm64"]'
release: false

Expand Down
7 changes: 7 additions & 0 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ usage() {
echo -e " * trixie"
echo -e " * jammy"
echo -e " * noble"
echo -e " * resolute"
}

if [[ -z ${1} ]]; then
Expand Down Expand Up @@ -48,6 +49,12 @@ case ${cli_release} in
llvm_ver="19"
llvmspirvlib_ver="19"
;;
'resolute')
release="ubuntu:resolute"
gcc_ver="15"
llvm_ver="20"
llvmspirvlib_ver="20"
;;
*)
echo "Invalid release."
usage
Expand Down
2 changes: 2 additions & 0 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ packages:
- jammy-arm64
- noble-amd64
- noble-arm64
- resolute-amd64
- resolute-arm64
8 changes: 6 additions & 2 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,8 @@ prepare_extra_amd64() {
wget -q -O - https://github.com/intel/media-driver/commit/25fb926.patch | git apply
mkdir build && pushd build
cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
-DCMAKE_C_FLAGS="${CFLAGS} -Wno-error=array-bounds" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -Wno-error=array-bounds" \
-DENABLE_KERNELS=ON \
-DENABLE_NONFREE_KERNELS=ON \
LIBVA_DRIVERS_PATH=${TARGET_DIR}/lib/dri \
Expand Down Expand Up @@ -551,8 +553,8 @@ prepare_extra_amd64() {
# MESA
# Minimal libs for AMD VAAPI, AMD RADV and Intel ANV
if [[ ${LLVM_VER} -ge 15 ]]; then
if [[ ${LLVMSPIRVLIB_VER} -ge 15 ]]; then
# Intel ANV requires llvmspirvlib >= 15
if [[ ${LLVMSPIRVLIB_VER} -ge 15 && ${LLVMSPIRVLIB_VER} -le 20 ]]; then
# Intel ANV requires llvmspirvlib >= 15 (and <= 20 in mesa 25.0)
mesa_vk_drv="amd,intel"
mesa_llvm_clc="enabled"
apt-get install -y {llvm-,libllvmspirvlib-,libclc-,libclang-,libclang-cpp}${LLVMSPIRVLIB_VER}-dev libudev-dev
Expand Down Expand Up @@ -626,6 +628,8 @@ prepare_extra_amd64() {
git clone -b v7.351.0 --recursive --depth=1 https://github.com/haasn/libplacebo.git
# Wa for the regression made in Mesa RADV
git -C libplacebo apply ${SOURCE_DIR}/builder/patches/libplacebo/*.patch
# Fix build script for python 3.14
wget -q -O - https://github.com/haasn/libplacebo/commit/12509c0.patch | git -C libplacebo apply
sed -i 's|env: python_env,||g' libplacebo/src/vulkan/meson.build
meson setup libplacebo placebo_build \
--prefix=${TARGET_DIR} \
Expand Down
Loading