mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci, backend-vnc: update to Neat VNC 0.6.0, aml 0.3.0

Browse Source 
Neat VNC 0.6.0 supports querying client side cursor support.
It requires aml 0.3.0.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-01-23 12:01:35 +01:00
parent a782040368
commit 5a41911ff0
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -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:

4
.gitlab-ci/build-deps.sh
View File

@ -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

4
libweston/backend-vnc/meson.build
View File

@ -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

1
libweston/backend-vnc/vnc.c
View File

@ -42,6 +42,7 @@
#include <unistd.h>
#include <xkbcommon/xkbcommon-keysyms.h>
#include <xkbcommon/xkbcommon.h>
#define AML_UNSTABLE_API 1
#include <aml.h>
#include <neatvnc.h>
#include <drm_fourcc.h>