diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:56:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:56:30 +0100 |
| commit | 948d557b4a61dc14722668b6b11a4cf3cee07b01 (patch) | |
| tree | b28b6cb077ae6b2457e30d49028fc978d8e2b59b /games-engines/odamex | |
| parent | e3cf2c86fca1750343c1885311f857f185ee4f2d (diff) | |
gentoo resync : 13.09.2019
Diffstat (limited to 'games-engines/odamex')
| -rw-r--r-- | games-engines/odamex/Manifest | 3 | ||||
| -rw-r--r-- | games-engines/odamex/files/odamex-0.8.1-SearchDir.patch | 11 | ||||
| -rw-r--r-- | games-engines/odamex/odamex-0.8.1-r1.ebuild (renamed from games-engines/odamex/odamex-0.8.1.ebuild) | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index 7489754fee1a..17cc5f2d648d 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1,4 +1,5 @@ +AUX odamex-0.8.1-SearchDir.patch 529 BLAKE2B d4c2e996f5f3489d344b385f86b9a1cbe534365715088cbd163d5232a29ff751e2bacf2241ca2bba5c13c6acd6ca39387323edd43311c128c8050c7ddbb82f4b SHA512 336560f2305af9d6eaab889ec644d63c4af10acfe53d05c94533f1e60b27e64b560cb3fe1bfcf8996283cd152666989e2525077918c83f44b7795b131eac979a AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049 DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642 -EBUILD odamex-0.8.1.ebuild 1814 BLAKE2B f536da171ffe7e9d65250883e8ee9bd01ce339429b97b5534c9be0b375e8d494c958542f96e978d167561395561930056a669f51a1a03f208d608e4dc580995e SHA512 81721c8b46961b3877afce97c8a53037c649958f12b5d4b85ee0d05f914c7f55cd08e6f8d0f9b4f8a1d42aba08aef9fac6abe27c0011f79dae332692045b6d1b +EBUILD odamex-0.8.1-r1.ebuild 1885 BLAKE2B 7f8b5fa772c6d0d603e98b6a6c02c029855afd2bc6c1c572a32ebc8314201589c4b74c98ded9e7ba48aca0790f6d3d82a611c502e9572b5531157fac8a11acfa SHA512 83b56eef88b27222dea2e262433c9362c932f57ed8cc1bc359a10e9602409057416f19660b9935085317ee82a4fa5019810478881e118d80ed32960a79a251ae MISC metadata.xml 1530 BLAKE2B 03aad8e7b52331b6b2c0be004c82459219661acbce414880cb9b223eff121f9cdfabe6404309d20191b2c64f68878dc617d370d93bb6aaf4ebf74203a4b04dea SHA512 dc325607fdc57449f4fb61f56f42837a7969965f4c09f43867fa83a20783fcb9dc926b770dc587ed9e4649080c89094efe4c32ea7b55f12ec230dadb09edc6fa diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch new file mode 100644 index 000000000000..70bd476eb3f2 --- /dev/null +++ b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch @@ -0,0 +1,11 @@ +diff -Naur a/common/d_main.cpp b/common/d_main.cpp +--- a/common/d_main.cpp 2019-07-22 19:11:28.000000000 +0100 ++++ b/common/d_main.cpp 2019-09-09 22:57:47.624246017 +0100 +@@ -459,6 +459,7 @@ + D_AddSearchDir(dirs, INSTALL_PREFIX "/" INSTALL_DATADIR "/games/odamex", separator); + #endif + ++ D_AddSearchDir(dirs, "/usr/share/doom", separator); + D_AddSearchDir(dirs, "/usr/share/games/doom", separator); + D_AddSearchDir(dirs, "/usr/local/share/games/doom", separator); + D_AddSearchDir(dirs, "/usr/local/share/doom", separator); diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild index 8cfa9cbee75a..c823dedd980d 100644 --- a/games-engines/odamex/odamex-0.8.1.ebuild +++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit cmake-utils desktop wxwidgets xdg +inherit cmake-utils desktop prefix wxwidgets xdg DESCRIPTION="Online multiplayer free software engine for DOOM" HOMEPAGE="https://odamex.net/" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2" LICENSE="GPL-2+ MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="+client master +odalaunch portmidi server upnp X" REQUIRED_USE="|| ( client master server )" @@ -35,12 +35,14 @@ S="${WORKDIR}/${PN}-src-${PV}" PATCHES=( "${FILESDIR}"/${P}-miniupnpc.patch + "${FILESDIR}"/${P}-SearchDir.patch ) src_prepare() { rm -r libraries/libminiupnpc odamex.wad || die + hprefixify common/d_main.cpp - setup-wxwidgets + use odalaunch && setup-wxwidgets cmake-utils_src_prepare } @@ -69,7 +71,7 @@ src_compile() { src_install() { if use client ; then newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" - make_desktop_entry "${PN} -waddir /usr/share/doom" "Odamex" + make_desktop_entry "${PN}" "Odamex" if use odalaunch ; then newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" |