From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- games-fps/Manifest.gz | Bin 11377 -> 11368 bytes games-fps/gzdoom/Manifest | 3 + ...rt-load-the-hex-font-as-early-as-possible.patch | 129 +++++++++++++++++++++ games-fps/gzdoom/gzdoom-4.8.2.ebuild | 85 ++++++++++++++ games-fps/turtlearena/Manifest | 2 +- games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild | 4 +- games-fps/urbanterror/Manifest | 2 +- .../urbanterror/urbanterror-4.3.4_p20211208.ebuild | 2 +- games-fps/xonotic/Manifest | 4 +- games-fps/xonotic/metadata.xml | 17 +-- games-fps/xonotic/xonotic-0.8.5.ebuild | 105 +++++++++++++++++ 11 files changed, 340 insertions(+), 13 deletions(-) create mode 100644 games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch create mode 100644 games-fps/gzdoom/gzdoom-4.8.2.ebuild create mode 100644 games-fps/xonotic/xonotic-0.8.5.ebuild (limited to 'games-fps') diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz index c3ff1f726548..58db8ae2ee55 100644 Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index c422b3c04478..b734e64cf4a2 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,4 +1,7 @@ +AUX 0001-Revert-load-the-hex-font-as-early-as-possible.patch 4117 BLAKE2B bb3e4175dcd072c1045923f0f068757359919a03f9373b678761ef88ad082a303611637e729941fe5dcf0072d23d372f5c45e0223fdfedf1e637712991e77bf3 SHA512 53a2d88496a441c7e534e55c650266ed4fb8fd0cbe131b33121ecc139a273a4420685029b9ce72bd937c387f63b15bf1c70208d53a1fda9363424a561b934753 AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0 +DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42 EBUILD gzdoom-4.7.1.ebuild 2095 BLAKE2B ce16912a2083f9d86ab60ede55658df4bb26f0c6c858509473ba066e0dd6fc54a12bce8dc6b56b88ea703c1b0658a48b993a45e42cfe8690408a41e66ae5b749 SHA512 bd69a87286bd7e0c0f00d4cf78cfd48a1b959c6c4a06bb9c21b1b095a41fc9de5044bb159038868858a01c02758f681dab979f199707a9a7937fc7bf5e221857 +EBUILD gzdoom-4.8.2.ebuild 2224 BLAKE2B 97b628573b6ebb21c7a22d607907adc254c850fe5228e2d886f430aa70800dc74d7f58c87af80b6f17735237d8f57ee687f9a60676c2efaadf77f82c8d02c824 SHA512 16f846b269d309f9fbe1fc16bf2cf97296f97c8776f9252892f9528996388727c575ea0adb2abf0961886b87d742f4d23d5dcce12eff3c731294ff9c9df979e3 MISC metadata.xml 880 BLAKE2B 9e2c6bea13a2821469d6f6ac4d21c4b2313f42594257a78a574bf893ec70f94bf0c0208e53401e24cdd06aa0bdb2fedb18374d2785abea393688d62ea4427951 SHA512 2bbe5df923e586acb967be69648fc5ccd604254fc2c9eebfc1cee2ca5448fe16b68b639ca21c9225af1ca7e0ca745dfde7b427166c1482145105dcc2f52a1751 diff --git a/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch new file mode 100644 index 000000000000..58a2f7a2b2f4 --- /dev/null +++ b/games-fps/gzdoom/files/0001-Revert-load-the-hex-font-as-early-as-possible.patch @@ -0,0 +1,129 @@ +From 2d00bc6b9f25ae045eecba6e198eaceee9046647 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Wed, 6 Jul 2022 23:37:30 +0100 +Subject: [PATCH] Revert "- load the hex font as early as possible." + +This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44. + +Bug: https://github.com/coelckers/gzdoom/issues/1615 +--- + src/common/fonts/hexfont.cpp | 24 +++++++----------------- + src/d_main.cpp | 17 +++++++---------- + 2 files changed, 14 insertions(+), 27 deletions(-) + +diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp +index 8b50427f4..e2bdbff7a 100644 +--- a/src/common/fonts/hexfont.cpp ++++ b/src/common/fonts/hexfont.cpp +@@ -58,12 +58,11 @@ struct HexDataSource + // + //========================================================================== + +- void ParseDefinition(FResourceLump* font) ++ void ParseDefinition(int lumpnum) + { + FScanner sc; + +- auto data = font->Lock(); +- sc.OpenMem("newconsolefont.hex", (const char*)data, font->Size()); ++ sc.OpenLumpNum(lumpnum); + sc.SetCMode(true); + glyphdata.Push(0); // ensure that index 0 can be used as 'not present'. + while (sc.GetString()) +@@ -97,7 +96,6 @@ struct HexDataSource + lumb = i * 255 / 17; + SmallPal[i] = PalEntry(255, lumb, lumb, lumb); + } +- font->Unlock(); + } + }; + +@@ -402,7 +400,7 @@ public: + + FFont *CreateHexLumpFont (const char *fontname, int lump) + { +- assert(hexdata.FirstChar != INT_MAX); ++ if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump); + return new FHexFont(fontname, lump); + } + +@@ -414,7 +412,7 @@ FFont *CreateHexLumpFont (const char *fontname, int lump) + + FFont *CreateHexLumpFont2(const char *fontname, int lump) + { +- assert(hexdata.FirstChar != INT_MAX); ++ if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump); + return new FHexFont2(fontname, lump); + } + +@@ -426,7 +424,8 @@ FFont *CreateHexLumpFont2(const char *fontname, int lump) + + uint8_t* GetHexChar(int codepoint) + { +- assert(hexdata.FirstChar != INT_MAX); ++ auto lump = fileSystem.CheckNumForFullName("newconsolefont.hex", 0); // This is always loaded from gzdoom.pk3 to prevent overriding it with incomplete replacements. ++ if (hexdata.FirstChar == INT_MAX) hexdata.ParseDefinition(lump); + + if (hexdata.glyphmap[codepoint] > 0) + { +@@ -434,13 +433,4 @@ uint8_t* GetHexChar(int codepoint) + return &hexdata.glyphdata[offset]; + } + return nullptr; +-} +- +-void LoadHexFont(const char* filename) +-{ +- auto resf = FResourceFile::OpenResourceFile(filename); +- if (resf == nullptr) I_FatalError("Unable to open %s", filename); +- auto hexfont = resf->FindLump("newconsolefont.hex"); +- if (hexfont == nullptr) I_FatalError("Unable to find newconsolefont.hex in %s", filename); +- hexdata.ParseDefinition(hexfont); +-} ++} +\ No newline at end of file +diff --git a/src/d_main.cpp b/src/d_main.cpp +index b64142c07..d61807012 100644 +--- a/src/d_main.cpp ++++ b/src/d_main.cpp +@@ -175,7 +175,6 @@ void FreeSBarInfoScript(); + void I_UpdateWindowTitle(); + void S_ParseMusInfo(); + void D_GrabCVarDefaults(); +-void LoadHexFont(const char* filename); + + // PRIVATE FUNCTION PROTOTYPES --------------------------------------------- + +@@ -3535,15 +3534,6 @@ static int D_DoomMain_Internal (void) + std::set_new_handler(NewFailure); + const char *batchout = Args->CheckValue("-errorlog"); + +- // [RH] Make sure zdoom.pk3 is always loaded, +- // as it contains magic stuff we need. +- wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig); +- if (wad == NULL) +- { +- I_FatalError("Cannot find " BASEWAD); +- } +- LoadHexFont(wad); // load hex font early so we have it during startup. +- + C_InitConsole(80*8, 25*8, false); + I_DetectOS(); + +@@ -3573,6 +3563,13 @@ static int D_DoomMain_Internal (void) + extern void D_ConfirmSendStats(); + D_ConfirmSendStats(); + ++ // [RH] Make sure zdoom.pk3 is always loaded, ++ // as it contains magic stuff we need. ++ wad = BaseFileSearch (BASEWAD, NULL, true, GameConfig); ++ if (wad == NULL) ++ { ++ I_FatalError ("Cannot find " BASEWAD); ++ } + FString basewad = wad; + + FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true, GameConfig); +-- +2.35.1 + diff --git a/games-fps/gzdoom/gzdoom-4.8.2.ebuild b/games-fps/gzdoom/gzdoom-4.8.2.ebuild new file mode 100644 index 000000000000..f697ad1bc5eb --- /dev/null +++ b/games-fps/gzdoom/gzdoom-4.8.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop xdg flag-o-matic + +DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" +HOMEPAGE="https://zdoom.org" +SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT + non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug gles2 gtk +non-free openmp telemetry vulkan" + +DEPEND=" + app-arch/bzip2 + media-libs/libjpeg-turbo:0= + media-libs/libsdl2[gles2?,opengl,vulkan?] + media-libs/libvpx:= + media-libs/openal + media-libs/zmusic + sys-libs/zlib + gtk? ( x11-libs/gtk+:3 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-g${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch + "${FILESDIR}"/0001-Revert-load-the-hex-font-as-early-as-possible.patch +) + +src_prepare() { + rm -rf docs/licenses || die + rm -rf libraries/{bzip2,jpeg,zlib} || die + if ! use non-free ; then + rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" + -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" + -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" + -DDYN_OPENAL=OFF + -DNO_GTK="$(usex !gtk)" + -DNO_OPENAL=OFF + -DHAVE_VULKAN="$(usex vulkan)" + -DHAVE_GLES2="$(usex gles2)" + -DNO_OPENMP="$(usex !openmp)" + -DBUILD_NONFREE="$(usex non-free)" + ) + + use debug || append-cppflags -DNDEBUG + use telemetry || append-cppflags -DNO_SEND_STATS + + cmake_src_configure +} + +src_install() { + newicon src/posix/zdoom.xpm "${PN}.xpm" + make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" + cmake_src_install +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! use non-free ; then + ewarn + ewarn "GZDoom installed without non-free components." + ewarn "Note: The non-free game_support.pk3 file is needed to play" + ewarn " games natively supported by GZDoom." + ewarn "A list of games natively supported by GZDoom is available" + ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" + ewarn + fi +} diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest index 598945116ffd..35d571a53704 100644 --- a/games-fps/turtlearena/Manifest +++ b/games-fps/turtlearena/Manifest @@ -2,5 +2,5 @@ AUX turtlearena-0.6.1-build.patch 6401 BLAKE2B e69fda1f38253fcc4ae3a541624dbe365 AUX turtlearena-0.6.1-freetype.patch 451 BLAKE2B 33c2f46261d75149e2151bfd38a4c4f895579c374924c08ee0ae64ef27a6cf5274a00dd4aad6a3ee4ed3885f63ee0e1475fb45226f33eb43f4b591d63564099a SHA512 cc16c0a69b77627956254b000a4b42e77f57f7d073488c0dde3c0b155e01288aaba958fc16d932550200add0b5429afb10f15c3e23a22d874fe31014ebe090a1 DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 BLAKE2B 492eafd29e60a2528d11c91a6c48d8cad4a47718d7aa52c7241590b4e758cc65b76c5eea08b92f16db2eb8feff83d8484c9bd9b02015c1af575309cd92635014 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf DIST turtlearena-0.6.1-0.zip 73713016 BLAKE2B 346222691553122814d92ea42bac3f21e39de499d019c92813d8769690540da5257c52b673ac17440f2fb6819ded6221e19fb0cba67c9d7ad9539dbfc4eeb7b8 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378 -EBUILD turtlearena-0.6.1-r1.ebuild 2774 BLAKE2B 4373d01f824abc072d234a4865d79e525b4e059f5fffdff572bfdd98767d2626e449267644e61a75869e2922702dd4713f4297593b89738818a00b7cb5d5a747 SHA512 55b4ac2221206ed48f96968382d411c6fe17d3956a02d89ff165ae46c90769ad2aa16d11691a6dc68ef018c412a677cfa9f5e61cea7919a3b3a1d79cff5412f3 +EBUILD turtlearena-0.6.1-r1.ebuild 2771 BLAKE2B db156e2590d7c12c964f3f399eeb6961152eb83a2dbae73a8492fa4eeec97aa948be1ca6fac816856f72994b633adf14fad05734ce468d05d78915346ce2a2a1 SHA512 91cf236eebef5167387a0a57a52cc8ccb403e04275638fb55088c822864d2bd6babeb49e8dfaa9b9992094252db65726ed1eea9341bea293ea7543c9f1b44209 MISC metadata.xml 544 BLAKE2B 94c586c5b0c4108ce3a741ec4b8f56e11b52419217b5f842115b10639d3df22375f8951bb2d938698803141411fe48cea13364263efbaf27b3820404dfbac471 SHA512 317c27a9e1e924fa95288f458028dcaf55b41c3426fcada2a050fa83bb380bcd4e3549b5d3077cb988493e604c3bdd03f0c5b00cffad8d1dc34de80c3acee237 diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild index 98472a1a41e6..11be86191560 100644 --- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild +++ b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ RDEPEND=" theora? ( media-libs/libtheora ) voice? ( media-libs/speex - mumble? ( media-sound/mumble ) + mumble? ( net-voip/mumble ) ) vorbis? ( media-libs/libvorbis ) )" diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index 1bcc4cb0b78b..dcd56a38016f 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,4 +1,4 @@ AUX urbanterror-4.3.4_p20211208-respect-flags.patch 2259 BLAKE2B 432fdf6ddc4aab01cc91096a269a7347e357b2f701eb67db6134e2d74cda1406cf126c6a8871a7d4c0db361a5433a9537115d52d29d0088d4cd60942e3e21e34 SHA512 5b0ce59605dfd7e8634f59071a391ba362001d6d24aabab27cb0054ea571fb6a4d3920f5b28d835e425ee724f32dc6281a922885413f3d5161668b0510ca5e17 DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d4005555fa273e64a2e2b57a75661044370 SHA512 24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86 -EBUILD urbanterror-4.3.4_p20211208.ebuild 4500 BLAKE2B 48c0360fa0b8b489a8c46a2193064000a31d5acb6204e346278e7388b18f525608f3ae2c4ecd74fd962e1bcfc992eb011b99a48b8674f87ebca5289e584384ed SHA512 420e2edbecd3b7222029ba7b35239fd04413a7368672acc194f0d8e498bf991014eb22b08610109d34053aa311013bd27629a66672eae06b813f6d6f8801ef08 +EBUILD urbanterror-4.3.4_p20211208.ebuild 4497 BLAKE2B c93ee73cbd30b8749de75d885c30aab676f87b83b0ba8d5b11995912e446f0352436cd7f39dd29899463eed0089f16fe536b15f1f3e4d428bec94d8f4c883487 SHA512 fc879de3f6be1206a269f565820d3023acb70f61b4ff5546cf9ae4dfbff9037733a5ad56ee89a4f7316cbee45c353d84bab2da05d4625aaec1f8dabb71f8dd04 MISC metadata.xml 1089 BLAKE2B dc34404fa38f542dd2f026c718e432ba6659dcf459d4ab759f3adb0853ec840651b493f929d7b60bbe7500f45b98c842bfadc58cdeea4e3246301a0e09db466b SHA512 82ee4115569a3278f5e69ed01e41bbda362a4ff9367f00d94173a87a9298944387b0dd5a12cbf0dee4cbb0005dfa80932b5a458733b820acd94416fe077b2d10 diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild index 5a8e0c3737e8..b0041846f317 100644 --- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild +++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild @@ -36,7 +36,7 @@ PATCHES=( RDEPEND=" client? ( media-libs/libsdl2[X,sound,joystick,opengl,video] - mumble? ( media-sound/mumble:= ) + mumble? ( net-voip/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis ) diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest index f5babdcc319b..08782afb8c55 100644 --- a/games-fps/xonotic/Manifest +++ b/games-fps/xonotic/Manifest @@ -1,4 +1,6 @@ AUX xonotic-0.8.2-gcc-11.patch 1409 BLAKE2B 4c0ebe1dd7c9d6bd4a8cf57819203956d66095fa17335ff4747e994f1cc44e8dea6f8d4d693fa41e4e3b1c83571354611148b1824a003abe644ab9efbb1c6012 SHA512 981ac3b288a4921e80e3889500ea7d8e212608ba6af2c8f19f42000212265dfd6b15d5ccb1e31b5a251daf7cdf1cf049eb936a648f2f3056d30a1e27fe00e59e DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5 +DIST xonotic-0.8.5.zip 1228561792 BLAKE2B 3f1391ff6522c8f6b7b4f717aecd6ffe852142d70e7cffff9cb5a602a69142c59850636cc1450aade5ae39088354170b819f696427ba8829bf7c375029f2430a SHA512 4ffc4b73eeb5f580d178a98419d5b44cbff0c56e356a62baa729b5b7a6c3d43b2b425b123428c9b1bf3f4718eaf61bcf5d62914521cc061c7563a253440c807e EBUILD xonotic-0.8.2.ebuild 2441 BLAKE2B fc83953f367fa62fd3f3a3a88123f15230b492518d7cdf72ddd401d9c18dc4e531f2520b15b0aeaf34a9d9fe0f6fe17b51f682be75595237aa901f4c93b9fd05 SHA512 d3e5ec942463687f648b486b142a354f45497dba8c17a5df5d93ae09d37488b214e75009256bb2f02f60ffb05e765d8d107c8af9b0d216e24481f52948d11075 -MISC metadata.xml 352 BLAKE2B 22f2b05235f9efad38e2917e81b846960933ec1e4224fa4944bb2b84b28742c688e820f15189b15cd2b1dec4490621f7398cacb62e69eaa52047ad0bf1f734b1 SHA512 c7f461df24eaeb4de9193f1eca4fa2004df05fa884f6223e61d5d429d9961ec96cc3e19d65952009a4d0aff5f5cf30dd301aebb58f219fd78b6d2963049260ea +EBUILD xonotic-0.8.5.ebuild 2377 BLAKE2B 1340f0c484f75faded196ac3d7eeec3ff0b34dab66fa01b27540b6a8308718779d0da7358118d8150a57310b96603e87df6e620ffb8f1d3c496420b79884eb42 SHA512 d30bcedb34f439d0a0d11732951758865c5747ebf1fd3186fbef03f146575141ac59b3eb4f879eb5413c723e7ceea78217d977e7aa69798ce09c40f61de93c4a +MISC metadata.xml 439 BLAKE2B f60174ff89a69e81ddc9bfa36a30f846bcdd124b3793b78e1a9598dcf1ce832453ba440c2882ab3fe5212ab9e51ed6e082df222d64760a63dec68cd1e5a53ebe SHA512 5533f471c71d71bb199d1babf598b69d287e2808d44ea93661ea695dfcf9fd19a1b817843d96a220287fe43095c99a78c7437c42ed588e1e7387537d462cbeaf diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml index 7e135f715fc2..6f0500eb437d 100644 --- a/games-fps/xonotic/metadata.xml +++ b/games-fps/xonotic/metadata.xml @@ -1,11 +1,14 @@ - - games@gentoo.org - Gentoo Games Project - - - Enable support for physics engine from dev-games/ode - + + games@gentoo.org + Gentoo Games Project + + + Enable support for physics engine from dev-games/ode + + + xonotic/xonotic + diff --git a/games-fps/xonotic/xonotic-0.8.5.ebuild b/games-fps/xonotic/xonotic-0.8.5.ebuild new file mode 100644 index 000000000000..de5cb5d5a726 --- /dev/null +++ b/games-fps/xonotic/xonotic-0.8.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop check-reqs toolchain-funcs xdg + +DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine" +HOMEPAGE="https://xonotic.org/" +SRC_URI="https://dl.xonotic.org/${P}.zip" +S="${WORKDIR}/${PN^}" + +LICENSE="GPL-3+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="X +alsa ode +sdl" + +# note: many dependencies are used through dlopen() +COMMON_UIDEPEND=" + media-libs/libogg + media-libs/libtheora + media-libs/libvorbis" +RDEPEND=" + dev-libs/d0_blind_id + media-libs/libjpeg-turbo:= + media-libs/libpng + media-libs/freetype:2 + net-misc/curl + sys-libs/zlib:= + X? ( + ${COMMON_UIDEPEND} + media-libs/libglvnd[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXxf86vm + alsa? ( media-libs/alsa-lib ) + ) + ode? ( dev-games/ode:=[double-precision] ) + sdl? ( + ${COMMON_UIDEPEND} + media-libs/libsdl2[joystick,opengl,sound,video] + )" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="app-arch/unzip" + +CHECKREQS_DISK_BUILD="1500M" +CHECKREQS_DISK_USR="1200M" + +src_prepare() { + default + + sed -e 's|-O3 ||' \ + -e '/^LDFLAGS_RELEASE/s/$(OPTIM_RELEASE)/$(GENTOO_LDFLAGS)/' \ + -i source/darkplaces/makefile.inc || die +} + +src_compile() { + tc-export CC + + local emakeargs=( + -C source/darkplaces + DEFAULT_SNDAPI=$(usex alsa ALSA OSS) + DP_FS_BASEDIR="${EPREFIX}"/usr/share/${PN} + DP_LINK_ODE=$(usex ode shared no) + STRIP=: + CPUOPTIMIZATIONS="${CFLAGS}" + GENTOO_LDFLAGS="${LDFLAGS}" + ) + + # split for bug 473352 + emake "${emakeargs[@]}" sv-release + use X && emake "${emakeargs[@]}" cl-release + use sdl && emake "${emakeargs[@]}" sdl-release +} + +src_install() { + newbin {source/darkplaces/darkplaces,${PN}}-dedicated + + if use X || use sdl; then + if use X; then + newbin {source/darkplaces/darkplaces,${PN}}-glx + domenu misc/logos/${PN}-glx.desktop + fi + if use sdl; then + newbin {source/darkplaces/darkplaces,${PN}}-sdl + domenu misc/logos/${PN}.desktop + fi + + local size + for size in 16 22 24 32 48 128 256 512; do + newicon -s ${size} misc/logos/icons_png/${PN}_${size}.png ${PN}.png + done + newicon -s scalable misc/logos/${PN}_icon.svg ${PN}.svg + fi + + dodoc Docs/*.{md,txt} + + insinto /usr/share/${PN} + doins -r key_0.d0pk server data + + rm "${ED}"/usr/share/${PN}/server/.gitattributes || die +} -- cgit v1.2.3