diff mbox series

[v2,03/14] ui/spice: Require spice-protocol >= 0.14.0

Message ID 20221202100512.4161901-4-armbru@redhat.com (mailing list archive)
State New, archived
Headers show
Series ui: Move and clean up monitor command code | expand

Commit Message

Markus Armbruster Dec. 2, 2022, 10:05 a.m. UTC
Version 0.14.0 is now old enough to have made it into the major
distributions:

   Debian 11: 0.14.3
   RHEL-8: 0.14.2
   FreeBSD (ports): 0.14.4
   Fedora 35: 0.14.0
   Ubuntu 20.04: 0.14.0
   OpenSUSE Leap 15.3: 0.14.3

Requiring it lets us drop two version checks in ui/vdagent.c.  It also
enables the next commit.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 meson.build  | 2 +-
 ui/vdagent.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

Comments

Philippe Mathieu-Daudé Dec. 2, 2022, 10:14 a.m. UTC | #1
On 2/12/22 11:05, Markus Armbruster wrote:
> Version 0.14.0 is now old enough to have made it into the major
> distributions:
> 
>     Debian 11: 0.14.3
>     RHEL-8: 0.14.2
>     FreeBSD (ports): 0.14.4
>     Fedora 35: 0.14.0
>     Ubuntu 20.04: 0.14.0
>     OpenSUSE Leap 15.3: 0.14.3
> 
> Requiring it lets us drop two version checks in ui/vdagent.c.  It also
> enables the next commit.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   meson.build  | 2 +-
>   ui/vdagent.c | 4 ----
>   2 files changed, 1 insertion(+), 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Daniel P. Berrangé Dec. 5, 2022, 11:09 a.m. UTC | #2
On Fri, Dec 02, 2022 at 11:05:01AM +0100, Markus Armbruster wrote:
> Version 0.14.0 is now old enough to have made it into the major
> distributions:
> 
>    Debian 11: 0.14.3
>    RHEL-8: 0.14.2
>    FreeBSD (ports): 0.14.4
>    Fedora 35: 0.14.0
>    Ubuntu 20.04: 0.14.0
>    OpenSUSE Leap 15.3: 0.14.3
> 
> Requiring it lets us drop two version checks in ui/vdagent.c.  It also
> enables the next commit.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  meson.build  | 2 +-
>  ui/vdagent.c | 4 ----
>  2 files changed, 1 insertion(+), 5 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 5c6b5a1c75..9f27c5cea3 100644
--- a/meson.build
+++ b/meson.build
@@ -740,7 +740,7 @@  endif
 
 spice_protocol = not_found
 if not get_option('spice_protocol').auto() or have_system
-  spice_protocol = dependency('spice-protocol', version: '>=0.12.3',
+  spice_protocol = dependency('spice-protocol', version: '>=0.14.0',
                               required: get_option('spice_protocol'),
                               method: 'pkg-config', kwargs: static_kwargs)
 endif
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 4bf50f0c4d..1f51a78da1 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -87,9 +87,7 @@  static const char *cap_name[] = {
     [VD_AGENT_CAP_MONITORS_CONFIG_POSITION]       = "monitors-config-position",
     [VD_AGENT_CAP_FILE_XFER_DISABLED]             = "file-xfer-disabled",
     [VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS]      = "file-xfer-detailed-errors",
-#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 0)
     [VD_AGENT_CAP_GRAPHICS_DEVICE_INFO]           = "graphics-device-info",
-#endif
 #if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 1)
     [VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB] = "clipboard-no-release-on-regrab",
     [VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL]          = "clipboard-grab-serial",
@@ -112,9 +110,7 @@  static const char *msg_name[] = {
     [VD_AGENT_CLIENT_DISCONNECTED]   = "client-disconnected",
     [VD_AGENT_MAX_CLIPBOARD]         = "max-clipboard",
     [VD_AGENT_AUDIO_VOLUME_SYNC]     = "audio-volume-sync",
-#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 0)
     [VD_AGENT_GRAPHICS_DEVICE_INFO]  = "graphics-device-info",
-#endif
 };
 
 static const char *sel_name[] = {