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

ci: uprev virglrenderer

Browse Source 
This change contains a memory unmap fix and makes the render server mandatory.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20938>
This commit is contained in:
Corentin Noël
2023-01-26 16:32:15 +01:00
committed by Marge Bot
parent 41d5f0ee09
commit 74967249d2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-crosvm.sh
View File

@@ -12,12 +12,12 @@ pushd /platform/crosvm
git checkout "$CROSVM_VERSION" git checkout "$CROSVM_VERSION"
git submodule update --init git submodule update --init
VIRGLRENDERER_VERSION=3f2685355f71201f22b98c19aa778b43732c8435 VIRGLRENDERER_VERSION=fe92a14ab251c2ef7e0640232f15197d3253a8eb
rm -rf third_party/virglrenderer rm -rf third_party/virglrenderer
git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
pushd third_party/virglrenderer pushd third_party/virglrenderer
git checkout "$VIRGLRENDERER_VERSION" git checkout "$VIRGLRENDERER_VERSION"
meson build/ -Drender-server=true -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS meson build/ -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS
ninja -C build install ninja -C build install
popd popd

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

@@ -1,6 +1,6 @@
variables: variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2023-01-20-kernel-6.1-439f86d0" DEBIAN_BASE_TAG: "2023-01-26-virglrenderer"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2023-01-24-android" DEBIAN_BUILD_TAG: "2023-01-24-android"
@@ -21,7 +21,7 @@ variables:
ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1" ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1"
FEDORA_X86_BUILD_TAG: "2023-01-20-all-in-1" FEDORA_X86_BUILD_TAG: "2023-01-20-all-in-1"
KERNEL_ROOTFS_TAG: "2023-01-20-kernel-6.1-439f86d0" KERNEL_ROOTFS_TAG: "2023-01-26-virglrenderer"
WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"