summarylogtreecommitdiffstats
path: root/vlc-2.2.8-libupnp-1.6.24.patch
diff options
context:
space:
mode:
Diffstat (limited to 'vlc-2.2.8-libupnp-1.6.24.patch')
-rw-r--r--vlc-2.2.8-libupnp-1.6.24.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/vlc-2.2.8-libupnp-1.6.24.patch b/vlc-2.2.8-libupnp-1.6.24.patch
new file mode 100644
index 000000000000..4878550e182b
--- /dev/null
+++ b/vlc-2.2.8-libupnp-1.6.24.patch
@@ -0,0 +1,32 @@
+From 9288c513fd7288ea85cd162aa610ca6d7e083992 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Fri, 11 Jan 2018 23:57:53 +0100
+Subject: [PATCH] avoid defining getter functions present in libupnp 1.6.24
+
+---
+ modules/services_discovery/upnp.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index b265113..f18afd6 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -50,6 +50,7 @@ typedef Upnp_Action_Complete UpnpActionComplete;
+ typedef Upnp_Event UpnpEvent;
+ typedef Upnp_Event_Subscribe UpnpEventSubscribe;
+
++#if UPNP_VERSION < 10624
+ static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery )
+ {
+ return p_discovery->Location;
+@@ -74,6 +75,7 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_
+ {
+ return p_s->Sid;
+ }
++#endif
+ #else
+ typedef const void* UpnpEventPtr;
+ #endif
+--
+2.15.1
+