OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: replace plain meson with explicit meson setup

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32030>
This commit is contained in:
Eric Engestrom
2024-11-07 11:37:27 +01:00
committed by Marge Bot
parent 1149d69b39
commit f789dd42b8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/build-vkd3d-proton.sh
View File

@@ -15,7 +15,7 @@ VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
function build_arch { function build_arch {
local arch="$1" local arch="$1"
meson \ meson setup \
-Denable_tests=true \ -Denable_tests=true \
--buildtype release \ --buildtype release \
--prefix "$VKD3D_PROTON_DST_DIR" \ --prefix "$VKD3D_PROTON_DST_DIR" \

8
.gitlab-ci/image-tags.yml
View File

@@ -29,8 +29,8 @@ variables:
DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2" DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2"
DEBIAN_TEST_GL_TAG: "20241106-wlproto2" DEBIAN_TEST_GL_TAG: "20241106-wlproto2"
DEBIAN_TEST_VK_TAG: "20241106-wlproto2" DEBIAN_TEST_VK_TAG: "20241107-setup"
KERNEL_ROOTFS_TAG: "20241106-wlproto2" KERNEL_ROOTFS_TAG: "20241107-setup"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20241002-pyutils" DEBIAN_PYUTILS_TAG: "20241002-pyutils"
@@ -46,7 +46,7 @@ variables:
WINDOWS_X64_MSVC_TAG: "20240827-v143" WINDOWS_X64_MSVC_TAG: "20240827-v143"
WINDOWS_X64_BUILD_PATH: "windows/x86_64_build" WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
WINDOWS_X64_BUILD_TAG: "20240910-SDK614" WINDOWS_X64_BUILD_TAG: "20241107-setup"
WINDOWS_X64_TEST_PATH: "windows/x86_64_test" WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
WINDOWS_X64_TEST_TAG: "20240910-SDK614" WINDOWS_X64_TEST_TAG: "20241107-setup"

4
.gitlab-ci/windows/mesa_deps_build.ps1
View File

@@ -20,7 +20,7 @@ if (!$?) {
Write-Host "Building DirectX-Headers" Write-Host "Building DirectX-Headers"
$dxheaders_build = New-Item -ItemType Directory -Path ".\deps\DirectX-Headers" -Name "build" $dxheaders_build = New-Item -ItemType Directory -Path ".\deps\DirectX-Headers" -Name "build"
Push-Location -Path $dxheaders_build.FullName Push-Location -Path $dxheaders_build.FullName
meson .. --backend=ninja -Dprefix="$depsInstallPath" --buildtype=release -Db_vscrt=mt && ` meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --buildtype=release -Db_vscrt=mt && `
ninja -j32 install ninja -j32 install
$buildstatus = $? $buildstatus = $?
Pop-Location Pop-Location
@@ -45,7 +45,7 @@ robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1 Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
$zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build" $zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
Push-Location -Path $zlib_build.FullName Push-Location -Path $zlib_build.FullName
meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && ` meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
ninja -j32 install ninja -j32 install
$buildstatus = $? $buildstatus = $?
Pop-Location Pop-Location

4
.gitlab-ci/windows/mesa_deps_libva.ps1
View File

@@ -29,7 +29,7 @@ Pop-Location
# libva already has a build dir in their repo, use builddir instead # libva already has a build dir in their repo, use builddir instead
$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir" $libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
Push-Location -Path $libva_build.FullName Push-Location -Path $libva_build.FullName
meson .. -Dprefix="$depsInstallPath" meson setup .. -Dprefix="$depsInstallPath"
ninja -j32 install ninja -j32 install
$buildstatus = $? $buildstatus = $?
Pop-Location Pop-Location
@@ -65,7 +65,7 @@ Write-Host "Building libva-utils"
# libva-utils already has a build dir in their repo, use builddir instead # libva-utils already has a build dir in their repo, use builddir instead
$libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir" $libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
Push-Location -Path $libva_utils_build.FullName Push-Location -Path $libva_utils_build.FullName
meson .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig" meson setup .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
ninja -j32 install ninja -j32 install
$buildstatus = $? $buildstatus = $?
Pop-Location Pop-Location