[SCM] vlc/master: Apply upstream patch for upnp breakage

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5410aefba65d115e95b920c71d00ced9e072fc5c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Dec 6 21:43:09 2017 +0100

    Apply upstream patch for upnp breakage

diff --git a/debian/patches/0011-upnp-don-t-clash-with-libupnp-s-own-compat-code.patch b/debian/patches/0011-upnp-don-t-clash-with-libupnp-s-own-compat-code.patch
new file mode 100644
index 0000000..fb1c495
--- /dev/null
+++ b/debian/patches/0011-upnp-don-t-clash-with-libupnp-s-own-compat-code.patch
@@ -0,0 +1,24 @@
+From: Tristan Matthews <tmatth at videolan.org>
+Date: Wed, 29 Nov 2017 10:45:04 -0500
+Subject: upnp: don't clash with libupnp's own compat code
+
+Fixes build for upnp >= 1.6.23 and less than 1.8.
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/services_discovery/upnp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index b265113..75e6fda 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -40,7 +40,7 @@
+ #include <assert.h>
+ #include <limits.h>
+ 
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+  * Compat functions and typedefs for libupnp prior to 1.8
+  */
diff --git a/debian/patches/0012-Fix-UpnpEventPtr-typedef-for-versions-before-1.8.0.patch b/debian/patches/0012-Fix-UpnpEventPtr-typedef-for-versions-before-1.8.0.patch
new file mode 100644
index 0000000..908b4fb
--- /dev/null
+++ b/debian/patches/0012-Fix-UpnpEventPtr-typedef-for-versions-before-1.8.0.patch
@@ -0,0 +1,21 @@
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Wed, 6 Dec 2017 21:56:59 +0100
+Subject: Fix UpnpEventPtr typedef for versions before 1.8.0
+
+---
+ 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 75e6fda..381e8e3 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -74,6 +74,8 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_
+ {
+   return p_s->Sid;
+ }
++#elif UPNP_VERSION < 10800
++typedef void* UpnpEventPtr;
+ #else
+ typedef const void* UpnpEventPtr;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index e061915..eb8b081 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
 0008-desktop-file-We-understand-gvp-and-ram-format.patch
 0009-desktop-file-more-mimetypes-from-iana.org.patch
 0010-MKV-support-WebVTT-subtitles-embedded.patch
+0011-upnp-don-t-clash-with-libupnp-s-own-compat-code.patch
+0012-Fix-UpnpEventPtr-typedef-for-versions-before-1.8.0.patch

-- 
VLC media player packaging