The open source OpenXR runtime
ci: Fix archlinux container
OpenCV highui now depends on qt6
+4
-4
+2
-2
.gitlab-ci.yml
+2
-2
.gitlab-ci.yml
···
142
142
.monado.variables.arch:rolling:
143
143
variables:
144
144
FDO_DISTRIBUTION_VERSION: "rolling"
145
-
FDO_DISTRIBUTION_TAG: "2023-03-13.2"
145
+
FDO_DISTRIBUTION_TAG: "2023-05-22.0"
146
146
147
147
###
148
148
# Container prep jobs
···
201
201
- .fdo.container-build@arch # from ci-templates
202
202
203
203
variables:
204
-
FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
204
+
FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt6-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
205
205
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/install-arch-additional-deps.sh'
206
206
207
207
+2
-2
.gitlab-ci/config.yml
+2
-2
.gitlab-ci/config.yml
···
198
198
- name: arch
199
199
images:
200
200
- codename: rolling
201
-
tag: "2023-03-13.2"
201
+
tag: "2023-05-22.0"
202
202
script: install-arch-additional-deps.sh
203
203
# pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
204
204
# python-setuptools glu: librealsense
···
231
231
patch:
232
232
pkgconfig:
233
233
python3:
234
-
qt5-base:
234
+
qt6-base:
235
235
v4l-utils:
236
236
vulkan-headers:
237
237
vulkan-icd-loader: