diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e785458d..6aaad073 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-10-14.00-aml-0.2.2-neatvnc-0.5.4' + FDO_DISTRIBUTION_TAG: '2022-10-14.00-aml-0.3.0-neatvnc-0.6.0' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index 6836aa63..ff996d2b 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -165,13 +165,13 @@ 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 +git clone --branch v0.3.0 --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 +git clone --branch v0.6.0 --depth=1 https://github.com/any1/neatvnc.git cd neatvnc meson build -Dauto_features=disabled ninja ${NINJAFLAGS} -C build install diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build index 4dfe0229..bb432068 100644 --- a/libweston/backend-vnc/meson.build +++ b/libweston/backend-vnc/meson.build @@ -3,12 +3,12 @@ if not get_option('backend-vnc') endif config_h.set('BUILD_VNC_COMPOSITOR', '1') -dep_neatvnc = dependency('neatvnc', version: ['>= 0.5.0', '< 0.6.0'], required: false) +dep_neatvnc = dependency('neatvnc', version: ['>= 0.6.0', '< 0.7.0'], required: false) if not dep_neatvnc.found() error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') endif -dep_aml = dependency('aml', version: ['>= 0.1.0', '< 0.3.0'], required: false) +dep_aml = dependency('aml', version: ['>= 0.3.0', '< 0.4.0'], required: false) if not dep_aml.found() error('VNC backend requires libaml which was not found. Or, you can use \'-Dbackend-vnc=false\'.') endif diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c index 786c1b41..69f33e38 100644 --- a/libweston/backend-vnc/vnc.c +++ b/libweston/backend-vnc/vnc.c @@ -42,6 +42,7 @@ #include #include #include +#define AML_UNSTABLE_API 1 #include #include #include