1 |
commit: f72fe819a1fddbed90353ec2d95658b1bc98a17b |
2 |
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 25 19:16:52 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 25 21:54:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72fe819 |
7 |
|
8 |
game-engines/odamex: Version bump to 0.8.3 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/722494 |
11 |
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17258 |
13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
14 |
|
15 |
games-engines/odamex/Manifest | 1 + |
16 |
...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 29 +++++++++ |
17 |
games-engines/odamex/odamex-0.8.3.ebuild | 76 ++++++++++++++++++++++ |
18 |
3 files changed, 106 insertions(+) |
19 |
|
20 |
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest |
21 |
index 0f071ac593c..cd2dcf02a55 100644 |
22 |
--- a/games-engines/odamex/Manifest |
23 |
+++ b/games-engines/odamex/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
+DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720 |
26 |
DIST odamex-src-0.8.2.tar.bz2 8502115 BLAKE2B bf4acaea1c9ce81966886bdfef35d361f84dab02e32ec4fd11fe8d250b76c6ca86c0b2870f38382961949713059a2944eea50c6f4d05a41411799386ab3acc64 SHA512 bb3e2427ede7267afce8bb2b852eed3f8d2ed9cf17c5b15a264d6821d170c49dccea06ea0742d9dc7cfe42518701342572689b57ec6712f4b818bd0e25b436c8 |
27 |
|
28 |
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..95cdfce5183 |
31 |
--- /dev/null |
32 |
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch |
33 |
@@ -0,0 +1,29 @@ |
34 |
+From 8b82b887fd1fb17162ad831bbe7a83076187499d Mon Sep 17 00:00:00 2001 |
35 |
+From: Michael Wood <mwoodj@××××××××××.org> |
36 |
+Date: Tue, 25 Aug 2020 02:34:37 -0500 |
37 |
+Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up |
38 |
+ |
39 |
+This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support. |
40 |
+--- |
41 |
+ odalaunch/CMakeLists.txt | 5 +++++ |
42 |
+ 1 file changed, 5 insertions(+) |
43 |
+ |
44 |
+diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt |
45 |
+index f68a4d4d..4abbe0d8 100644 |
46 |
+--- a/odalaunch/CMakeLists.txt |
47 |
++++ b/odalaunch/CMakeLists.txt |
48 |
+@@ -32,6 +32,11 @@ endif() |
49 |
+ |
50 |
+ # Odalaunch target |
51 |
+ if(wxWidgets_FOUND) |
52 |
++ # wxWidgets 3.0.4 requires C++11 |
53 |
++ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3) |
54 |
++ set(CMAKE_CXX_STANDARD 11) |
55 |
++ endif() |
56 |
++ |
57 |
+ add_custom_command( |
58 |
+ OUTPUT ${XRCRES_HEADER} |
59 |
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res |
60 |
+-- |
61 |
+2.28.0 |
62 |
+ |
63 |
|
64 |
diff --git a/games-engines/odamex/odamex-0.8.3.ebuild b/games-engines/odamex/odamex-0.8.3.ebuild |
65 |
new file mode 100644 |
66 |
index 00000000000..ff1b1912857 |
67 |
--- /dev/null |
68 |
+++ b/games-engines/odamex/odamex-0.8.3.ebuild |
69 |
@@ -0,0 +1,76 @@ |
70 |
+# Copyright 1999-2019 Gentoo Authors |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+ |
73 |
+EAPI=7 |
74 |
+ |
75 |
+WX_GTK_VER="3.0-gtk3" |
76 |
+inherit cmake desktop prefix wxwidgets xdg |
77 |
+ |
78 |
+DESCRIPTION="Online multiplayer free software engine for DOOM" |
79 |
+HOMEPAGE="https://odamex.net/" |
80 |
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2" |
81 |
+ |
82 |
+LICENSE="GPL-2+ MIT" |
83 |
+SLOT="0" |
84 |
+KEYWORDS="~amd64 ~arm ~x86" |
85 |
+IUSE="+client master +odalaunch portmidi server upnp X" |
86 |
+REQUIRED_USE="|| ( client master server )" |
87 |
+ |
88 |
+RDEPEND=" |
89 |
+ client? ( |
90 |
+ media-libs/libpng:0= |
91 |
+ media-libs/libsdl2[joystick,sound,video] |
92 |
+ media-libs/sdl2-mixer |
93 |
+ odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) |
94 |
+ portmidi? ( media-libs/portmidi ) |
95 |
+ X? ( x11-libs/libX11 ) |
96 |
+ ) |
97 |
+ server? ( |
98 |
+ upnp? ( net-libs/miniupnpc:= ) |
99 |
+ )" |
100 |
+DEPEND="${RDEPEND}" |
101 |
+BDEPEND="games-util/deutex" |
102 |
+ |
103 |
+S="${WORKDIR}/${PN}-src-${PV}" |
104 |
+ |
105 |
+PATCHES=( |
106 |
+ "${FILESDIR}/${PN}-0.8.1-miniupnpc.patch" |
107 |
+ "${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch" |
108 |
+) |
109 |
+ |
110 |
+src_prepare() { |
111 |
+ rm -r libraries/libminiupnpc wad/odamex.wad || die |
112 |
+ hprefixify common/d_main.cpp |
113 |
+ |
114 |
+ use odalaunch && setup-wxwidgets |
115 |
+ |
116 |
+ cmake_src_prepare |
117 |
+} |
118 |
+ |
119 |
+src_configure() { |
120 |
+ local mycmakeargs=( |
121 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) |
122 |
+ -DBUILD_CLIENT=$(usex client) |
123 |
+ -DBUILD_MASTER=$(usex master) |
124 |
+ -DBUILD_ODALAUNCH=$(usex odalaunch) |
125 |
+ -DBUILD_SERVER=$(usex server) |
126 |
+ -DENABLE_PORTMIDI=$(usex portmidi) |
127 |
+ -DUSE_MINIUPNP=$(usex upnp) |
128 |
+ ) |
129 |
+ |
130 |
+ cmake_src_configure |
131 |
+} |
132 |
+ |
133 |
+src_install() { |
134 |
+ if use client ; then |
135 |
+ newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" |
136 |
+ make_desktop_entry "${PN}" "Odamex" |
137 |
+ |
138 |
+ if use odalaunch ; then |
139 |
+ newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" |
140 |
+ make_desktop_entry odalaunch "Odamex Launcher" odalaunch |
141 |
+ fi |
142 |
+ fi |
143 |
+ |
144 |
+ cmake_src_install |
145 |
+} |