1 |
commit: 64f57dffcf5590da78ebb1f4b31c2fb17cddde09 |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 15:46:08 2015 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 15:46:08 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f57dff |
7 |
|
8 |
old |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
games-engines/odamex/Manifest | 1 - |
13 |
.../files/1-odamex-0.6.4-install-rules.patch | 79 ---------------- |
14 |
.../files/2-odamex-0.6.4-cmake-options.patch | 77 --------------- |
15 |
.../files/3-odamex-0.6.4-wad-search-path.patch | 59 ------------ |
16 |
.../4-odamex-0.6.4-odalauncher-bin-path.patch | 51 ---------- |
17 |
games-engines/odamex/odamex-0.6.4.ebuild | 103 --------------------- |
18 |
6 files changed, 370 deletions(-) |
19 |
|
20 |
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest |
21 |
index 4bca179..f7868f1 100644 |
22 |
--- a/games-engines/odamex/Manifest |
23 |
+++ b/games-engines/odamex/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4 |
26 |
DIST odamex-src-0.7.0.tar.bz2 8435860 SHA256 d0306ddca3d5534672e6f0c547092d8f3f6f815686e4f6b21d6521afae1fd73b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b WHIRLPOOL 91ca8f658435f4503df8a2d5f52b1ef1cf34229373c4e1c3918b7eb919ae54e3a416618ce184d54c6ebc25bdfe6fea96f8933f98d859562b4972f89bd5c320ff |
27 |
|
28 |
diff --git a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch b/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch |
29 |
deleted file mode 100644 |
30 |
index 4820503..0000000 |
31 |
--- a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch |
32 |
+++ /dev/null |
33 |
@@ -1,79 +0,0 @@ |
34 |
-commit 04fff802ee72c08d2e1730c6c5506fc2e708d5fe |
35 |
-Author: hasufell <hasufell@g.o> |
36 |
-Date: Wed Jul 31 03:34:29 2013 +0200 |
37 |
- |
38 |
- BUILD: add unix install rules |
39 |
- |
40 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
41 |
-index b77096a..f49a1e8 100644 |
42 |
---- a/CMakeLists.txt |
43 |
-+++ b/CMakeLists.txt |
44 |
-@@ -2,6 +2,8 @@ |
45 |
- project(Odamex) |
46 |
- cmake_minimum_required(VERSION 2.8) |
47 |
- |
48 |
-+# cmake modules |
49 |
-+include( GNUInstallDirs ) |
50 |
- set(PROJECT_VERSION 0.6.4) |
51 |
- set(PROJECT_COPYRIGHT "2006-2013") |
52 |
- |
53 |
-@@ -64,3 +66,8 @@ add_subdirectory(odalaunch) |
54 |
- if(NOT NO_AG-ODALAUNCH_TARGET) |
55 |
- add_subdirectory(ag-odalaunch) |
56 |
- endif() |
57 |
-+ |
58 |
-+# global install rules |
59 |
-+if(UNIX) |
60 |
-+ install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR}) |
61 |
-+endif() |
62 |
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt |
63 |
-index 5dd5d43..1fde0ff 100644 |
64 |
---- a/client/CMakeLists.txt |
65 |
-+++ b/client/CMakeLists.txt |
66 |
-@@ -168,5 +168,8 @@ if(SDL_FOUND AND SDLMIXER_FOUND) |
67 |
- " ) |
68 |
- endif() |
69 |
- |
70 |
-+ # UNIX install rules |
71 |
-+ elseif(UNIX) |
72 |
-+ install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
73 |
- endif() |
74 |
- endif() |
75 |
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt |
76 |
-index c1c3853..3e94b34 100644 |
77 |
---- a/master/CMakeLists.txt |
78 |
-+++ b/master/CMakeLists.txt |
79 |
-@@ -12,3 +12,8 @@ if(WIN32) |
80 |
- elseif(SOLARIS) |
81 |
- target_link_libraries(odamast socket nsl) |
82 |
- endif() |
83 |
-+ |
84 |
-+# install rules |
85 |
-+if(UNIX) |
86 |
-+ install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
87 |
-+endif() |
88 |
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt |
89 |
-index ff9b6e3..d2d2171 100644 |
90 |
---- a/odalaunch/CMakeLists.txt |
91 |
-+++ b/odalaunch/CMakeLists.txt |
92 |
-@@ -61,3 +61,8 @@ if(wxWidgets_FOUND) |
93 |
- ) |
94 |
- endif() |
95 |
- endif() |
96 |
-+ |
97 |
-+# install rules |
98 |
-+if(UNIX) |
99 |
-+ install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
100 |
-+endif() |
101 |
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt |
102 |
-index 2284a8a..a079434 100644 |
103 |
---- a/server/CMakeLists.txt |
104 |
-+++ b/server/CMakeLists.txt |
105 |
-@@ -61,3 +61,7 @@ if(UNIX AND NOT APPLE) |
106 |
- target_link_libraries(odasrv rt) |
107 |
- endif() |
108 |
- |
109 |
-+# install rules |
110 |
-+if(UNIX) |
111 |
-+ install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
112 |
-+endif() |
113 |
|
114 |
diff --git a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch |
115 |
deleted file mode 100644 |
116 |
index de0f078..0000000 |
117 |
--- a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch |
118 |
+++ /dev/null |
119 |
@@ -1,77 +0,0 @@ |
120 |
-commit 7abf37ed186701f0170bded26df8cbb8a99a21e1 |
121 |
-Author: hasufell <hasufell@g.o> |
122 |
-Date: Wed Jul 31 03:35:46 2013 +0200 |
123 |
- |
124 |
- BUILD: add various cmake options |
125 |
- |
126 |
- to control building client/server/odalaunch |
127 |
- |
128 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
129 |
-index f49a1e8..ca01bba 100644 |
130 |
---- a/CMakeLists.txt |
131 |
-+++ b/CMakeLists.txt |
132 |
-@@ -3,7 +3,15 @@ project(Odamex) |
133 |
- cmake_minimum_required(VERSION 2.8) |
134 |
- |
135 |
- # cmake modules |
136 |
-+include( CMakeDependentOption ) |
137 |
- include( GNUInstallDirs ) |
138 |
-+ |
139 |
-+# options |
140 |
-+option(BUILD_CLIENT "Build client target" 1) |
141 |
-+option(BUILD_SERVER "Build server target" 1) |
142 |
-+option(BUILD_MASTER "Build master server target" 1) |
143 |
-+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 ) |
144 |
-+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 ) |
145 |
- set(PROJECT_VERSION 0.6.4) |
146 |
- set(PROJECT_COPYRIGHT "2006-2013") |
147 |
- |
148 |
-@@ -56,10 +64,22 @@ endmacro(define_platform) |
149 |
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) |
150 |
- |
151 |
- # Subdirectories for individual projects |
152 |
--add_subdirectory(client) |
153 |
--add_subdirectory(server) |
154 |
--add_subdirectory(master) |
155 |
--add_subdirectory(odalaunch) |
156 |
-+if(BUILD_CLIENT) |
157 |
-+ add_subdirectory(client) |
158 |
-+endif() |
159 |
-+if(BUILD_SERVER) |
160 |
-+ add_subdirectory(server) |
161 |
-+endif() |
162 |
-+if(BUILD_MASTER) |
163 |
-+ add_subdirectory(master) |
164 |
-+endif() |
165 |
-+if(BUILD_ODALAUNCH) |
166 |
-+ add_subdirectory(odalaunch) |
167 |
-+endif() |
168 |
-+ |
169 |
-+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER) |
170 |
-+ message(FATAL_ERROR "No target chosen, doing nothing.") |
171 |
-+endif() |
172 |
- |
173 |
- # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET |
174 |
- # This is only really useful when setting up a universal build. |
175 |
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt |
176 |
-index 1fde0ff..9f06fa6 100644 |
177 |
---- a/client/CMakeLists.txt |
178 |
-+++ b/client/CMakeLists.txt |
179 |
-@@ -48,7 +48,7 @@ endif() |
180 |
- |
181 |
- # PortMidi configuration |
182 |
- find_package(PortMidi) |
183 |
--if(PORTMIDI_FOUND) |
184 |
-+if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) |
185 |
- include_directories(${PORTMIDI_INCLUDE_DIR}) |
186 |
- add_definitions(-DPORTMIDI) |
187 |
- else() |
188 |
-@@ -95,7 +95,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND) |
189 |
- target_link_libraries(odamex ${SDL_LIBRARY}) |
190 |
- target_link_libraries(odamex ${SDLMIXER_LIBRARY}) |
191 |
- |
192 |
-- if(PORTMIDI_FOUND) |
193 |
-+ if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) |
194 |
- target_link_libraries(odamex ${PORTMIDI_LIBRARIES}) |
195 |
- endif() |
196 |
- |
197 |
|
198 |
diff --git a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch |
199 |
deleted file mode 100644 |
200 |
index 3eb6953..0000000 |
201 |
--- a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch |
202 |
+++ /dev/null |
203 |
@@ -1,59 +0,0 @@ |
204 |
-commit 3a5209e2595e459a31c111f6040dbac347df1967 |
205 |
-Author: hasufell <hasufell@g.o> |
206 |
-Date: Wed Jul 31 03:38:10 2013 +0200 |
207 |
- |
208 |
- add odamex.wad install destination to wad search path |
209 |
- |
210 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
211 |
-index ca01bba..83a0e30 100644 |
212 |
---- a/CMakeLists.txt |
213 |
-+++ b/CMakeLists.txt |
214 |
-@@ -12,6 +12,16 @@ option(BUILD_SERVER "Build server target" 1) |
215 |
- option(BUILD_MASTER "Build master server target" 1) |
216 |
- cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 ) |
217 |
- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 ) |
218 |
-+ |
219 |
-+configure_file ( |
220 |
-+ "${PROJECT_SOURCE_DIR}/config.h.in" |
221 |
-+ "${PROJECT_BINARY_DIR}/config.h" |
222 |
-+ ) |
223 |
-+ |
224 |
-+include_directories( |
225 |
-+ ${PROJECT_BINARY_DIR} |
226 |
-+) |
227 |
-+ |
228 |
- set(PROJECT_VERSION 0.6.4) |
229 |
- set(PROJECT_COPYRIGHT "2006-2013") |
230 |
- |
231 |
-diff --git a/common/d_main.cpp b/common/d_main.cpp |
232 |
-index 010bdcb..6dc2e5f 100644 |
233 |
---- a/common/d_main.cpp |
234 |
-+++ b/common/d_main.cpp |
235 |
-@@ -23,6 +23,7 @@ |
236 |
- //----------------------------------------------------------------------------- |
237 |
- |
238 |
- #include "version.h" |
239 |
-+#include "config.h" |
240 |
- |
241 |
- #include <sstream> |
242 |
- #include <string> |
243 |
-@@ -493,6 +494,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s |
244 |
- D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator); |
245 |
- D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator); |
246 |
- D_AddSearchDir(dirs, getenv("HOME"), separator); |
247 |
-+ D_AddSearchDir(dirs, CMAKE_WADDIR, separator); |
248 |
- |
249 |
- // [AM] Search additional paths based on platform |
250 |
- D_AddPlatformSearchDirs(dirs); |
251 |
-diff --git a/config.h.in b/config.h.in |
252 |
-new file mode 100644 |
253 |
-index 0000000..e91b3a6 |
254 |
---- /dev/null |
255 |
-+++ b/config.h.in |
256 |
-@@ -0,0 +1,6 @@ |
257 |
-+#ifndef CONFIG_H |
258 |
-+#define CONFIG_H |
259 |
-+ |
260 |
-+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" |
261 |
-+ |
262 |
-+#endif |
263 |
|
264 |
diff --git a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch |
265 |
deleted file mode 100644 |
266 |
index 2224498..0000000 |
267 |
--- a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch |
268 |
+++ /dev/null |
269 |
@@ -1,51 +0,0 @@ |
270 |
-commit a6c55c51dc251924be7eccf6637fc719a2b7ace0 |
271 |
-Author: hasufell <hasufell@g.o> |
272 |
-Date: Wed Jul 31 03:38:24 2013 +0200 |
273 |
- |
274 |
- use CMAKE_BINDIR as default bin patch in odalauncher |
275 |
- |
276 |
-diff --git a/config.h.in b/config.h.in |
277 |
-index e91b3a6..7019a02 100644 |
278 |
---- a/config.h.in |
279 |
-+++ b/config.h.in |
280 |
-@@ -2,5 +2,6 @@ |
281 |
- #define CONFIG_H |
282 |
- |
283 |
- #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" |
284 |
-+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@" |
285 |
- |
286 |
- #endif |
287 |
-diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp |
288 |
-index 915b527..f01224a 100644 |
289 |
---- a/odalaunch/src/dlg_main.cpp |
290 |
-+++ b/odalaunch/src/dlg_main.cpp |
291 |
-@@ -27,6 +27,7 @@ |
292 |
- #include "str_utils.h" |
293 |
- |
294 |
- #include "md5.h" |
295 |
-+#include "config.h" |
296 |
- |
297 |
- #include <wx/settings.h> |
298 |
- #include <wx/menu.h> |
299 |
-@@ -42,6 +43,7 @@ |
300 |
- #include <wx/process.h> |
301 |
- #include <wx/toolbar.h> |
302 |
- #include <wx/xrc/xmlres.h> |
303 |
-+#include <wx/string.h> |
304 |
- #include <wx/cmdline.h> |
305 |
- |
306 |
- #ifdef __WXMSW__ |
307 |
-@@ -200,10 +202,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id) |
308 |
- } |
309 |
- #endif |
310 |
- |
311 |
-+ const char *cmake_bindir_str = CMAKE_BINDIR; |
312 |
-+ wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str); |
313 |
- launchercfg_s.get_list_on_start = 1; |
314 |
- launchercfg_s.show_blocked_servers = 0; |
315 |
- launchercfg_s.wad_paths = wxGetCwd(); |
316 |
-- launchercfg_s.odamex_directory = wxGetCwd(); |
317 |
-+ launchercfg_s.odamex_directory = cmake_bindir; |
318 |
- |
319 |
- m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList); |
320 |
- m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList); |
321 |
|
322 |
diff --git a/games-engines/odamex/odamex-0.6.4.ebuild b/games-engines/odamex/odamex-0.6.4.ebuild |
323 |
deleted file mode 100644 |
324 |
index f2e15ed..0000000 |
325 |
--- a/games-engines/odamex/odamex-0.6.4.ebuild |
326 |
+++ /dev/null |
327 |
@@ -1,103 +0,0 @@ |
328 |
-# Copyright 1999-2014 Gentoo Foundation |
329 |
-# Distributed under the terms of the GNU General Public License v2 |
330 |
-# $Id$ |
331 |
- |
332 |
-EAPI=5 |
333 |
-WX_GTK_VER="2.8" |
334 |
-inherit cmake-utils eutils gnome2-utils wxwidgets games |
335 |
- |
336 |
-MY_P=${PN}-src-${PV} |
337 |
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" |
338 |
-HOMEPAGE="http://odamex.net/" |
339 |
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" |
340 |
- |
341 |
-LICENSE="GPL-2" |
342 |
-SLOT="0" |
343 |
-KEYWORDS="amd64 x86" |
344 |
-IUSE="dedicated +odalaunch master portmidi server" |
345 |
- |
346 |
-RDEPEND=" |
347 |
- dedicated? ( >=net-libs/miniupnpc-1.8 ) |
348 |
- !dedicated? ( |
349 |
- >=media-libs/libsdl-1.2.9[X,sound,joystick,video] |
350 |
- >=media-libs/sdl-mixer-1.2.6 |
351 |
- odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) |
352 |
- portmidi? ( media-libs/portmidi ) |
353 |
- server? ( >=net-libs/miniupnpc-1.8 ) |
354 |
- )" |
355 |
-DEPEND="${RDEPEND}" |
356 |
- |
357 |
-S=${WORKDIR}/${MY_P} |
358 |
- |
359 |
-src_prepare() { |
360 |
- epatch "${FILESDIR}"/1-${P}-install-rules.patch \ |
361 |
- "${FILESDIR}"/2-${P}-cmake-options.patch \ |
362 |
- "${FILESDIR}"/3-${P}-wad-search-path.patch \ |
363 |
- "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch |
364 |
- |
365 |
- epatch_user |
366 |
-} |
367 |
- |
368 |
-src_configure() { |
369 |
- local mycmakeargs=( |
370 |
- -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}" |
371 |
- -DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN} |
372 |
- $(cmake-utils_use_build master MASTER) |
373 |
- ) |
374 |
- |
375 |
- if use dedicated ; then |
376 |
- mycmakeargs+=( |
377 |
- -DBUILD_CLIENT=OFF |
378 |
- -DBUILD_ODALAUNCH=OFF |
379 |
- -DBUILD_SERVER=ON |
380 |
- -DENABLE_PORTMIDI=OFF |
381 |
- ) |
382 |
- else |
383 |
- mycmakeargs+=( |
384 |
- -DBUILD_CLIENT=ON |
385 |
- $(cmake-utils_use_build odalaunch ODALAUNCH) |
386 |
- $(cmake-utils_use_build server SERVER) |
387 |
- $(cmake-utils_use_enable portmidi PORTMIDI) |
388 |
- ) |
389 |
- fi |
390 |
- |
391 |
- cmake-utils_src_configure |
392 |
-} |
393 |
- |
394 |
-src_compile() { |
395 |
- cmake-utils_src_compile |
396 |
-} |
397 |
- |
398 |
-src_install() { |
399 |
- cmake-utils_src_install |
400 |
- |
401 |
- if ! use dedicated ; then |
402 |
- newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" |
403 |
- make_desktop_entry ${PN} |
404 |
- |
405 |
- if use odalaunch ; then |
406 |
- newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" |
407 |
- make_desktop_entry odalaunch "Odamex Launcher" odalaunch |
408 |
- fi |
409 |
- fi |
410 |
- |
411 |
- prepgamesdirs |
412 |
-} |
413 |
- |
414 |
-pkg_preinst() { |
415 |
- games_pkg_preinst |
416 |
- gnome2_icon_savelist |
417 |
-} |
418 |
- |
419 |
-pkg_postinst() { |
420 |
- games_pkg_postinst |
421 |
- einfo |
422 |
- elog "This is just the engine, you will need doom resource files in order to play." |
423 |
- elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F" |
424 |
- einfo |
425 |
- gnome2_icon_cache_update |
426 |
-} |
427 |
- |
428 |
-pkg_postrm() { |
429 |
- gnome2_icon_cache_update |
430 |
-} |