diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /games-strategy/0ad | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'games-strategy/0ad')
| -rw-r--r-- | games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild (renamed from games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild) | 28 | ||||
| -rw-r--r-- | games-strategy/0ad/Manifest | 2 |
2 files changed, 24 insertions, 6 deletions
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild index aff130d91e0c..a138651fac27 100644 --- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild +++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild @@ -36,7 +36,6 @@ RESTRICT="test" BDEPEND="virtual/pkgconfig test? ( dev-lang/perl )" DEPEND=" - >=dev-lang/spidermonkey-78.6:78 dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= @@ -78,14 +77,11 @@ pkg_setup() { src_prepare() { default - # Delete check for minor version of dev-lang/spidermonkey. - sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i source/scriptinterface/ScriptTypes.h || die + sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die } src_configure() { local myconf=( - --with-system-mozjs - --with-system-nvtt --minimal-flags $(usex nvtt "" "--without-nvtt") $(usex pch "" "--without-pch") @@ -124,9 +120,31 @@ src_compile() { tc-export AR # build 3rd party fcollada + einfo "Building bundled fcollada" emake -C libraries/source/fcollada/src + # build bundled nvtt + # nvtt is abandoned upstream and 0ad have 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)" + ./build.sh || die "Failed to build bundled nvtt" + cd "${S}" || die + fi + + # build bundled spidermonkey + # We genuinely 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" ./build.sh || die "Failed to build bundled SpiderMonkey" + cd "${S}" || die + # build 0ad + elog "Building 0ad" emake -C build/workspaces/gcc verbose=1 } diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest index d0e11109c948..8ac093549bad 100644 --- a/games-strategy/0ad/Manifest +++ b/games-strategy/0ad/Manifest @@ -6,5 +6,5 @@ DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510 EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc EBUILD 0ad-0.0.23b_alpha.ebuild 3467 BLAKE2B 567338478f564ebc53a299e132d47188c4db5d9bdea314d55539442ce1ca256dd4df5e50b24997a54aaf0dd9c3542a06a826830bf98833c7a49a9d3e37207ce7 SHA512 5b8198f364b87faa96adf108e252ea5d55d1e06f459b6c0e45901c737bb1cd1ca8c6ec1f08cea5dade892dd27d6572caad29249aed2ca15a3e421afed046ab79 -EBUILD 0ad-0.0.24_alpha_pre20210116040036.ebuild 3717 BLAKE2B c53555161dd6cf2d457361ac1379312712646788b248c949203bfc62ea0c5c60980939373dadf636ecc4fec15dd0620e839a3727fb7ea0b8acb745ac47f8f2e6 SHA512 336d69aef36a3a4cb0103310bd7b285bb90c71c75aafae0339b2f9b1ca4577571b75079f6e7d4c67ec3685b33a495f21c437592cdf272d1fcdedf09c09ee9504 +EBUILD 0ad-0.0.24_alpha_pre20210116040036-r1.ebuild 4263 BLAKE2B e4b252da916bd111bea329ebc9be7ac6f223f2f29a7caa6f74c63c56e68d602e54956b97e1496d5a41618ec6fe9d290d8ea917d4b81c013145f81ab44e634819 SHA512 52212dbe220e95b4634a4c0bcf4cc02a17254d836a4af43e0d76829e6eac3ce1fbaee30f64b41d8e4152e4a47bf5cf5a220ae6a6b8f0187044aec5765ec70b87 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343 |