From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 25 Dec 2017 17:36:53 +0000 (+0100)
Subject: media-video/vlc: Fix libupnp-slot-1.8 patch for live
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec5725f193f7752eefab93df39609beb7788f529;p=gentoo.git

media-video/vlc: Fix libupnp-slot-1.8 patch for live

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---

diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
new file mode 100644
index 000000000000..893f936b729e
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp	2017-12-25 18:17:33.358015500 +0100
++++ b/modules/services_discovery/upnp.hpp	2017-12-25 18:30:45.158167813 +0100
+@@ -35,8 +35,8 @@
+ #include <windows.h>
+ #include <wincrypt.h>
+ #endif
+-#include <upnp/upnp.h>
+-#include <upnp/upnptools.h>
++#include <upnp-1.8/upnp.h>
++#include <upnp-1.8/upnptools.h>
+ 
+ #include <vlc_common.h>
+ #include <vlc_url.h>
+
+--- a/configure.ac	2017-12-09 14:09:12.956370304 +0100
++++ b/configure.ac	2017-12-09 14:13:25.236710362 +0100
+@@ -4046,7 +4046,7 @@
+ dnl
+ dnl UPnP Plugin (Intel SDK)
+ dnl
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto])
+ 
+ EXTEND_HELP_STRING([Misc options:])
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e235fc8b947a..be6ba65a29e9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -249,7 +249,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then