| 1 |
commit: eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 9 13:20:43 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 9 13:52:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebfeb8b |
| 7 |
|
| 8 |
media-video/vlc: Fix configure with slotted >=net-libs/libupnp-1.8 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 ++++++++++++++++++++++ |
| 13 |
media-video/vlc/vlc-2.2.9999.ebuild | 2 ++ |
| 14 |
media-video/vlc/vlc-3.0.9999.ebuild | 2 ++ |
| 15 |
media-video/vlc/vlc-9999.ebuild | 2 ++ |
| 16 |
4 files changed, 30 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..ab501e4e67a |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch |
| 23 |
@@ -0,0 +1,24 @@ |
| 24 |
+--- a/modules/services_discovery/upnp.hpp 2015-05-19 15:32:38.000000000 +0200 |
| 25 |
++++ b/modules/services_discovery/upnp.hpp 2017-12-09 14:07:08.551654458 +0100 |
| 26 |
+@@ -28,8 +28,8 @@ |
| 27 |
+ #include <vector> |
| 28 |
+ #include <string> |
| 29 |
+ |
| 30 |
+-#include <upnp/upnp.h> |
| 31 |
+-#include <upnp/upnptools.h> |
| 32 |
++#include <upnp-1.8/upnp.h> |
| 33 |
++#include <upnp-1.8/upnptools.h> |
| 34 |
+ |
| 35 |
+ #include <vlc_common.h> |
| 36 |
+ |
| 37 |
+--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100 |
| 38 |
++++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100 |
| 39 |
+@@ -4046,7 +4046,7 @@ |
| 40 |
+ dnl |
| 41 |
+ dnl UPnP Plugin (Intel SDK) |
| 42 |
+ dnl |
| 43 |
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto]) |
| 44 |
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto]) |
| 45 |
+ |
| 46 |
+ EXTEND_HELP_STRING([Misc options:]) |
| 47 |
+ |
| 48 |
|
| 49 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild |
| 50 |
index 1b50d864a4b..223c1ec8989 100644 |
| 51 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
| 52 |
+++ b/media-video/vlc/vlc-2.2.9999.ebuild |
| 53 |
@@ -230,6 +230,8 @@ src_unpack() { |
| 54 |
src_prepare() { |
| 55 |
default |
| 56 |
|
| 57 |
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 58 |
+ |
| 59 |
# Remove unnecessary warnings about unimplemented pragmas on gcc for now. |
| 60 |
# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc. |
| 61 |
# |
| 62 |
|
| 63 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 64 |
index 0492df5372d..1eeebe1b56d 100644 |
| 65 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 66 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 67 |
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}" |
| 68 |
src_prepare() { |
| 69 |
default |
| 70 |
|
| 71 |
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 72 |
+ |
| 73 |
# Bootstrap when we are on a git checkout. |
| 74 |
if [[ ${PV} = *9999 ]] ; then |
| 75 |
./bootstrap |
| 76 |
|
| 77 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 78 |
index 0492df5372d..1eeebe1b56d 100644 |
| 79 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 80 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 81 |
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}" |
| 82 |
src_prepare() { |
| 83 |
default |
| 84 |
|
| 85 |
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 86 |
+ |
| 87 |
# Bootstrap when we are on a git checkout. |
| 88 |
if [[ ${PV} = *9999 ]] ; then |
| 89 |
./bootstrap |
Archives