commit: c2cef4cc899a7188b69f634220592f31cd9a9787 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Dec 1 14:07:35 2019 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Dec 2 21:13:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cef4cc
games-simulation/openrct2: updated live ebuild Live ebuild now equals to latest version bump changes. Also dropped some patches, as these were merged by upstream. Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> games-simulation/openrct2/Manifest | 1 - games-simulation/openrct2/openrct2-9999.ebuild | 187 ++++++++++++++++--------- 2 files changed, 118 insertions(+), 70 deletions(-) diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index 3aaf0c0b9cf..6b447756bce 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -2,7 +2,6 @@ DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4 DIST openrct2-0.2.4.tar.gz 6805976 BLAKE2B 7860746d1705804682756097ff37d4584d0ebb20c450c08b88134795e9f3c375dfb888a67302f530cd55700eaa5cd13149c365c30a5d267d382b39225f06d210 SHA512 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03 DIST openrct2-objects-1.0.12.zip 2173875 BLAKE2B d344dde3dc376004b9e303a489c058a574c2f8babcce8c9998ef12f2b91e3fe7d3e22e1afc81aadd39637f3f91a5d36c4267aed06980686fd909cc515f4c8fde SHA512 d17d2197b66d22e33a246651a0c544a49a6d6a809612d26a851dc4b40bb9e1bf5079bbe5b1a3b7d41f541fc41ce41717d772a5579aa2cdc9ec1dfea72b5a3144 DIST openrct2-objects-v1.0.7.zip 2164242 BLAKE2B 003baf3400c52e3b2efdc208f6c64a45f7c9274aca3b729856a60fc1e72c8b6440b663d3fd791ebde7412df9920095367763bcad58257534b32c222d97976dcb SHA512 8e77adae59062582a22be69e81d144477482148c839abbea76e6bbbc65ca6426a8354bd4726176702a41684f01a62c5bddc0f6c2c6e42fa91c88815879c91fe5 -DIST openrct2-objects-v1.0.8.zip 2167920 BLAKE2B 551fd825a0bfb6bd2fce8a34aab393ea91f815508f51523a3839a3d2054afe96efac09976f1defd046be55fa14806b05c9cd5a9484d7e3ce1a86c54335a0741a SHA512 29e60a2d72e0c7774993e9d70aeb1c931b359e35776049a1baafd2d0bdfc56c1374e577e43f596c31ee146bd38b87eeeb8acc3ea03fdd9c9bc3be08436b7aa6a DIST openrct2-replays-0.0.4.zip 1098833 BLAKE2B efe4f72b16285d8e6508313f16b892b02f1b124cf9b4d146731280f5090d071d3351834e6d4ab51122804fbbcb49044be4e681182141aac93795c3b1953b6590 SHA512 5c2469bfdaa94a6007f6788878f4e80d87fbbfd48b522e1bd2a22c2aa0c98583159b9559fd45f7f9450d544a99a59b6c17399d9ac91a171a86135f0e1a5b3e71 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild index cb037d692f2..80ce2ffbfd6 100644 --- a/games-simulation/openrct2/openrct2-9999.ebuild +++ b/games-simulation/openrct2/openrct2-9999.ebuild @@ -1,113 +1,162 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake-utils git-r3 readme.gentoo-r1 xdg-utils -DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2" +EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"; +EGIT_BRANCH="develop" + +MY_PN="OpenRCT2" +MY_PN_OBJ="objects" +MY_PN_RPL="replays" +MY_PN_TS="title-sequences" +MY_PV_OBJ="1.0.12" +MY_PV_RPL="0.0.4" +MY_PV_TS="0.1.2c" + +DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" HOMEPAGE="https://openrct2.org/"; -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"; - EGIT_BRANCH="develop" - inherit git-r3 - SRC_URI="" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/OpenRCT2-${PV}" -fi - -TSV="0.1.2" -OBJV="1.0.8" -SRC_URI+=" - https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip - -> ${PN}-title-sequence-v${TSV}.zip - https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip - -> ${PN}-objects-v${OBJV}.zip" +SRC_URI=" + 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" -IUSE="libressl +multiplayer opengl test truetype +twitch" +KEYWORDS="" +IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" -RDEPEND=" - >=dev-libs/jansson-2.5 - >=dev-libs/libzip-1.0 +COMMON_DEPEND=" + dev-libs/icu:= + dev-libs/jansson + dev-libs/libzip:= media-libs/libpng:0= - media-libs/libsdl2 - media-libs/speexdsp - multiplayer? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + sys-libs/zlib + !dedicated? ( + media-libs/libsdl2 + media-libs/speexdsp + opengl? ( virtual/opengl ) + twitch? ( + net-misc/curl[ssl] + ) ) - opengl? ( virtual/opengl ) + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) truetype? ( - media-libs/sdl2-ttf - media-libs/fontconfig + media-libs/fontconfig:1.0 + media-libs/freetype:2 ) - twitch? ( net-misc/curl[ssl] ) " -DEPEND="${RDEPEND} - app-arch/unzip + +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 )" + +PATCHES=( + "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" +) + src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.gz - fi + git-r3_src_unpack - mkdir -p "${S}/data/title" || die - pushd "${S}/data/title" || die - unpack ${PN}-title-sequence-v${TSV}.zip - popd || die + 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 - pushd "${S}/data/object" || die - unpack ${PN}-objects-v${OBJV}.zip - popd || die + 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() { - sed -i CMakeLists.txt -e 's/-Werror//' || die - 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=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DDISABLE_HTTP_TWITCH="$(usex !twitch)" - -DDISABLE_NETWORK="$(usex !multiplayer)" - -DDISABLE_OPENGL="$(usex !opengl)" - -DDISABLE_TTF="$(usex !truetype)" - -DWITH_TESTS="$(usex test)" - -DDOWNLOAD_TITLE_SEQUENCES=OFF + -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 - -DBUILD_SHARED_LIBS=ON + -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 ) - use test && mycmakeargs+=( -DSYSTEM_GTEST=ON ) cmake-utils_src_configure } -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "" - ewarn "You need the original RollerCoaster Tycoon 2 files to play this game." - ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"; - ewarn "" +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 - gnome2_icon_cache_update + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update } pkg_postrm() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update }
