media-video/vlc: Fix configure with slotted >=net-libs/libupnp-1.8

Package-Manager: Portage-2.3.17, Repoman-2.3.6

diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
new file mode 100644 (file)
index 0000000..ab501e4
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp      2015-05-19 15:32:38.000000000 +0200
++++ b/modules/services_discovery/upnp.hpp      2017-12-09 14:07:08.551654458 +0100
+@@ -28,8 +28,8 @@
+ #include <vector>
+ #include <string>
+ 
+-#include <upnp/upnp.h>
+-#include <upnp/upnptools.h>
++#include <upnp-1.8/upnp.h>
++#include <upnp-1.8/upnptools.h>
+ 
+ #include <vlc_common.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-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 1b50d864a4b57f1b515e5d98a11a95c59fc8fc9c..223c1ec8989138cf646af7040352d654f998f4ff 100644 (file)
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -230,6 +230,8 @@ src_unpack() {
 src_prepare() {
        default
 
+       has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
        # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
        # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
        #

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 0492df5372d2afc19480fe7703f33c618d217d4b..1eeebe1b56d39ec7c5cdda7f89c5ddf9433cb3bb 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -251,6 +251,8 @@ 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
+
        # Bootstrap when we are on a git checkout.
        if [[ ${PV} = *9999 ]] ; then
                ./bootstrap

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0492df5372d2afc19480fe7703f33c618d217d4b..1eeebe1b56d39ec7c5cdda7f89c5ddf9433cb3bb 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -251,6 +251,8 @@ 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
+
        # Bootstrap when we are on a git checkout.
        if [[ ${PV} = *9999 ]] ; then
                ./bootstrap