| 1 |
commit: 2c5f5b7682e49e3f140632b6f8b03d3226ed3dc1 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 9 22:05:48 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 9 22:05:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5f5b76 |
| 7 |
|
| 8 |
games-engines/odamex: Search our usual data directory and prefix paths |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
games-engines/odamex/files/odamex-0.8.1-SearchDir.patch | 11 +++++++++++ |
| 14 |
.../odamex/{odamex-0.8.1.ebuild => odamex-0.8.1-r1.ebuild} | 4 +++- |
| 15 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..70bd476eb3f |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch |
| 22 |
@@ -0,0 +1,11 @@ |
| 23 |
+diff -Naur a/common/d_main.cpp b/common/d_main.cpp |
| 24 |
+--- a/common/d_main.cpp 2019-07-22 19:11:28.000000000 +0100 |
| 25 |
++++ b/common/d_main.cpp 2019-09-09 22:57:47.624246017 +0100 |
| 26 |
+@@ -459,6 +459,7 @@ |
| 27 |
+ D_AddSearchDir(dirs, INSTALL_PREFIX "/" INSTALL_DATADIR "/games/odamex", separator); |
| 28 |
+ #endif |
| 29 |
+ |
| 30 |
++ D_AddSearchDir(dirs, "/usr/share/doom", separator); |
| 31 |
+ D_AddSearchDir(dirs, "/usr/share/games/doom", separator); |
| 32 |
+ D_AddSearchDir(dirs, "/usr/local/share/games/doom", separator); |
| 33 |
+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator); |
| 34 |
|
| 35 |
diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild |
| 36 |
similarity index 93% |
| 37 |
rename from games-engines/odamex/odamex-0.8.1.ebuild |
| 38 |
rename to games-engines/odamex/odamex-0.8.1-r1.ebuild |
| 39 |
index dbf54b31f41..a4aa73ce963 100644 |
| 40 |
--- a/games-engines/odamex/odamex-0.8.1.ebuild |
| 41 |
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild |
| 42 |
@@ -4,7 +4,7 @@ |
| 43 |
EAPI=7 |
| 44 |
|
| 45 |
WX_GTK_VER="3.0-gtk3" |
| 46 |
-inherit cmake-utils desktop wxwidgets xdg |
| 47 |
+inherit cmake-utils desktop prefix wxwidgets xdg |
| 48 |
|
| 49 |
DESCRIPTION="Online multiplayer free software engine for DOOM" |
| 50 |
HOMEPAGE="https://odamex.net/" |
| 51 |
@@ -35,10 +35,12 @@ S="${WORKDIR}/${PN}-src-${PV}" |
| 52 |
|
| 53 |
PATCHES=( |
| 54 |
"${FILESDIR}"/${P}-miniupnpc.patch |
| 55 |
+ "${FILESDIR}"/${P}-SearchDir.patch |
| 56 |
) |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
rm -r libraries/libminiupnpc odamex.wad || die |
| 60 |
+ hprefixify common/d_main.cpp |
| 61 |
|
| 62 |
use odalaunch && setup-wxwidgets |
Archives