From 9e5922744db905278b6d1c573ca766c302b2401e Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 14 Oct 2022 20:31:45 +0200
Subject: [PATCH] ci: Build and install aml and neatvnc

Since aml and neatvnc are not packaged yet, build them from source and
install them into the container image, to prepare for building the VNC
backend.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
---
 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/build-deps.sh | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20d1ecdad..e785458d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
-  FDO_DISTRIBUTION_TAG: '2022-07-13.00-wayland-protocols-1.26'
+  FDO_DISTRIBUTION_TAG: '2022-10-14.00-aml-0.2.2-neatvnc-0.5.4'
 
 
 include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index 3c8f36fc0..6836aa63b 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -163,3 +163,17 @@ meson build -Dauto_features=disabled \
 ninja ${NINJAFLAGS} -C build install
 cd ..
 rm -rf seatd
+
+# Build and install aml and neatvnc, which are required for the VNC backend
+git clone --branch v0.2.2 --depth=1 https://github.com/any1/aml.git
+cd aml
+meson build
+ninja ${NINJAFLAGS} -C build install
+cd ..
+rm -rf aml
+git clone --branch v0.5.4 --depth=1 https://github.com/any1/neatvnc.git
+cd neatvnc
+meson build -Dauto_features=disabled
+ninja ${NINJAFLAGS} -C build install
+cd ..
+rm -rf neatvnc