[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     34c95024aab1cfb361746997c55e1e44e5f037ab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 13:27:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 13:52:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c95024

media-video/vlc: Fix <net-libs/libupnp-1.8 compat

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 .../vlc/files/vlc-2.2.8-libupnp-compat.patch       | 28 ++++++++++++++++++++++
 media-video/vlc/vlc-2.2.9999.ebuild                |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
new file mode 100644
index 00000000000..57b66685ede
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
@@ -0,0 +1,28 @@
+From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Wed, 29 Nov 2017 10:45:04 -0500
+Subject: [PATCH] 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@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 bdd3c55ee5..82d43632f4 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -38,7 +38,7 @@
+ #include <set>
+ #include <string>
+ 
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+  * Compat functions and typedefs for libupnp prior to 1.8
+  */
+-- 
+2.11.0
+

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 977724b1c27..40efb3e5ac1 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -213,6 +213,8 @@ PATCHES=(
 
 	# Bug #593460
 	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+	"${FILESDIR}"/${P}-libupnp-compat.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )