From a88b71ef58c934e185434180d4a49f309bcf1fb0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 6 Sep 2024 13:04:41 +0200 Subject: [PATCH] ci: enable xv and xvmc Needed for the xf86-video-intel driver, so we should build-test it. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b20b527b6..d9f600da1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,10 +21,10 @@ variables: REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - XORG_DEBIAN_TAG: '2025-02-26-xcb-deps' + XORG_DEBIAN_TAG: '2025-02-27-xvmc' XORG_FREEBSD_VERSION: '14.2' XORG_FREEBSD_EXEC: '' - XORG_FREEBSD_TAG: '2025-02-18-vm-image' + XORG_FREEBSD_TAG: '2025-02-18-xvmc' include: - project: 'freedesktop/ci-templates' @@ -111,7 +111,7 @@ stages: FDO_DISTRIBUTION_TAG: '$XORG_FREEBSD_TAG' FDO_DISTRIBUTION_VERSION: '$XORG_FREEBSD_VERSION' FDO_DISTRIBUTION_EXEC: '' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim libxvmc' FDO_IMAGE_SIZE: '30G' debian-bullseye: @@ -155,7 +155,7 @@ freebsd-image: - $MESON_BUILDDIR/meson-logs/ - $MESON_BUILDDIR/test/piglit-results/ variables: - MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true -Dxcsecurity=true + MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true -Dxcsecurity=true -Dxv=true -Dxvmc=true CCACHE_COMPILERCHECK: content CCACHE_DIR: /cache/xserver/cache LC_ALL: C.UTF-8 @@ -205,14 +205,14 @@ mingw-cross-build: script: - .gitlab-ci/meson-build.sh --run-install variables: - MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dlisten_tcp=true + MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dlisten_tcp=true -Dxvmc=true -Dxv=true freebsd: stage: build-and-test extends: - .xorg-image@freebsd variables: - MESON_ARGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false + MESON_ARGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false -Dxvmc=true -Dxv=true script: # running of of disk space without this # needed until https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/67 is fixed