ci: build ARM mesa with X11 OpenGL support
I want to run piglit with baremetal ci and for this opengl support is needed. Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7370>
This commit is contained in:
parent
8bb001313b
commit
ea764c9c51
|
@ -291,7 +291,7 @@ i386_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &i386_build "2020-12-17-use-ephemeral"
|
||||
MESA_IMAGE_TAG: &i386_build "2020-12-23-opengl"
|
||||
|
||||
.use-i386_build:
|
||||
variables:
|
||||
|
@ -305,7 +305,7 @@ ppc64el_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &ppc64el_build "2020-12-17-use-ephemeral"
|
||||
MESA_IMAGE_TAG: &ppc64el_build "2020-12-23-opengl"
|
||||
|
||||
.use-ppc64el_build:
|
||||
variables:
|
||||
|
@ -319,7 +319,7 @@ s390x_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &s390x_build "2020-12-17-use-ephemeral"
|
||||
MESA_IMAGE_TAG: &s390x_build "2020-12-23-opengl"
|
||||
|
||||
.use-s390x_build:
|
||||
variables:
|
||||
|
@ -376,7 +376,7 @@ arm_build:
|
|||
- .fdo.container-build@debian@arm64v8
|
||||
- .container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &arm_build "2020-12-02"
|
||||
MESA_IMAGE_TAG: &arm_build "2020-12-23-opengl"
|
||||
|
||||
.use-arm_build:
|
||||
variables:
|
||||
|
@ -731,13 +731,13 @@ meson-android:
|
|||
variables:
|
||||
UNWIND: "disabled"
|
||||
DRI_LOADERS: >
|
||||
-D glx=disabled
|
||||
-D glx=dri
|
||||
-D gbm=disabled
|
||||
-D egl=enabled
|
||||
-D platforms=[]
|
||||
-D platforms=x11
|
||||
-D osmesa=false
|
||||
GALLIUM_ST: >
|
||||
-D dri3=disabled
|
||||
-D dri3=enabled
|
||||
-D gallium-vdpau=disabled
|
||||
-D gallium-xvmc=disabled
|
||||
-D gallium-omx=disabled
|
||||
|
|
|
@ -26,6 +26,20 @@ apt-get -y install \
|
|||
libdrm-dev \
|
||||
libelf-dev \
|
||||
libexpat1-dev \
|
||||
libx11-dev \
|
||||
libx11-xcb-dev \
|
||||
libxcb-dri2-0-dev \
|
||||
libxcb-dri3-dev \
|
||||
libxcb-glx0-dev \
|
||||
libxcb-present-dev \
|
||||
libxcb-randr0-dev \
|
||||
libxcb-shm0-dev \
|
||||
libxcb-xfixes0-dev \
|
||||
libxdamage-dev \
|
||||
libxext-dev \
|
||||
libxrandr-dev \
|
||||
libxshmfence-dev \
|
||||
libxxf86vm-dev \
|
||||
llvm-8-dev \
|
||||
pkg-config \
|
||||
python \
|
||||
|
|
|
@ -21,6 +21,20 @@ apt-get install -y --no-remove \
|
|||
libffi-dev:$arch \
|
||||
libstdc++6:$arch \
|
||||
libtinfo-dev:$arch \
|
||||
libx11-dev:$arch \
|
||||
libx11-xcb-dev:$arch \
|
||||
libxcb-dri2-0-dev:$arch \
|
||||
libxcb-dri3-dev:$arch \
|
||||
libxcb-glx0-dev:$arch \
|
||||
libxcb-present-dev:$arch \
|
||||
libxcb-randr0-dev:$arch \
|
||||
libxcb-shm0-dev:$arch \
|
||||
libxcb-xfixes0-dev:$arch \
|
||||
libxdamage-dev:$arch \
|
||||
libxext-dev:$arch \
|
||||
libxrandr-dev:$arch \
|
||||
libxshmfence-dev:$arch \
|
||||
libxxf86vm-dev:$arch \
|
||||
wget
|
||||
|
||||
if [[ $arch == "armhf" ]]; then
|
||||
|
|
|
@ -14,12 +14,6 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
|
|||
ARCH_PACKAGES="firmware-amd-graphics
|
||||
libelf1
|
||||
libllvm10
|
||||
libxcb-dri2-0
|
||||
libxcb-dri3-0
|
||||
libxcb-present0
|
||||
libxcb-sync1
|
||||
libxcb-xfixes0
|
||||
libxshmfence1
|
||||
"
|
||||
fi
|
||||
|
||||
|
@ -58,6 +52,13 @@ apt-get -y install --no-install-recommends \
|
|||
libsensors5 \
|
||||
libx11-6 \
|
||||
libx11-xcb1 \
|
||||
libxcb-dri2-0 \
|
||||
libxcb-dri3-0 \
|
||||
libxcb-present0 \
|
||||
libxcb-randr0 \
|
||||
libxcb-sync1 \
|
||||
libxcb-xfixes0 \
|
||||
libxshmfence1 \
|
||||
netcat-openbsd \
|
||||
python3 \
|
||||
python3-pil \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
variables:
|
||||
DISTRIBUTION_TAG: "2020-12-22-runner"
|
||||
DISTRIBUTION_TAG: "2020-12-23-opengl-2"
|
||||
|
||||
.kernel+rootfs:
|
||||
stage: container-2
|
||||
|
|
Loading…
Reference in New Issue