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

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

commit:     eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 13:20:43 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 13:52:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebfeb8b

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

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 .../vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch     | 24 ++++++++++++++++++++++
 media-video/vlc/vlc-2.2.9999.ebuild                |  2 ++
 media-video/vlc/vlc-3.0.9999.ebuild                |  2 ++
 media-video/vlc/vlc-9999.ebuild                    |  2 ++
 4 files changed, 30 insertions(+)

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
index 00000000000..ab501e4e67a
--- /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 1b50d864a4b..223c1ec8989 100644
--- 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 0492df5372d..1eeebe1b56d 100644
--- 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 0492df5372d..1eeebe1b56d 100644
--- 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