From e34c0a31167c0bdbd38f5f4d2a485ea7ccb25dcf Mon Sep 17 00:00:00 2001 From: Sil Vilerino Date: Tue, 3 Jan 2023 12:11:49 -0500 Subject: [PATCH] ci: Update mingw and vs2019 libva build dependency to libva/releases/tag/2.17.0 Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh | 5 ++--- .gitlab-ci/image-tags.yml | 4 ++-- .gitlab-ci/windows/mesa_deps_build.ps1 | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh index dc3dc34e839..0637b01d1a6 100644 --- a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh +++ b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh @@ -27,9 +27,8 @@ popd # Building libva git clone https://github.com/intel/libva pushd libva/ -# Checking out commit hash with libva-win32 support -# This feature will be released with libva version 2.17 -git checkout 2579eb0f77897dc01a02c1e43defc63c40fd2988 +# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0) +git checkout 2.17.0 popd # libva already has a build dir in their repo, use builddir instead mkdir -p libva/builddir diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7f8da281769..79b8fcb1396 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -6,7 +6,7 @@ variables: DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" - DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va" + DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" @@ -25,7 +25,7 @@ variables: WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_BUILD_PATH: "windows/x64_build" - WINDOWS_X64_BUILD_TAG: "2022-10-18-wrap-nodownload-va" + WINDOWS_X64_BUILD_TAG: "2023-01-03-ci-libva-2.17" WINDOWS_X64_TEST_PATH: "windows/x64_test" WINDOWS_X64_TEST_TAG: "2022-12-28-piglit-no-install" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index fd588de8709..4367980970d 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -64,10 +64,9 @@ if (!$?) { } Push-Location -Path ".\deps\libva" -Write-Host "Checking out libva commit 2579eb0f77897dc01a02c1e43defc63c40fd2988" -# Checking out commit hash with libva-win32 support -# This feature will be released with libva version 2.17 -git checkout 2579eb0f77897dc01a02c1e43defc63c40fd2988 +Write-Host "Checking out libva df3c584bb79d1a1e521372d62fa62e8b1c52ce6c" +# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0) +git checkout 2.17.0 Pop-Location Write-Host "Building libva"