From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 07 Mar 2025 10:50:09 +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 1tqULK-00Axct-0c for lore@lore.pengutronix.de; Fri, 07 Mar 2025 10:50:09 +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 1tqULJ-00047Z-AR; Fri, 07 Mar 2025 10:50:09 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tqUKz-0003hB-JZ; Fri, 07 Mar 2025 10:49:49 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tqUKz-004Sq2-1M; Fri, 07 Mar 2025 10:49:49 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tqUKz-00HBpn-1E; Fri, 07 Mar 2025 10:49:49 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 7 Mar 2025 10:49:49 +0100 Message-Id: <20250307094949.4097058-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226120622.2797629-1-p.zabel@pengutronix.de> References: <20250226120622.2797629-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as c92068cf2cd57a9881a438883ca4289df07f7327. Michael [sent from post-receive hook] On Fri, 07 Mar 2025 10:49:49 +0100, Philipp Zabel wrote: > Backport a trivial upstream patch to allow updating Neat VNC. > > Signed-off-by: Philipp Zabel > Message-Id: <20250226120622.2797629-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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