diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /games-strategy | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'games-strategy')
25 files changed, 676 insertions, 81 deletions
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild new file mode 100644 index 000000000000..0939933bda9d --- /dev/null +++ b/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild @@ -0,0 +1,264 @@ +# Copyright 2014-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{8..10} ) +inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg + +DESCRIPTION="A free, real-time strategy game" +HOMEPAGE="https://play0ad.com/" +LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB" +# Upstream signs releases (and only them) with app-crypt/minisign. +# The (public) key can be found on https://play0ad.com/download/source. +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/0ad/0ad" + S="${WORKDIR}/${P}" +elif [[ ${PV} == *_pre* ]]; then + ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7" + SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" +else + # Trailing whitespace for IUSE append below + IUSE="verify-sig " + MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT" + MY_P="0ad-${PV/_/-}" + SRC_URI=" + http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz + https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz + verify-sig? ( + http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig + http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig + ) + " + S="${WORKDIR}/${MY_P}" +fi +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE+="editor +lobby nvtt pch test" + +RESTRICT="test" +CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25 +CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB) + +# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to +# build and/or startup issues. +QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad" + +# virtual/rust is for bundled SpiderMonkey. +# Build-time Python dependency is for SM, too. +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/premake-5.0.0_alpha12:5 + virtual/pkgconfig + virtual/rust + test? ( dev-lang/perl ) +" +# Upstream uses minisign which is not supported by verify-sign, bug #783066. +# Signatures are only provided for releases. +if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then + BDEPEND+=" app-crypt/minisign" +fi + +# Removed dependency on nvtt as we use the bundled one. +# bug #768930 +DEPEND=" + dev-libs/boost:= + dev-libs/icu:= + dev-libs/libfmt:0= + dev-libs/libsodium + dev-libs/libxml2 + media-libs/libpng:0 + media-libs/libsdl2[X,opengl,video] + media-libs/libvorbis + media-libs/openal + net-libs/enet:1.3 + net-libs/miniupnpc:= + net-misc/curl + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) + lobby? ( net-libs/gloox ) +" +RDEPEND=" + ${DEPEND} + !games-strategy/0ad-data +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch + "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch + "${FILESDIR}"/${PN}-0.0.25b_alpha-python3.10.patch + "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-name-collision-glibc.patch +) + +pkg_setup() { + use editor && setup-wxwidgets + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then + if use verify-sig; then + elog "Verifying both signatures using app-crypt/minisign." + minisign -V \ + -P "${MINISIGN_KEY}" \ + -x "${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \ + -m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \ + || die "Failed to verify engine distfile using minisign!" + minisign -V \ + -P "${MINISIGN_KEY}" \ + -x "${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \ + -m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \ + || die "Failed to verify data distfile using minisign!" + fi + # Unpack manually until an eclass supports minisign and unpacks + # if signatures match. + default + else + # Unpack distfiles without checking as this is no official release. + default + fi +} + +src_prepare() { + default + + # SpiderMonkey's configure no longer recognises --build for + # the build tuple + sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die + + # Originally from 0ad-data + rm binaries/data/tools/fontbuilder/fonts/*.txt || die +} + +src_configure() { + # 0AD uses premake:5 to generate the Makefiles, so let's + # 1. configure the configure args, + # 2. export some toolchain args, + # 3. configure premake args, + # 4. run premake5. + local myconf=( + --minimal-flags + $(usex nvtt "" "--without-nvtt") + $(usex pch "" "--without-pch") + $(usex test "" "--without-tests") + $(usex editor "--atlas" "") + $(usex lobby "" "--without-lobby") + --bindir="/usr/bin" + --libdir="/usr/$(get_libdir)"/${PN} + --datadir="/usr/share/${PN}" + ) + + tc-export AR CC CXX RANLIB + + local mypremakeargs=( + --outpath="../workspace/gcc" + --os=linux + --verbose + ) + + cd "${S}/build/premake" || die "Could not enter premake directory" + + /usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \ + || die "Premake failed" +} + +src_compile() { + # Build 3rd party fcollada + einfo "Building bundled fcollada" + emake -C libraries/source/fcollada/src + + # Build bundled NVTT + # nvtt is abandoned upstream and 0ad has forked it and added fixes. + # Use their copy. bug #768930 + if use nvtt ; then + cd libraries/source/nvtt || die + elog "Building bundled NVTT (bug #768930)" + JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT" + cd "${S}" || die + fi + + # Build bundled SpiderMonkey + # We really can't use the system SpiderMonkey right now. + # Breakages occur even on minor bumps in upstream SM, + # e.g. bug #768840. + cd libraries/source/spidermonkey || die + elog "Building bundled SpiderMonkey (bug #768840)" + XARGS="${EPREFIX}/usr/bin/xargs" \ + JOBS="-j$(makeopts_jobs)" \ + ./build.sh \ + || die "Failed to build bundled SpiderMonkey" + + cd "${S}" || die + + # Build 0ad itself! + elog "Building 0ad" + JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1 + + # Build assets + # (We only do this if we're using a snapshot/non-release) + # See bug #771147 (comment 3) and the old 0ad-data ebuild + # Warning: fragile! + if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then + # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. + addpredict /proc/self/task + + # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh. + local archivebuild_input archivebuild_output mod_name + for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do + mod_name="${archivebuild_input##*/}" + archivebuild_output="archives/${mod_name}" + + mkdir -p "${archivebuild_output}" || die + + einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" + LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ + -archivebuild="${archivebuild_input}" \ + -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ + || die "Failed to build assets" + + if [[ -f "${archivebuild_input}/mod.json" ]]; then + cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die + fi + + rm -r "${archivebuild_input}" || die + mv "${archivebuild_output}" "${archivebuild_input}" || die + done + + # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh. + rm binaries/data/config/dev.cfg || die + rm -r binaries/data/mods/_test.* || die + fi +} + +src_test() { + cd binaries/system || die + ./test -libdir "${S}/binaries/system" || die "Failed tests" +} + +src_install() { + newbin binaries/system/pyrogenesis 0ad + use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor + + # Merged from 0ad-data + # bug #771147 (comment 3) + insinto /usr/share/${PN} + doins -r binaries/data/{l10n,config,mods,tools} + + # Install bundled SpiderMonkey and nvtt + # bug #771147 (comment 1) + exeinto /usr/$(get_libdir)/${PN} + doexe binaries/system/{libCollada,libmozjs78-ps-release}.so + + use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so + use editor && doexe binaries/system/libAtlasUI.so + + dodoc binaries/system/readme.txt + doicon -s 128 build/resources/${PN}.png + make_desktop_entry ${PN} +} diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest index e967fbdd870f..c8da73fd7e3f 100644 --- a/games-strategy/0ad/Manifest +++ b/games-strategy/0ad/Manifest @@ -1,8 +1,11 @@ AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594 +AUX 0ad-0.0.25b_alpha-fix-name-collision-glibc.patch 9330 BLAKE2B be2c57a5932a79b1e858c56beebe4f7778fcef1efddcbdc75ff92f9050bf2071704aaf1e3c3c2c37cc1ca8e69f573f05bbd2852fdfd8f0e37aa347748179bd60 SHA512 b31952973103232b77ef1b4a142bb572e576034af20a65d88b8f969a5cf9b1e47398df1a8e03c0e3312e167321c0b30eb3a0fa53dcddd87b945b58dcf521e59a AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b426dea0b4aa5741385d8416ae4db94f0f94d73b3c7ae2b3a851fbb5afe4e8d07d9d65739b5323d3f40e239fcb0d3d39e479419c3cf SHA512 b08424de3685c87901b3caeb39c415f0814f5a5a0a5df6890cf1fe829a822f4d52711c4219b230414c9144ecd1a6ff2b68973f91be415cff350df6f5b5f91fc9 +AUX 0ad-0.0.25b_alpha-python3.10.patch 5768 BLAKE2B f4327a856c71033c77f676e79e4fb11f16f70e733dbc302d07cf64ab96a56b28ae567823ef9e08203165746f29554d1bdc0841108805ee2be0afc4e769426004 SHA512 25cb7306ce843c46c609e0ae584ce57675e7838d161e4276a4dca40483c2acdaa364223d30443a3224e540caccc8ffcf0e58f343121762ac29feaa34ff0c77f5 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e +EBUILD 0ad-0.0.25b_alpha-r1.ebuild 7941 BLAKE2B 045929660f56562edfb71e24d33b9b9c5c44ee87868c73a778838a94577885fd03a983f9c6ead899353fac1ee1761a85e6e88b0b6443cb30b60d777080014d58 SHA512 63c0ce51960713200ee54203c62b245f648cdf5687657c87c087a7e6b53579e843a358ebc9443a1e781d55eaddd14271d035999bf3f8c16de89eae2a89b6922d EBUILD 0ad-0.0.25b_alpha.ebuild 7822 BLAKE2B ccdbd4df870acb3cfb41e004156979fac8b0f73f3de307e529131884b1a7514e23a0ffe90e2ab42d2cb9c67fa0778d7400fd88e171cdd66d1efc0ce7227e108c SHA512 8ecbde1520772d00f224c7fc9e3846f23164b886a5e4cf95c70eb793dca633ed1b485cdfebe301f0bf6d31d3c93f3d43c798033b7b19e9f90f0a03383fac9f62 -MISC metadata.xml 716 BLAKE2B d7a466a2c5de2f182b096d36266225800370484b1bec656766e174f7a7b70b019d67c563f6f5eb9bfe983c874dca850a8b906ee1db1418723d20bf4d7a3a3efc SHA512 20bec043e136ea27267ad9f18753d77235f90a760f6497ae27a9440741c1d3a82193401c201b9941299d281cba62589367c84de3e30d393abe1bf452c70fde81 +MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39 diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch new file mode 100644 index 000000000000..e8d88e794c90 --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch @@ -0,0 +1,131 @@ +https://bugs.gentoo.org/834578 +https://trac.wildfiregames.com/changeset/26536/ +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103735 +https://sourceware.org/bugzilla/show_bug.cgi?id=28713 +--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp ++++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp +@@ -1,3 +1,3 @@ +-/* Copyright (C) 2021 Wildfire Games. ++/* Copyright (C) 2022 Wildfire Games. + * This file is part of 0 A.D. + * +@@ -30,6 +30,4 @@ + static Observable<AtlasMessage::sEnvironmentSettings> g_EnvironmentSettings; + +-const float M_PIf = 3.14159265f; +- + ////////////////////////////////////////////////////////////////////////// + +@@ -86,10 +84,13 @@ + m_Var(var) + { +- m_Conn = g_EnvironmentSettings.RegisterObserver(0, &VariableListBox::OnSettingsChange, this); ++ m_Conn = g_EnvironmentSettings.RegisterObserver( ++ 0, &VariableListBox::OnSettingsChange, this); + + m_Sizer = new wxStaticBoxSizer(wxVERTICAL, this, label); + SetSizer(m_Sizer); + +- m_Combo = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxArrayString(), wxCB_READONLY), ++ m_Combo = new wxComboBox( ++ this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, ++ wxArrayString(), wxCB_READONLY), + m_Sizer->Add(m_Combo, wxSizerFlags().Expand()); + } +@@ -207,6 +208,7 @@ + } + +-EnvironmentSidebar::EnvironmentSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) +-: Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer) ++EnvironmentSidebar::EnvironmentSidebar( ++ ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) ++ : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer) + { + wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL); +@@ -218,13 +220,22 @@ + wxSizer* waterSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Water settings")); + scrollSizer->Add(waterSizer, wxSizerFlags().Expand()); +- waterSizer->Add(new wxButton(scrolledWindow, ID_RecomputeWaterData, _("Reset Water Data")), wxSizerFlags().Expand()); +- waterSizer->Add(m_WaterTypeList = new VariableListBox(scrolledWindow, _("Water Type"), g_EnvironmentSettings.watertype), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water height"), g_EnvironmentSettings.waterheight, 0.f, 1.2f), wxSizerFlags().Expand()); +- waterSizer->Add(new wxButton(scrolledWindow, ID_PickWaterHeight, _("Pick Water Height")), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water waviness"), g_EnvironmentSettings.waterwaviness, 0.f, 10.f), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water murkiness"), g_EnvironmentSettings.watermurkiness, 0.f, 1.f), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Wind angle"), g_EnvironmentSettings.windangle, -M_PIf, M_PIf), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableColorBox(scrolledWindow, _("Water color"), g_EnvironmentSettings.watercolor), wxSizerFlags().Expand()); +- waterSizer->Add(new VariableColorBox(scrolledWindow, _("Water tint"), g_EnvironmentSettings.watertint), wxSizerFlags().Expand()); ++ waterSizer->Add(new wxButton( ++ scrolledWindow, ID_RecomputeWaterData, _("Reset Water Data")), wxSizerFlags().Expand()); ++ waterSizer->Add(m_WaterTypeList = new VariableListBox( ++ scrolledWindow, _("Water Type"), g_EnvironmentSettings.watertype), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Water height"), g_EnvironmentSettings.waterheight, 0.f, 1.2f), wxSizerFlags().Expand()); ++ waterSizer->Add(new wxButton( ++ scrolledWindow, ID_PickWaterHeight, _("Pick Water Height")), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Water waviness"), g_EnvironmentSettings.waterwaviness, 0.f, 10.f), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Water murkiness"), g_EnvironmentSettings.watermurkiness, 0.f, 1.f), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Wind angle"), g_EnvironmentSettings.windangle, -static_cast<float>(M_PI), static_cast<float>(M_PI)), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableColorBox( ++ scrolledWindow, _("Water color"), g_EnvironmentSettings.watercolor), wxSizerFlags().Expand()); ++ waterSizer->Add(new VariableColorBox( ++ scrolledWindow, _("Water tint"), g_EnvironmentSettings.watertint), wxSizerFlags().Expand()); + + std::vector<std::wstring> list; +@@ -236,23 +247,38 @@ + scrollSizer->Add(sunSizer, wxSizerFlags().Expand().Border(wxTOP, 8)); + +- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun rotation"), g_EnvironmentSettings.sunrotation, -M_PIf, M_PIf), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun elevation"), g_EnvironmentSettings.sunelevation, -M_PIf/2, M_PIf/2), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun overbrightness"), g_EnvironmentSettings.sunoverbrightness, 1.0f, 3.0f), wxSizerFlags().Expand()); +- sunSizer->Add(new LightControl(scrolledWindow, wxSize(150, 150), g_EnvironmentSettings)); +- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Sun color"), g_EnvironmentSettings.suncolor), wxSizerFlags().Expand()); +- sunSizer->Add(m_SkyList = new VariableListBox(scrolledWindow, _("Sky set"), g_EnvironmentSettings.skyset), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Factor"), g_EnvironmentSettings.fogfactor, 0.0f, 0.01f), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Thickness"), g_EnvironmentSettings.fogmax, 0.5f, 0.0f), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Fog color"), g_EnvironmentSettings.fogcolor), wxSizerFlags().Expand()); +- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Ambient color"), g_EnvironmentSettings.ambientcolor), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Sun rotation"), g_EnvironmentSettings.sunrotation, -static_cast<float>(M_PI), static_cast<float>(M_PI)), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Sun elevation"), g_EnvironmentSettings.sunelevation, -static_cast<float>(M_PI) / 2.0f, static_cast<float>(M_PI) / 2.0f), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Sun overbrightness"), g_EnvironmentSettings.sunoverbrightness, 1.0f, 3.0f), wxSizerFlags().Expand()); ++ sunSizer->Add(new LightControl( ++ scrolledWindow, wxSize(150, 150), g_EnvironmentSettings)); ++ sunSizer->Add(new VariableColorBox( ++ scrolledWindow, _("Sun color"), g_EnvironmentSettings.suncolor), wxSizerFlags().Expand()); ++ sunSizer->Add(m_SkyList = new VariableListBox( ++ scrolledWindow, _("Sky set"), g_EnvironmentSettings.skyset), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Fog Factor"), g_EnvironmentSettings.fogfactor, 0.0f, 0.01f), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Fog Thickness"), g_EnvironmentSettings.fogmax, 0.5f, 0.0f), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableColorBox( ++ scrolledWindow, _("Fog color"), g_EnvironmentSettings.fogcolor), wxSizerFlags().Expand()); ++ sunSizer->Add(new VariableColorBox( ++ scrolledWindow, _("Ambient color"), g_EnvironmentSettings.ambientcolor), wxSizerFlags().Expand()); + + wxSizer* postProcSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Post-processing settings")); + scrollSizer->Add(postProcSizer, wxSizerFlags().Expand().Border(wxTOP, 8)); + +- postProcSizer->Add(m_PostEffectList = new VariableListBox(scrolledWindow, _("Post Effect"), g_EnvironmentSettings.posteffect), wxSizerFlags().Expand()); +- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Brightness"), g_EnvironmentSettings.brightness, -0.5f, 0.5f), wxSizerFlags().Expand()); +- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Contrast (HDR)"), g_EnvironmentSettings.contrast, 0.5f, 1.5f), wxSizerFlags().Expand()); +- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Saturation"), g_EnvironmentSettings.saturation, 0.0f, 2.0f), wxSizerFlags().Expand()); +- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Bloom"), g_EnvironmentSettings.bloom, 0.2f, 0.0f), wxSizerFlags().Expand()); ++ postProcSizer->Add(m_PostEffectList = new VariableListBox( ++ scrolledWindow, _("Post Effect"), g_EnvironmentSettings.posteffect), wxSizerFlags().Expand()); ++ postProcSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Brightness"), g_EnvironmentSettings.brightness, -0.5f, 0.5f), wxSizerFlags().Expand()); ++ postProcSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Contrast (HDR)"), g_EnvironmentSettings.contrast, 0.5f, 1.5f), wxSizerFlags().Expand()); ++ postProcSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Saturation"), g_EnvironmentSettings.saturation, 0.0f, 2.0f), wxSizerFlags().Expand()); ++ postProcSizer->Add(new VariableSliderBox( ++ scrolledWindow, _("Bloom"), g_EnvironmentSettings.bloom, 0.2f, 0.0f), wxSizerFlags().Expand()); + + m_Conn = g_EnvironmentSettings.RegisterObserver(0, &SendToGame); + diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch b/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch new file mode 100644 index 000000000000..80991e3c7a6e --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch @@ -0,0 +1,156 @@ +https://github.com/0ad/0ad/commit/c2ec217eea6952c4877095969e11900b70c7cda3 +https://bugs.gentoo.org/845987 + +From: s0600204 <s0600204@3db68df2-c116-0410-a063-a993310a9797> +Date: Wed, 23 Feb 2022 20:30:38 +0000 +Subject: [PATCH] Fix building spidermonkey on systems with python 3.10 + +Tested by: +* Langbart - macOS 10.15.7: `homebrew`ed python 3.9.9 & 3.10.1 +* andy5995 - Manjaro 21.2.3: python 3.10.2 +* s0600204 - ArchLinux: python 3.10.2 + +Differential Revision: https://code.wildfiregames.com/D4437 + + + +git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@26475 3db68df2-c116-0410-a063-a993310a9797 +--- /dev/null ++++ b/libraries/source/spidermonkey/FixPythonCollectionABC.diff +@@ -0,0 +1,87 @@ ++--- a/python/mach/mach/config.py +++++ b/python/mach/mach/config.py ++@@ -144,7 +144,7 @@ ++ return _ ++ ++ ++-class ConfigSettings(collections.Mapping): +++class ConfigSettings(collections.abc.Mapping): ++ """Interface for configuration settings. ++ ++ This is the main interface to the configuration. ++@@ -190,7 +190,7 @@ ++ will result in exceptions being raised. ++ """ ++ ++- class ConfigSection(collections.MutableMapping, object): +++ class ConfigSection(collections.abc.MutableMapping, object): ++ """Represents an individual config section.""" ++ def __init__(self, config, name, settings): ++ object.__setattr__(self, '_config', config) ++--- a/python/mach/mach/decorators.py +++++ b/python/mach/mach/decorators.py ++@@ -159,7 +159,7 @@ ++ 'Conditions argument must take a list ' + \ ++ 'of functions. Found %s instead.' ++ ++- if not isinstance(command.conditions, collections.Iterable): +++ if not isinstance(command.conditions, collections.abc.Iterable): ++ msg = msg % (command.name, type(command.conditions)) ++ raise MachError(msg) ++ ++--- a/python/mach/mach/main.py +++++ b/python/mach/mach/main.py ++@@ -16,7 +16,7 @@ ++ import sys ++ import traceback ++ import uuid ++-from collections import Iterable +++from collections.abc import Iterable ++ ++ from six import string_types ++ ++--- a/python/mozbuild/mozbuild/backend/configenvironment.py +++++ b/python/mozbuild/mozbuild/backend/configenvironment.py ++@@ -9,7 +9,8 @@ ++ import sys ++ import json ++ ++-from collections import Iterable, OrderedDict +++from collections import OrderedDict +++from collections.abc import Iterable ++ from types import ModuleType ++ ++ import mozpack.path as mozpath ++--- a/python/mozbuild/mozbuild/makeutil.py +++++ b/python/mozbuild/mozbuild/makeutil.py ++@@ -7,7 +7,7 @@ ++ import os ++ import re ++ import six ++-from collections import Iterable +++from collections.abc import Iterable ++ ++ ++ class Makefile(object): ++--- a/python/mozbuild/mozbuild/util.py +++++ b/python/mozbuild/mozbuild/util.py ++@@ -782,7 +782,7 @@ ++ self._strings = StrictOrderingOnAppendList() ++ self._children = {} ++ ++- class StringListAdaptor(collections.Sequence): +++ class StringListAdaptor(collections.abc.Sequence): ++ def __init__(self, hsl): ++ self._hsl = hsl ++ ++--- a/testing/mozbase/manifestparser/manifestparser/filters.py +++++ b/testing/mozbase/manifestparser/manifestparser/filters.py ++@@ -15,1 +15,2 @@ ++-from collections import defaultdict, MutableSequence +++from collections import defaultdict +++from collections.abc import MutableSequence ++--- a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py +++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py ++@@ -82,1 +82,1 @@ ++-from collections import MutableSet, MutableMapping, MutableSequence +++from collections.abc import MutableSet, MutableMapping, MutableSequence +--- /dev/null ++++ b/libraries/source/spidermonkey/FixVirtualenvForPython310.diff +@@ -0,0 +1,15 @@ ++--- a/third_party/python/virtualenv/virtualenv.py +++++ b/third_party/python/virtualenv/virtualenv.py ++@@ -1804,7 +1804,11 @@ ++ pass ++ else: ++ # noinspection PyProtectedMember ++- if sysconfig._get_default_scheme() == "posix_local": +++ try: # Python >= 3.10 +++ default_scheme = sysconfig.get_default_scheme() +++ except: # Python < 3.10 +++ default_scheme = sysconfig._get_default_scheme() +++ if default_scheme == "posix_local": ++ local_path = os.path.join(home_dir, "local") ++ if not os.path.exists(local_path): ++ os.mkdir(local_path) +--- a/libraries/source/spidermonkey/patch.sh ++++ b/libraries/source/spidermonkey/patch.sh +@@ -52,6 +60,11 @@ patch -p1 < ../FixMSVCRootedVoid.diff + # so this patches it to an arbitrarily high Mac OS 11 + patch -p1 < ../FixMacBuild.diff + ++# In python 3.3, the Collections' Abstract Base Classes were moved from `collections` to ++# `collections.abc`, and aliases were set up for backwards compatibility. ++# In python 3.10, these aliases were removed, requiring all code that used them to update. ++patch -p1 < ../FixPythonCollectionABC.diff ++ + # Fix FP access breaking compilation on RPI3+ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 + +diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh +index 2a3e165..5dde46f 100644 +--- a/libraries/source/spidermonkey/patch.sh ++++ b/libraries/source/spidermonkey/patch.sh +@@ -2,6 +2,11 @@ + # Apply patches if needed + # This script gets called from build.sh. + ++# In python 3.10 `sysconfig._get_default_scheme()` was renamed to ++# `sysconfig.get_default_scheme()`. This breaks the version of ++# `virtualenv` bundled with the spidermonkey source code. ++patch -p1 < ../FixVirtualenvForPython310.diff ++ + # Mozglue symbols need to be linked against static builds. + # https://bugzilla.mozilla.org/show_bug.cgi?id=1588340 + patch -p1 < ../FixMozglue.diff diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml index bc03cc2afd55..c47c262ab260 100644 --- a/games-strategy/0ad/metadata.xml +++ b/games-strategy/0ad/metadata.xml @@ -10,7 +10,6 @@ <flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg> and the multiplayer lobby</flag> <flag name="nvtt">Support for some uncompressed data formats - via <pkg>media-gfx/nvidia-texture-tools</pkg> (might be needed for some mods)</flag> </use> <upstream> diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz Binary files differindex fb27b7d5fdf4..78e74c289828 100644 --- a/games-strategy/Manifest.gz +++ b/games-strategy/Manifest.gz diff --git a/games-strategy/augustus/Manifest b/games-strategy/augustus/Manifest index b83e6273861c..816a8b5161be 100644 --- a/games-strategy/augustus/Manifest +++ b/games-strategy/augustus/Manifest @@ -2,5 +2,5 @@ AUX README.gentoo 426 BLAKE2B 803713ea8fe3bd1f20b3a5951cb23135ddb511b916d75ac30c AUX augustus-3.0.1-desktop_rename.patch 241 BLAKE2B 8adea277b37e544442cbf38f18387f90d0bf9a3366c5323e2e9bbefda49f517871c173a22dbe937fbf4a1244275c3195f2d008b542c54a778550967726025e7c SHA512 e283524f8e5dafea3bfb890c19be221f586ec6fc70943914eed3d542208c33a4cccf53f06a14fbc8db21be2fdeba6f97b38cea8592a343d11574e094f82cde2e AUX augustus-3.0.1-uncapped.patch 464 BLAKE2B 074faedf03b64b3e34c15a9412f3d22f3ec93fa638f9d90e910e2b5c203fe3e608ba29de499cedc22fdad6b19194befa5617bb6aa0e1db230873af554f5082f5 SHA512 725df61a3a21433617a672d62a97ab3f64e3bafbc6e619af8a8959de00b3144ec42c8dff747e846affe3ce74eec4dfdf6cd3613c5c07459df51945598585cf76 DIST augustus-3.0.1.tar.gz 47539500 BLAKE2B 43e808959f176e4024866074c227814e2be75175cbbca60fbc430a7617941766b8a00ae6f56c08239c5ed8cd60d637109e963eba859c78d60f7b37d54079e7c4 SHA512 4929763a4436863525c4d3f93570090ce066ea2abfe56766d991b7ebc03b34fc53fc8c6dcbb7f5c96e2e10d233bb5966581d148db7d7ea2eac5c1435cc4327bd -EBUILD augustus-3.0.1.ebuild 1173 BLAKE2B 5414796406723cff31448dd1f5066ab9fe9def05c8ec54411f86e04507fbd5da20b4c4a3ef8be2a1dcd691bc76028f8a7b8b49bfd8ec89806327cfcc65eff15d SHA512 d9e67def256b20f659291b3f2aeb3e4bcbca45196e85dedea3aa115f1091ea55b0659bee9cffd850f9586a89f3de376217ea70d354361d15150fd2516cc32194 +EBUILD augustus-3.0.1.ebuild 1180 BLAKE2B 54973e2ef040be4640c176e93d2e5ddf0adf1b5bc1c2f1115061f87985e269cbef6d18cd0690b31ab06516b876c64692e992e5d2073cb2f4fc3e2b1bce25a359 SHA512 a4d68737ad4e1afc1fb7f1e5128c84cb94fa485053f3ca72d3732eee699287de8df01bc9464604701d426916952f6932f5ac27807c10cab3070b2931d1dffc53 MISC metadata.xml 808 BLAKE2B f1092bef61291ecde82d897b232b8a80448aa6a69ff3f43b9e2346252075a81d1b14c3d1815640434dc0357f71a7f314a81ded5fbe33b00f7f2ffb3b7130af00 SHA512 e50e01c64d03e0df6004892b049d8e3c30069f53742ecde6cb46bc8d76cba53a1d45ce4982d48499ba45e7557075d9db62685b5de05240409c723ea9b6f2fdcd diff --git a/games-strategy/augustus/augustus-3.0.1.ebuild b/games-strategy/augustus/augustus-3.0.1.ebuild index b14ad8923ee1..1adb27ab8703 100644 --- a/games-strategy/augustus/augustus-3.0.1.ebuild +++ b/games-strategy/augustus/augustus-3.0.1.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Keriew/augustus/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE="uncapped" DEPEND=" diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index 4a6192becebd..54d0189326ad 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,7 +1,9 @@ AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256 DIST freeorion-0.4.10.1_p20200629.tar.gz 142041599 BLAKE2B a9c14409f31f5ad4d8db95fa33e8f1adb35f7b2a74ea7f173365c7d09979b9a3aa7981ee9deec0427c64844da14ecc323ee54e3331217e2978b49eb86a7a18fb SHA512 b2d4f52e968852569d549c03eca2545b7adac560e5716a21da612dc363b23d790c4481fbd5762f1f1f8da9a8e04894e247ce19363cd96cc2001728912e027d9a +DIST freeorion-0.4.10.2.tar.gz 124720711 BLAKE2B 4f707b5296bdbc05b2b775b62f0393d1770bcf64c48f08d3332fbbb4b78e1bdc3e8111a1e421a8d0f0e03ca7454bba981809b9486d3d803e39faf042f1145059 SHA512 13832992efe17fe48615ccdf284d1e9f391c35ed518abd15276992128a02894f4b30c8fe3d950e41935efb823cf834dc430330f0bcc6c9e91f13a3dea9812628 EBUILD freeorion-0.4.10.1-r3.ebuild 1594 BLAKE2B 34fd78d2c505ccf80a8b7bc4873f6fcd99ddb1c4ccbba52c3ac205d8129c5b7efa3c85b5f37c1be6a0d8bd3eb9d24090dd3ed0d80693aa80a51c75f68194ab66 SHA512 684c49ce0cdfbeef1442cd84e916ea0183e478d377a48e3af6e7d0f0af7f4aa29f1473249be38b9409b748a5b11cdee7691c0aa4d5b8f4bb2548d8bab7510700 EBUILD freeorion-0.4.10.1_p20200629.ebuild 1634 BLAKE2B b6e07e04ac314e80b458df46da95e865b027904dd4c0d6a1b1df50521af576789f7d1f06234dd6645baff4dad30b339067229ad1192b48274e6f70eaa62ef1c1 SHA512 2bb509e552355f52290b728bd248234e1d7f33e8a09ce2d85c81c3f1276eb5629087ef6532750e0a4ce47ddff8955a79cbd01d0a284b65935948462f94e74c63 -EBUILD freeorion-9999.ebuild 1594 BLAKE2B d2c0148504ce2855c0da99e74cc5b3539d5a3427992a28aa03b507ecda8848b1d7670623f8ca71d2ec79eb309ef607a6d69d12d175c95fb6cf44e4d21ee3606a SHA512 ff9412d58ff52e19d771ee84b8088a5d95b1eb0dbb0b2f180e509c7bb8b45b810503d742a418dafa2afc25d658da05da110c38ff76555bdb62baed9c8f335e81 +EBUILD freeorion-0.4.10.2.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b +EBUILD freeorion-9999.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b MISC metadata.xml 685 BLAKE2B 5507a5682e7bc9409868b8c1fff7847616260cc0bff41f85a6f75a73477c159294956f6bd60d8ed48d47121d46a9baf675e48f28b3f886aea0a32b77f0405820 SHA512 c963491c8070ad1a99c3f84ba7b02c9bce4eaff29ee58f4037733e61e41e414ed59890a2a68845e343d7d2a59757b81e6e115789132c67d2ed67b846d17d5319 diff --git a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild new file mode 100644 index 000000000000..8931083dbe88 --- /dev/null +++ b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake python-single-r1 xdg + +DESCRIPTION="A free turn-based space empire and galactic conquest game" +HOMEPAGE="https://www.freeorion.org" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" +else + KEYWORDS="~amd64" + if [[ ${PV} = *_p* ]]; then + COMMIT="" + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PV/_/-}" + fi +fi + +LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" +SLOT="0" +IUSE="dedicated" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}] + ') + !dedicated? ( + media-libs/freealut + >=media-libs/freetype-2.5.5 + media-libs/glew:= + >=media-libs/libogg-1.1.3 + media-libs/libpng:0= + media-libs/libsdl2[X,opengl,video] + >=media-libs/libvorbis-1.1.2 + media-libs/openal + sci-physics/bullet:= + virtual/opengl + ) + sys-libs/zlib + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s/-O3//" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_SKIP_RPATH=ON + -DBUILD_HEADLESS="$(usex dedicated)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newenvd "${FILESDIR}/${PN}.envd" 99${PN} +} diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild index 46bf4ce29f60..8931083dbe88 100644 --- a/games-strategy/freeorion/freeorion-9999.ebuild +++ b/games-strategy/freeorion/freeorion-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 xdg DESCRIPTION="A free turn-based space empire and galactic conquest game" diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest index 7ef097c41a37..0e7c64942c8a 100644 --- a/games-strategy/julius/Manifest +++ b/games-strategy/julius/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 424 BLAKE2B 22fd27d4a6cf675867d5d8e5dd0fdc5ff84f14a0dd37e2ad7454c6cfdf0445ff8dc0b3bd3f37cfd314b756ca27c8461b9ce1939d66f1724d6b06ddd2d0d274e2 SHA512 4c91297ed589bba1b9fc46e8705b927ab4010ebabd8d7ae4fc68afdb34b64e8ac1f64439fdc6214944eb8968c8f274c189da4869b9219279ddccfca267877cce AUX julius-1.4.1-rename.patch 718 BLAKE2B 00a4cfb23cb4586a7a1a4069d1ba3db7edab0f6cfeaf3f5efc396a7c2be4e94923272a6d82585173f8d2569d84c97ca2046682e85d638d9c473b22577c693840 SHA512 0401429f24c5cb3285bef68b1fa2b489ec32d7fa13d20448e8f06231b23d137ed9edeb6fcc693cbcc6f891a38dcd3fb34c519fe9ff41b5f35c8b7dec52847c12 DIST julius-1.6.0.tar.gz 6884324 BLAKE2B 142f05b8f7165e59678fc56fcdf9e2c00aea880540e16fedc627ed40afb4ce96511d99f0cd99f99997d8d66f776e6d847cc66256fafde771345948ba097b940e SHA512 c21256b9f126011b0961411209d354e713e6de44a30c190a7de5e0a702636961ad0775beb171b17767ec70e334e6101f9c1ad26df6860b4f4d59d74510083905 -EBUILD julius-1.6.0.ebuild 1016 BLAKE2B fce77e375dbf5ee81ad7253d3def74e24b28fea6343c6adedac814765418437da5afa1f01cf055b23d94ce3f95dac1cf9de9be1de0f541f74e71415d2cba59c1 SHA512 ddb111573c3031d1086c49a738f5c9185c5556964bef151f18da29916649b8f5c3bb6ee5c5084d1ceafadef8c3dbc94cd381de99a42ac6b0d71264a8cca31811 +EBUILD julius-1.6.0.ebuild 1023 BLAKE2B 72fafc994153a70a13060e243f4f7b1149dced62a2be67033adcff43036e9712a3103d049e1de82e7aec41711457a5cb806c8cac19db61d76727542b9e2b6229 SHA512 2be5b0c2a0352a9c3f4f51e5c3b307f016e2b155c5d7934dd5b0b774b3133040e5b746798367553befeaeda22562f4108b81c52c6a56a17d706cda31396871fa MISC metadata.xml 985 BLAKE2B 30d3565fda85335eae3b0ab5f330198293aeb4678809d6383998ce2d5f6c71919f9601942ff758d75b73cd25913cb6d9180ecabdc78ddc9f4f6abd349cd181cf SHA512 1395de93fd76cb695e13e48b41175a7841a22d39344d08b1a8932b05613b12bccadbf27de7759c72b517b6321c48ca3bf870fc8d7c2fb33dbf2e6000e17012f5 diff --git a/games-strategy/julius/julius-1.6.0.ebuild b/games-strategy/julius/julius-1.6.0.ebuild index 31fae63d4296..5730e843db21 100644 --- a/games-strategy/julius/julius-1.6.0.ebuild +++ b/games-strategy/julius/julius-1.6.0.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc64" DEPEND=" media-libs/libpng:= diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest index 1822be24f422..051e588e34f0 100644 --- a/games-strategy/s25rttr/Manifest +++ b/games-strategy/s25rttr/Manifest @@ -5,5 +5,5 @@ AUX s25rttr-0.9.1-libsamplerate.patch 1536 BLAKE2B 55fbc0c0b439d98635ca74384033d DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802 EBUILD s25rttr-0.9.1.ebuild 2796 BLAKE2B e4a57a16fecf7afc6e7e9b95813525e7a3f6c7ab9b8802a82a75bc91c25d848341d61c0fa40930a0c8e1af73ad4d7ab518c1b547055b271f60891ab89ee352bf SHA512 afb89fcca9ecb5bc89750df151caf5965be0f4d717bb36991a6c21b258d6db182fab9e311f8480cdfb5230e693e23de4058692f24e89d69d16a9c55d3386f104 -EBUILD s25rttr-0.9.5.ebuild 2636 BLAKE2B 2e193ce0ae1ad9db8b39381635a1d4dc8bd9faba7faeaf5b15f8b25a20e803cf755424c88f3c5d667c153053ad115276ae6fd254d9e1f7209fffa8a825d85472 SHA512 4538d08c64db99383a02be0bc06bca5bfc87a2087016031cc149db454d3654e37f485ed102f242159db8337ad24496954913f4398b338799b4f8e4fb2cd1d0f2 +EBUILD s25rttr-0.9.5.ebuild 2643 BLAKE2B 9f0353e995f6d3399081eef6aced76dd16cba52cfe7dd14cdaff1add6abd91720ec884daa4f04a0f3b20c8f94ca8752e01aaca2f4994f3f4c24b77a4ae39aa75 SHA512 c4667ed0d1e2a1f8c08914569d235ca8d971411de864db98bd235005f811dd4df90920d2b90a1f1de4ed7cf925c609c2fa856a911d3e8cea3ae7844d40b2c33f MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild index 47d74e0d261a..465e763ee22c 100644 --- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild +++ b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.siedler25.org/" SRC_URI="https://github.com/Return-To-The-Roots/${MY_PN}/releases/download/v${PV}/${MY_PN}_src_v${PV}.tar.gz" LICENSE="GPL-2+ GPL-3 Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" REQUIRED_USE="${LUA_REQUIRED_USE}" diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest index 00c60a4f83f9..6717e06da1b9 100644 --- a/games-strategy/seven-kingdoms/Manifest +++ b/games-strategy/seven-kingdoms/Manifest @@ -2,5 +2,5 @@ DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6 DIST 7kaa-2.15.5.tar.xz 47501772 BLAKE2B 3ab52031d7426485c0ccdb3ae93fde37a97c3aa3ce4f1cb686cf57aca149223b7399cca1439a96e6540de31c126c1c91a42f6635428bd6ea9c1874a38a0538b1 SHA512 12ea1a9d49eb4c7759a34b462ae74dfb46dc4b976096653e122b91572664f50fdda17f3d6d58d700bd5ba28b385e5f9f48b72560f7560a36dfb24d76d5aa7881 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6 EBUILD seven-kingdoms-2.15.4_p1.ebuild 877 BLAKE2B 75dde0c3cb9eb2d3835684e11ac2013ae66c5e64f6897af8582ed7f3afc64d4f531460bd75c0681ad8b46ef1b7bf5592948a8b02b28b34e95c32ea4c0350c75b SHA512 4c2f279ca072acfdb9457241fb4d603f3e1a0ee7a94ce00b3ea9f2e0cec63ae7e4d5392d15f7ff0e4f7939dda22fb966e7f7d0b74bc7bd76e0469fa2a89103f1 -EBUILD seven-kingdoms-2.15.5.ebuild 879 BLAKE2B 8e7e1e7568aaded3cfd3dc6ae3f2e0edc96aa47fe50c6b4c0f8b3c101ffa11f082fc8ad4e39f3c8a400f2c8b3625735fccc1e168a6be8b34bbe86784eb38fcb4 SHA512 08d465bfc0b14ff05276cfda3422b8dcfec11bd5e4b1ab9e2ef8f87aa31bbce73508112b757972dd072009efe9e4bfb3d287e249eb22b930501b62749e6ecf45 +EBUILD seven-kingdoms-2.15.5.ebuild 886 BLAKE2B a5a9fdb9f7b509c967f09f90166fa8a9e06578c96c8c18d1d9b482eed864ca5b7db9980ec1b39db984e6e69a60894f909615cbb50394dcec0b4df29674a5f123 SHA512 4027578618248da1999f85c23728dc73eb79f98d498b9600700c61a1cf7a1a19d0c6c6f15e54cd2fc4fd056de12d5b4551c49dd17c62b88bf66638548b6dd682 MISC metadata.xml 380 BLAKE2B 32f34684fc68a2e26bbfc87d8ba634a6cd23a489f8ba3927f09fd40b9f66e289711b45331f11922e7062f7da4cea0d210e60af79faba88b0a9202076183a7959 SHA512 a614006a602839d04f7f20f4069063d123d4b8786ff103a20349933e0304860d790e52f44ce2649d1452f9027d8e3110267b7958738aab4dfd5105ee4d4a43e5 diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild index 003704713e9f..a373d5653851 100644 --- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" DEPEND="net-libs/enet:1.3= media-libs/libsdl2[X,video] diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 7e267c574b6a..02b4436de502 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,9 +1,8 @@ -AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab -DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4 -DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee SHA512 7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2 -DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb SHA512 6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe -EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27 -EBUILD wesnoth-1.15.15.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6 -EBUILD wesnoth-1.16.0-r1.ebuild 2373 BLAKE2B d9a7061e0de3223fd2fd0b7ecc85d101949e0ee0689953e19fc6fc3be1d725db6c1d9863757517a72e261c9ae588ddec834e0751ca125cfe4582415976a6fa78 SHA512 4813c803874ede90b4b2a84f6e3cd533756ee5918c2f59fb122d3f6b8490918365b7a8bc141b2083e955bbf48e4499659c98ac91c3d7f1a09ab9c9fa180aadda -MISC metadata.xml 486 BLAKE2B a9dc64cc59fd1a47f9e6e13f6ebb9ba05845437efb6ec4e4fa68b5f1a1018d12fa7d1371fb4fb9ac0f83a3e2dbcc9eaade90a15ddd2213891dd8dff37280cb1d SHA512 10477ca40a5c3ba502f85841bed2ae73e8125b94c6c504288d8c9fc5742c0084f17c7b0901a298772a28e5c813c9d5034058b68d32ee4ec37513fadaf49442d1 +DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3 SHA512 19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66 +DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0 +DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377 +EBUILD wesnoth-1.16.2.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755 +EBUILD wesnoth-1.16.3.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755 +EBUILD wesnoth-1.17.5.ebuild 2214 BLAKE2B da4ccb1c6eab6c3c7c4ae7c863aa4a920b43672acd58fbb2067058f3cd875fec58ea0da4369612bb03667ac62ca835bd344aa62504cd460a5f394da5f9725491 SHA512 bbd9c354e5f7d5fc2b1eb3d40a5aa21f31ea750417b0ee5531104d1acba7a88c004070d4cb5e89c3918bd46c459cf9a34c890d5872daa5ecd92314dcfe28c85f +MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102 diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch deleted file mode 100644 index 4a7c8cf41e72..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch +++ /dev/null @@ -1,14 +0,0 @@ -Leave default AR as is, https://bugs.gentoo.org/732096 - -diff -r 419bf3de54e5 CMakeLists.txt ---- a/CMakeLists.txt Sat Oct 24 19:50:25 2020 +0000 -+++ b/CMakeLists.txt Sat Oct 24 19:50:53 2020 +0000 -@@ -390,8 +390,6 @@ - MESSAGE("Using ar, ranlib, and default linker") - find_program(NON_LTO_AR NAMES ar) - find_program(NON_LTO_RANLIB NAMES ranlib) -- set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE) -- set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE) - endif() - MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB) - diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml index 55f36d0dfad5..42cfc4670216 100644 --- a/games-strategy/wesnoth/metadata.xml +++ b/games-strategy/wesnoth/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="server">Enable compilation of server</flag> - <flag name="fribidi">Support for right-to-left languages</flag> </use> <upstream> <remote-id type="sourceforge">wesnoth</remote-id> diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild index 12aaafe9867e..17cdd9a055f7 100644 --- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic toolchain-funcs xdg +inherit cmake flag-o-matic xdg DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org @@ -64,10 +64,6 @@ src_prepare() { src_configure() { filter-flags -ftracer -fomit-frame-pointer - if [[ $(gcc-major-version) -eq 3 ]] ; then - filter-flags -fstack-protector - append-flags -fno-stack-protector - fi if use dedicated || use server ; then mycmakeargs=( @@ -97,7 +93,7 @@ src_configure() { src_install() { local DOCS=( README.md changelog.md ) cmake_src_install - if use dedicated || use server; then + if use dedicated || use server ; then rmdir "${ED}"/run{/wesnothd,} || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd fi diff --git a/games-strategy/wesnoth/wesnoth-1.15.15.ebuild b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild index c9a69554f398..17cdd9a055f7 100644 --- a/games-strategy/wesnoth/wesnoth-1.15.15.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic toolchain-funcs xdg +inherit cmake flag-o-matic xdg DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org @@ -14,14 +14,14 @@ LICENSE="GPL-2" SLOT="0" # uneven minor versions are development versions if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi IUSE="dbus dedicated doc nls server" RDEPEND=" acct-group/wesnoth acct-user/wesnoth - >=dev-libs/boost-1.50:=[nls,threads(+),icu] + dev-libs/boost:=[bzip2,context,icu,nls,threads(+)] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 @@ -46,8 +46,6 @@ BDEPEND=" src_prepare() { cmake_src_prepare - sed 's@ coroutine@@' -i CMakeLists.txt || die - sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die if ! use doc ; then sed -i \ -e '/manual/d' \ @@ -66,10 +64,6 @@ src_prepare() { src_configure() { filter-flags -ftracer -fomit-frame-pointer - if [[ $(gcc-major-version) -eq 3 ]] ; then - filter-flags -fstack-protector - append-flags -fno-stack-protector - fi if use dedicated || use server ; then mycmakeargs=( @@ -99,8 +93,8 @@ src_configure() { src_install() { local DOCS=( README.md changelog.md ) cmake_src_install - if use dedicated || use server; then - rmdir "${ED}/run/wesnothd" || die + if use dedicated || use server ; then + rmdir "${ED}"/run{/wesnothd,} || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd fi } diff --git a/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild index 4350dcbc1a9b..764fb71cac25 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic toolchain-funcs xdg +inherit cmake flag-o-matic xdg DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org https://github.com/wesnoth/wesnoth" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -16,12 +16,12 @@ SLOT="0" if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi -IUSE="dbus dedicated doc fribidi nls server" +IUSE="dbus dedicated doc nls server" RDEPEND=" acct-group/wesnoth acct-user/wesnoth - >=dev-libs/boost-1.50:=[nls,threads(+),icu] + dev-libs/boost:=[bzip2,context,icu,nls,threads(+)] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 @@ -29,13 +29,11 @@ RDEPEND=" >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] - >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) - fribidi? ( dev-libs/fribidi ) )" DEPEND="${RDEPEND} x11-libs/libX11 @@ -45,10 +43,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/wesnoth-1.14.14-ar.patch" -) - src_prepare() { cmake_src_prepare @@ -70,10 +64,6 @@ src_prepare() { src_configure() { filter-flags -ftracer -fomit-frame-pointer - if [[ $(gcc-major-version) -eq 3 ]] ; then - filter-flags -fstack-protector - append-flags -fno-stack-protector - fi if use dedicated || use server ; then mycmakeargs=( @@ -95,7 +85,6 @@ src_configure() { -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" -DENABLE_NLS="$(usex nls)" -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_FRIBIDI="$(usex fribidi)" -DENABLE_STRICT_COMPILATION="OFF" ) cmake_src_configure @@ -104,8 +93,8 @@ src_configure() { src_install() { local DOCS=( README.md changelog.md ) cmake_src_install - if use dedicated || use server; then - rmdir "${ED}/run/wesnothd" || die + if use dedicated || use server ; then + rmdir "${ED}"/run{/wesnothd,} || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd fi } diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 90510368645a..e97d9295be42 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,5 +1,5 @@ AUX widelands-1.0-boost-1.77.patch 473 BLAKE2B c874688efafde34c19b9362b4a744c054076bbdb62ad4bddf3f3960774852fac514e768e20d78b1908b2d0274534304f6629ac2bbf87200f4f44f7730cd63981 SHA512 8b1d989c208f917bd26e9ab6000a1367f1dc9f6fa7dcdf681503541b1dd6d1a6433463c4f547ff387aeceb38156e7e8c73790f329746b6b55350f17b96289f9c DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e -EBUILD widelands-1.0.ebuild 1349 BLAKE2B 6a5e639c181d4e9b08590ed8d718c6f131858270120eefa36e745bebf99cccf1404d925198dce8638669ebf433bec2311be0d0705301a3042f16b2b09567d949 SHA512 c4775dc1e9eeb785ba0bd90bb1601de1cbc53f45d597d2fdbd62fc8c62025ca59cfcea2d1e574e36c92051c8504eea6f8951391a0d67182f10275644465a070e +EBUILD widelands-1.0.ebuild 1363 BLAKE2B 8d6b29f34ad7725fc3249e260e63dc36d0e8f345469264b7b256d8340041ad26acbcff75735fda9d216618469aecab46156b6595a0cabb187ecdc9e520c5e436 SHA512 ca05758fc32143bf586b069b8027affddf56efcd442ca97dc2f6b5b2a71d95bb90ee8309811d05b5b669caed632215cb2c1ef357d288a7642314a1d33480f529 EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c MISC metadata.xml 390 BLAKE2B 139ecbaa266c6fe37441b3e0dd05692dc9eff8301339b7ed358ff32e17c6a1a14cd52b2cf22f141381bcf76d5e9dd579575d204e5a3c1c3793b49ced61b090af SHA512 ecaa9b97ffb2302a7f356e53393f185b70b83563052066d4dd70ad7b725a9963c46b582e1a438f36d517cc52e0ff56316ea8be6c92b54fcdda1726776845f46f diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild index 1c8af8b6ba6c..6d14e5f8e931 100644 --- a/games-strategy/widelands/widelands-1.0.ebuild +++ b/games-strategy/widelands/widelands-1.0.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=7 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/widelands/widelands.git" else SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB" |