diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh index 0e6d9559dcf..f71394c63ab 100644 --- a/.gitlab-ci/container/alpine/x86_64_build.sh +++ b/.gitlab-ci/container/alpine/x86_64_build.sh @@ -34,7 +34,6 @@ DEPS=( glslang graphviz libclc-dev - libdrm-dev libpciaccess-dev libva-dev linux-headers @@ -72,6 +71,8 @@ pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0 . .gitlab-ci/container/build-rust.sh build +. .gitlab-ci/container/build-libdrm.sh + EXTRA_MESON_ARGS='--prefix=/usr' \ . .gitlab-ci/container/build-wayland.sh diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh index 479ea074da7..787470bc537 100644 --- a/.gitlab-ci/container/build-libdrm.sh +++ b/.gitlab-ci/container/build-libdrm.sh @@ -7,7 +7,7 @@ set -uex section_start libdrm "Building libdrm" -export LIBDRM_VERSION=libdrm-2.4.122 +export LIBDRM_VERSION=libdrm-2.4.133 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \ https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 54b188b6f57..73d78158870 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -20,7 +20,7 @@ include: variables: DEBIAN_BUILD_BASE_TAG: "20251016-riscv" - DEBIAN_BUILD_TAG: "20260309-D3D619" + DEBIAN_BUILD_TAG: "20260428-libdrm" DEBIAN_TEST_BASE_TAG: "20260420-traces" DEBIAN_TEST_ANDROID_TAG: "20260420-traces" @@ -28,13 +28,13 @@ variables: DEBIAN_TEST_VIDEO_TAG: "20260420-traces" DEBIAN_TEST_VK_TAG: "20260420-traces" - ALPINE_X86_64_BUILD_TAG: "20251001-realninja" + ALPINE_X86_64_BUILD_TAG: "20260429-libdrm" - FEDORA_X86_64_BUILD_TAG: "20250917-rust" + FEDORA_X86_64_BUILD_TAG: "20260428-libdrm" KERNEL_TAG: "v6.19-mesa-8a6f" KERNEL_REPO: "gfx-ci/linux" - PKG_REPO_REV: "78fcf356" + PKG_REPO_REV: "e930a803" FIRMWARE_TAG: "8fc31b97" FIRMWARE_REPO: "gfx-ci/firmware"