1 |
commit: 07e960f32ebc7de1ef0604b8242a77918f9362c8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 2 07:44:43 2015 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 07:50:56 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e960f3 |
7 |
|
8 |
games-strategy/0ad: Added an upstream patch for new miniupnpc API. |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild | 3 ++- |
14 |
.../0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch | 14 ++++++++++++++ |
15 |
2 files changed, 16 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild |
18 |
index e9c57bd..654bb3d 100644 |
19 |
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild |
20 |
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild |
21 |
@@ -31,7 +31,7 @@ RDEPEND=" |
22 |
media-libs/libpng:0 |
23 |
media-libs/libsdl2[X,opengl,video] |
24 |
net-libs/enet:1.3 |
25 |
- net-libs/miniupnpc |
26 |
+ net-libs/miniupnpc:= |
27 |
net-misc/curl |
28 |
sys-libs/zlib |
29 |
virtual/jpeg:62 |
30 |
@@ -57,6 +57,7 @@ pkg_setup() { |
31 |
|
32 |
src_prepare() { |
33 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
34 |
+ epatch "${FILESDIR}"/${P}-miniupnpc14.patch |
35 |
} |
36 |
|
37 |
src_configure() { |
38 |
|
39 |
diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch |
40 |
new file mode 100644 |
41 |
index 0000000..ff46685 |
42 |
--- /dev/null |
43 |
+++ b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch |
44 |
@@ -0,0 +1,14 @@ |
45 |
+Index: ps/trunk/source/network/NetServer.cpp |
46 |
+=================================================================== |
47 |
+--- ps/trunk/source/network/NetServer.cpp (revision 17090) |
48 |
++++ ps/trunk/source/network/NetServer.cpp (revision 17091) |
49 |
+@@ -237,5 +237,9 @@ |
50 |
+ } |
51 |
+ // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds. |
52 |
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14 |
53 |
++ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 2, 0)) != NULL) |
54 |
++#else |
55 |
+ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL) |
56 |
++#endif |
57 |
+ { |
58 |
+ ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress)); |