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>

.gitlab-ci.yml

@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   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:

.gitlab-ci/build-deps.sh

@@ -181,7 +181,7 @@ meson build --wrap-mode=nofallback
 ninja ${NINJAFLAGS} -C build install
 cd ..
 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
 meson build --wrap-mode=nofallback -Dauto_features=disabled
 ninja ${NINJAFLAGS} -C build install

libweston/backend-vnc/meson.build

@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
 endif
 
 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()
 	error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
 endif

libweston/backend-vnc/vnc.c

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