lib/upnp: drop support for libupnp versions older than 1.8

NEWS

@@ -14,6 +14,8 @@ ver 0.22 (not yet released)
   - io_uring: new plugin for local files on Linux (using liburing)
 * archive
   - iso9660: support seeking
+* database
+  - upnp: drop support for libupnp versions older than 1.8
 * playlist
   - cue: integrate contents in database
 * decoder

src/lib/upnp/ClientInit.cxx

@@ -33,10 +33,7 @@ static UpnpClient_Handle upnp_client_handle;
 
 static int
 UpnpClientCallback(Upnp_EventType et,
-#if UPNP_VERSION >= 10800
+		   const void *evp,
-		   const
-#endif
-		   void *evp,
 		   void *cookie) noexcept
 {
 	if (cookie == nullptr)

src/lib/upnp/Compat.hxx

@@ -22,51 +22,4 @@
 
 #include <upnp.h>
 
-#if UPNP_VERSION < 10800
-/* emulate the libupnp 1.8 API with older versions */
-
-using UpnpDiscovery = Upnp_Discovery;
-
-#endif
-
-#if UPNP_VERSION < 10624
-#include "util/Compiler.h"
-
-gcc_pure
-static inline int
-UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept
-{
-  return disco->Expires;
-}
-
-gcc_pure
-static inline const char *
-UpnpDiscovery_get_DeviceID_cstr(const UpnpDiscovery *disco) noexcept
-{
-  return disco->DeviceId;
-}
-
-gcc_pure
-static inline const char *
-UpnpDiscovery_get_DeviceType_cstr(const UpnpDiscovery *disco) noexcept
-{
-  return disco->DeviceType;
-}
-
-gcc_pure
-static inline const char *
-UpnpDiscovery_get_ServiceType_cstr(const UpnpDiscovery *disco) noexcept
-{
-  return disco->ServiceType;
-}
-
-gcc_pure
-static inline const char *
-UpnpDiscovery_get_Location_cstr(const UpnpDiscovery *disco) noexcept
-{
-  return disco->Location;
-}
-
-#endif
-
 #endif

src/lib/upnp/Discovery.hxx

@@ -38,10 +38,6 @@
 #include <string>
 #include <chrono>
 
-#if UPNP_VERSION < 10800
-#define UpnpDiscovery Upnp_Discovery
-#endif
-
 class ContentDirectoryService;
 
 class UPnPDiscoveryListener {

src/lib/upnp/meson.build

@@ -1,4 +1,4 @@
-upnp_dep = dependency('libupnp', required: get_option('upnp'))
+upnp_dep = dependency('libupnp', version: '>= 1.8', required: get_option('upnp'))
 conf.set('ENABLE_UPNP', upnp_dep.found())
 if not upnp_dep.found()
   subdir_done()