[Spice-devel] [PATCH spice-gtk 06/34] build-sys: drop support for usbredir < 0.5

[marcandre.lureau at redhat.com]

From: Marc-André Lureau <marcandre.lureau at redhat.com>

It was release the 2012-09-07, should be enough time.

According to repology, all tracked distros have 0.5:
https://repology.org/metapackage/usbredir/versions

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 configure.ac | 15 ++++-----------
 meson.build  |  9 ++-------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index e87f79e..be172d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,17 +274,10 @@ AC_ARG_ENABLE([usbredir],
 if test "x$enable_usbredir" = "xno"; then
   have_usbredir="no"
 else
-  if ${PKG_CONFIG} libusbredirparser-0.5; then
-    PKG_CHECK_MODULES([USBREDIR],
-                      [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5],
-                      [have_usbredir=yes],
-                      [have_usbredir=no])
-  else
-    PKG_CHECK_MODULES([USBREDIR],
-                      [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-                      [have_usbredir=yes],
-                      [have_usbredir=no])
-  fi
+  PKG_CHECK_MODULES([USBREDIR],
+                    [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5],
+                    [have_usbredir=yes],
+                    [have_usbredir=no])
   if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then
     AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available])
   fi
diff --git a/meson.build b/meson.build
index dc3e260..4a00b1c 100644
--- a/meson.build
+++ b/meson.build
@@ -172,13 +172,8 @@ endif
 # usbredir
 spice_gtk_has_usbredir = false
 if get_option('usbredir')
-  usb_dep = dependency('libusbredirparser-0.5', required : false)
-  if not usb_dep.found()
-    usb_dep = dependency('libusbredirparser', version : '>= 0.4')
-  endif
-  spice_glib_deps += usb_dep
-
-  deps = {'libusbredirhost' : '>= 0.4.2',
+  deps = {'libusbredirparser-0.5': '>= 0.5',
+          'libusbredirhost' : '>= 0.4.2',
           'libusb-1.0' : '>= 1.0.9'}
 
   foreach dep, version : deps
-- 
2.20.1.2.gb21ebb671b