frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HACK 4: freebsd

This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-12 13:27:32 +01:00
parent 07136784f0
commit 0b66320b0a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -22,9 +22,9 @@ variables:
XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_VERSION: 'bullseye-slim'
XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
XORG_DEBIAN_TAG: '2025-02-12-xvmc' XORG_DEBIAN_TAG: '2025-02-12-xvmc'
XORG_FREEBSD_VERSION: '14.0' XORG_FREEBSD_VERSION: '14.1'
XORG_FREEBSD_EXEC: '' XORG_FREEBSD_EXEC: ''
XORG_FREEBSD_TAG: '2025-02-12-fix-freebsd-xcb' XORG_FREEBSD_TAG: '2024-06-10.0-1'
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
@ -218,6 +218,8 @@ freebsd:
- /app/vmctl start - /app/vmctl start
- set +e - set +e
- scp -r $PWD "vm:" - scp -r $PWD "vm:"
# need to install extra packages, as long as image cant be rebuilt
- /app/vmctl exec "pkg update && pkg add libxvmc xcb-util xcb-util-wm"
# need to install newer xorgproto # need to install newer xorgproto
- /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install" - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install"
- /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success