From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- games-simulation/Manifest.gz | Bin 3753 -> 3750 bytes games-simulation/flightgear/Manifest | 3 +- .../files/flightgear-2020.1.2-boost.patch | 11 ++ .../flightgear/flightgear-2020.1.2.ebuild | 1 + games-simulation/openrct2/Manifest | 6 +- games-simulation/openrct2/metadata.xml | 1 - games-simulation/openrct2/openrct2-0.2.6.ebuild | 163 --------------------- 7 files changed, 15 insertions(+), 170 deletions(-) create mode 100644 games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch delete mode 100644 games-simulation/openrct2/openrct2-0.2.6.ebuild (limited to 'games-simulation') diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz index 9d7a28bc57ec..36b8a71b9016 100644 Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index c0fefdbc0472..6566319f54c2 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1,7 +1,8 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da +AUX flightgear-2020.1.2-boost.patch 302 BLAKE2B 8abe7fc003ec905ed15983ab68672235ffd5f69a411ad4dd62f2f02dea9a72144d4e807e770fee6108bee865f5020da7e21c1b4a683a197e7f18072932347dfb SHA512 62ff4c8b77ea006ea881e8ff1b691a0f67c564859db52ab213ae833d41ae1fb71b73982a5ccc3ff0aa8d37b57679c70cae6521200b0432489471c151769b9538 AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c -EBUILD flightgear-2020.1.2.ebuild 4411 BLAKE2B 84df38dd2b90a49fdb7f1b1f4db63ca3e81487a983ea41e81f9d703268fc3ddc190c04dc823873035a3e0c20fd2e7eb1531a3cb793523e28e8fe451e41bb0659 SHA512 aeeb4695c6b2fe85306680edfcc2034748b307752ca2307b8ffd144554a25ba1168f1940b04f4af743e715ed4aec7742183a8c8a4041706dd64fa3dd1f38c540 +EBUILD flightgear-2020.1.2.ebuild 4443 BLAKE2B d324ee1b454a441d169e65b3747ce8051cc1d7243a18f8b0b0786bd1df862b183b2a580313ac514fedf59bd4113d783dcf11dc7e1b956cbc3d18b20489957bdb SHA512 d15a09aa298f034a71299eca91d0066cf9a806ca054b9857de35c564416ae4b93b5f150f30b9c6d79da8c6f0273305b731f11415dbf25fe8cf545e5b26734d3b EBUILD flightgear-9999.ebuild 4461 BLAKE2B d66adce51f48fc462dadd2fe069d6b0696490614518f5d258c180f38546a103f7ee1df7df68f6b76612d072c6d4d04a4817edccbd5e8f54104d816dd2fcd981b SHA512 86fbff4a29c5a830b8178aa1501f70a3dc68f344fb0e62bfbce234be901a61d4e11b99351f1ed34b664c66e7032bb8903dded07bb08ee9fcb007363a7504b522 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943 diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch new file mode 100644 index 000000000000..43e2a7d0cb13 --- /dev/null +++ b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -515,7 +515,7 @@ + set(NOMINMAX 1) + endif(WIN32) + +-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION") ++set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG") + + # append the SIMD flags if requested + if (ENABLE_SIMD) diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild index 3a428d9e25ad..5ea0ecfd8591 100644 --- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild +++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild @@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-2020.1.2-cmake.patch" + "${FILESDIR}/${P}-boost.patch" ) DOCS=(AUTHORS ChangeLog NEWS README Thanks) diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index 4fe787fa4b24..fdcdbbaaae31 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -3,14 +3,10 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409 -DIST openrct2-0.2.6.tar.gz 11094308 BLAKE2B 4aed899fee4735a0237558c1c34f67f37ecc9b8138f8a66314a9abc013cf10ad3a9f80fd5159afc5860ded780d4c705fd9e394b38f981aac90c8cee883356996 SHA512 abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24 DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317 -DIST openrct2-objects-1.0.14.zip 2237331 BLAKE2B 39a0c92674abc0d16fc3dd463b68e2ee8f3f7dd1c2a944d5448173ca58e6c3c4a79092a40e66ac8e919f75be2d2d691a76dc046e41caf7237138815a4e6ad526 SHA512 66e7a55ca894f2ea11af1c6300f934ef00f659137dded06f54bf749f490ff6063f95da800ae3cbfbbffe1c3e7d995e307d1281d57e4454ded6fed5affde84f8e DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5 DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a -DIST openrct2-replays-0.0.9.zip 1817119 BLAKE2B 3c63a0acf991487e667ae43ac987b8ee936ce77ad4eb75209d09e41f85b72550856c84d93bdbee1541a994ffbf9bc956b5366d77d760ebd7ed1dab0dffbf7885 SHA512 8066a664c12df047e64b9a049e39da6a4e366adfc60824a7a6c33e526c3a5a9afbc05d1dd11ff81eddbec0783445275d2be8cbe8141031fbeaefe8ea95cd1a7b DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e -EBUILD openrct2-0.2.6.ebuild 3808 BLAKE2B 0e6f14d6e194d58d0247218158492ac5e4694c5c13187706845ed04ccd6bb2f02a7937463ddeba8c68561a5faf0d6936b722e92860a0081654a40e104fa30e87 SHA512 69c87253337dea795269486d7be95ba364508d3f7bebb915ac7193e894e567218f4c2163f73a1ea441d2cd7110e44caf1fc2e828649d1f4128c812942e6a56d2 EBUILD openrct2-0.3.0.ebuild 3937 BLAKE2B 7faff348ee62eae118db29824537a27eb326de846b71b848e573a46bae81bf1d9fc72204b74451eee9ed9f7e025acde11f85795732d0a7594bc3b0ca0a7536b1 SHA512 d4f0eac48b8b96a473477bf6f2e433467b9c99dce2ad7ea25ca91f08f5471edc72b2ac009d6e2376f088e6e9d8d69b89dbbefd1d27fea44b84446b4b48f53e0e EBUILD openrct2-9999.ebuild 3899 BLAKE2B 227af822417f2961bda6e7eca0b2b90e3344b5addefc9e4245262c72fd322ae558b6f0d1ef8f3d6e1df7f6d810a250f4e9056cea9a7aecfeccb9079253942c71 SHA512 f9776de8b7c109549869a51e953d0d20bd1cc01746ec1047c7b0d4eaeeeefe8cf78669fa3f4b5214089b2a72867e9cd7e440ef487222fa68f6c9282d34a8d1d9 -MISC metadata.xml 1351 BLAKE2B 6ca9cf2f5109ad0af23bed39cfedcd77901a342ed4c5e85c79609f80a85792d8f203cabf96ceee46ba7aea47fad4c4713b38cd3712a2c2b820df3aca29ebf406 SHA512 5f0492cc2b92e4593398175db7d3604e2edaadfac95f8759341fbcd9b893025c18cd7666f9fe5c32d7c28900c1ee604858cd8d23a5863986fec853e23d47bc02 +MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830 diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml index 533b34deeec8..e3926e076550 100644 --- a/games-simulation/openrct2/metadata.xml +++ b/games-simulation/openrct2/metadata.xml @@ -17,7 +17,6 @@ Enables LightFX for better lightning effects. Enable the dev-lang/duktape scripting engine for executing user scripts. - Enables streaming of ingame content to Twitch. https://github.com/OpenRCT2/OpenRCT2/issues diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild deleted file mode 100644 index 856708edc6e4..000000000000 --- a/games-simulation/openrct2/openrct2-0.2.6.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils readme.gentoo-r1 xdg-utils - -MY_PN="OpenRCT2" -MY_PN_OBJ="objects" -MY_PN_RPL="replays" -MY_PN_TS="title-sequences" -MY_PV_OBJ="1.0.14" -MY_PV_RPL="0.0.9" -MY_PV_TS="0.1.2c" - -DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" -HOMEPAGE="https://openrct2.org/" -SRC_URI=" - https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip - https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip - test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip ) -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" - -COMMON_DEPEND=" - dev-libs/icu:= - dev-libs/jansson - dev-libs/libzip:= - media-libs/libpng:0= - sys-libs/zlib - !dedicated? ( - media-libs/libsdl2 - media-libs/speexdsp - opengl? ( virtual/opengl ) - twitch? ( - net-misc/curl[ssl] - ) - ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - truetype? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - dedicated? ( - acct-group/openrct2 - acct-user/openrct2 - ) -" - -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" - -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" - "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" -) - -src_unpack() { - unpack "${P}".tar.gz - - mkdir -p "${S}"/data/title || die - cd "${S}"/data/title || die - unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip - - mkdir -p "${S}"/data/object || die - cd "${S}"/data/object || die - unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip - - if use test; then - mkdir -p "${S}"/testdata/replays || die - cd "${S}"/testdata/replays || die - unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip - fi -} - -src_prepare() { - cmake-utils_src_prepare - - # Don't treat warnings as errors. - sed -e 's/-Werror//' -i CMakeLists.txt || die -} - -src_configure() { - # Note: There is currently no support for Disord-RPC and Google Benchmark, - # as both packages do not exist in Gentoo, so support for them has been disabled. - local mycmakeargs=( - -DDISABLE_DISCORD_RPC=ON - -DDISABLE_GOOGLE_BENCHMARK=ON - -DDISABLE_GUI=$(usex dedicated) - -DDISABLE_HTTP_TWITCH=$(usex !twitch) - -DDISABLE_NETWORK=OFF - $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") - -DDISABLE_TTF=$(usex !truetype) - -DDOWNLOAD_OBJECTS=OFF - -DDOWNLOAD_REPLAYS=OFF - -DDOWNLOAD_TITLE_SEQUENCES=OFF - -DENABLE_LIGHTFX=$(usex lightfx) - -DPORTABLE=OFF - -DSTATIC=OFF - $(usex test "-DSYSTEM_GTEST=ON" "") - -DWITH_TESTS=$(usex test) - -DUSE_MMAP=ON - ) - - cmake-utils_src_configure -} - -src_test() { - # Since the tests need the OpenRCT2 data, - # we need to symlink them into the build directory, - # otherwise some tests will fail, as they don't find the OpenRCT2 data. - # It is currently not possible to override that path. - # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473 - ln -s "${S}"/data "${BUILD_DIR}" || die - - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - if use dedicated; then - newinitd "${FILESDIR}"/openrct2.initd openrct2 - newconfd "${FILESDIR}"/openrct2.confd openrct2 - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} -- cgit v1.2.3