1 |
commit: 34c95024aab1cfb361746997c55e1e44e5f037ab |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 9 13:27:31 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 9 13:52:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c95024 |
7 |
|
8 |
media-video/vlc: Fix <net-libs/libupnp-1.8 compat |
9 |
|
10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
11 |
|
12 |
.../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 ++++++++++++++++++++++ |
13 |
media-video/vlc/vlc-2.2.9999.ebuild | 2 ++ |
14 |
2 files changed, 30 insertions(+) |
15 |
|
16 |
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..57b66685ede |
19 |
--- /dev/null |
20 |
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch |
21 |
@@ -0,0 +1,28 @@ |
22 |
+From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001 |
23 |
+From: Tristan Matthews <tmatth@××××××××.org> |
24 |
+Date: Wed, 29 Nov 2017 10:45:04 -0500 |
25 |
+Subject: [PATCH] upnp: don't clash with libupnp's own compat code |
26 |
+ |
27 |
+Fixes build for upnp >= 1.6.23 and less than 1.8. |
28 |
+ |
29 |
+Signed-off-by: Jean-Baptiste Kempf <jb@××××××××.org> |
30 |
+--- |
31 |
+ modules/services_discovery/upnp.cpp | 2 +- |
32 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp |
35 |
+index bdd3c55ee5..82d43632f4 100644 |
36 |
+--- a/modules/services_discovery/upnp.cpp |
37 |
++++ b/modules/services_discovery/upnp.cpp |
38 |
+@@ -38,7 +38,7 @@ |
39 |
+ #include <set> |
40 |
+ #include <string> |
41 |
+ |
42 |
+-#if UPNP_VERSION < 10800 |
43 |
++#if UPNP_VERSION < 10623 |
44 |
+ /* |
45 |
+ * Compat functions and typedefs for libupnp prior to 1.8 |
46 |
+ */ |
47 |
+-- |
48 |
+2.11.0 |
49 |
+ |
50 |
|
51 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild |
52 |
index 977724b1c27..40efb3e5ac1 100644 |
53 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
54 |
+++ b/media-video/vlc/vlc-2.2.9999.ebuild |
55 |
@@ -213,6 +213,8 @@ PATCHES=( |
56 |
|
57 |
# Bug #593460 |
58 |
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch |
59 |
+ |
60 |
+ "${FILESDIR}"/${P}-libupnp-compat.patch |
61 |
) |
62 |
|
63 |
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) |