From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 26 Feb 2025 13:06:41 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tnGBV-007Bct-22 for lore@lore.pengutronix.de; Wed, 26 Feb 2025 13:06:41 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tnGBU-00047N-HA; Wed, 26 Feb 2025 13:06:40 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tnGBE-00046J-BH; Wed, 26 Feb 2025 13:06:24 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Wed, 26 Feb 2025 13:06:21 +0100 Message-Id: <20250226120622.2797629-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 1/2] weston: support neatvnc 0.9 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Backport a trivial upstream patch to allow updating Neat VNC. Signed-off-by: Philipp Zabel --- ...1-vnc-Allow-neatvnc-in-version-0.9.0.patch | 25 +++++++++++++++++++ patches/weston-14.0.1/series | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch create mode 100644 patches/weston-14.0.1/series diff --git a/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch b/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch new file mode 100644 index 000000000000..3c801bf73f7f --- /dev/null +++ b/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch @@ -0,0 +1,25 @@ +From: Philipp Zabel +Date: Tue, 19 Nov 2024 17:06:19 +0100 +Subject: [PATCH] vnc: Allow neatvnc in version 0.9.0 + +Neat VNC 0.9.0 is backwards compatible. + +Signed-off-by: Philipp Zabel +(cherry picked from commit b4386289d614f26e89e1c6eb17e048826e925ed1) +--- + libweston/backend-vnc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build +index 39b15cf90201..cf67c51cbf77 100644 +--- a/libweston/backend-vnc/meson.build ++++ b/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.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.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 diff --git a/patches/weston-14.0.1/series b/patches/weston-14.0.1/series new file mode 100644 index 000000000000..14304df22d00 --- /dev/null +++ b/patches/weston-14.0.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-vnc-Allow-neatvnc-in-version-0.9.0.patch +# 5bc17d516893a37a9676e6c86003022f - git-ptx-patches magic -- 2.39.5