mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci, backend-vnc: update to Neat VNC 0.7.0 

Neat VNC 0.7.0 supports desktop resizing.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-10-05 10:31:04 +02:00 committed by Philipp Zabel
parent bdf2019ec9
commit 8895b15f3d
4 changed files with 12 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: variables:
FDO_UPSTREAM_REPO: wayland/weston FDO_UPSTREAM_REPO: wayland/weston
FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH"
FDO_DISTRIBUTION_TAG: '2023-09-28-remove_logind' FDO_DISTRIBUTION_TAG: '2023-10-05-neatvnc-0.7.0'
include: include:

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

@ -181,7 +181,7 @@ meson build --wrap-mode=nofallback
ninja ${NINJAFLAGS} -C build install ninja ${NINJAFLAGS} -C build install
cd .. cd ..
rm -rf aml rm -rf aml
git clone --branch v0.6.0 --depth=1 https://github.com/any1/neatvnc.git git clone --branch v0.7.0 --depth=1 https://github.com/any1/neatvnc.git
cd neatvnc cd neatvnc
meson build --wrap-mode=nofallback -Dauto_features=disabled meson build --wrap-mode=nofallback -Dauto_features=disabled
ninja ${NINJAFLAGS} -C build install ninja ${NINJAFLAGS} -C build install

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

@ -3,7 +3,7 @@ if not get_option('backend-vnc')
endif endif
config_h.set('BUILD_VNC_COMPOSITOR', '1') config_h.set('BUILD_VNC_COMPOSITOR', '1')
dep_neatvnc = dependency('neatvnc', version: ['>= 0.6.0', '< 0.7.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
if not dep_neatvnc.found() if not dep_neatvnc.found()
error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
endif endif

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

@ -1248,8 +1248,15 @@ vnc_backend_create(struct weston_compositor *compositor,
goto err_output; goto err_output;
} }
ret = nvnc_enable_auth(backend->server, config->server_key, ret = nvnc_set_tls_creds(backend->server, config->server_key,
config->server_cert, vnc_handle_auth, config->server_cert);
if (ret) {
weston_log("Failed set TLS credentials\n");
goto err_output;
}
ret = nvnc_enable_auth(backend->server, NVNC_AUTH_REQUIRE_AUTH |
NVNC_AUTH_REQUIRE_ENCRYPTION, vnc_handle_auth,
NULL); NULL);
if (ret) { if (ret) {
weston_log("Failed to enable TLS support\n"); weston_log("Failed to enable TLS support\n");