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 (file)
index 0000000..893f936
--- /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 e235fc8b947aeafee4cb894bd70283d8d15d4246..be6ba65a29e973b43f3a44914a70c305a73f7c12 100644 (file)
--- 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