From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 1/2] weston: support neatvnc 0.9
Date: Wed, 26 Feb 2025 13:06:21 +0100 [thread overview]
Message-ID: <20250226120622.2797629-1-p.zabel@pengutronix.de> (raw)
Backport a trivial upstream patch to allow updating Neat VNC.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...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 <p.zabel@pengutronix.de>
+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 <p.zabel@pengutronix.de>
+(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
next reply other threads:[~2025-02-26 12:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-26 12:06 Philipp Zabel [this message]
2025-02-26 12:06 ` [ptxdist] [PATCH 2/2] neatvnc: version bump 0.8.1 -> 0.9.3 Philipp Zabel
2025-03-07 9:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-03-07 9:49 ` [ptxdist] [APPLIED] weston: support neatvnc 0.9 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250226120622.2797629-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox