diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-09 14:20:43 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-09 14:52:22 +0100 |
| commit | eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29 (patch) | |
| tree | 85e9e9127cb933b56659b02a834496e768a04fc3 /media-video | |
| parent | media-video/vlc: Unrestrict net-libs/libupnp slots (diff) | |
| download | gentoo-eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29.tar.gz gentoo-eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29.tar.bz2 gentoo-eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29.zip | |
media-video/vlc: Fix configure with slotted >=net-libs/libupnp-1.8
Package-Manager: Portage-2.3.17, Repoman-2.3.6
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.9999.ebuild | 2 | ||||
| -rw-r--r-- | media-video/vlc/vlc-3.0.9999.ebuild | 2 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 2 |
4 files changed, 30 insertions, 0 deletions
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 000000000000..ab501e4e67a5 --- /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 1b50d864a4b5..223c1ec89891 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 0492df5372d2..1eeebe1b56d3 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 0492df5372d2..1eeebe1b56d3 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 |