commit: d50590868cc28d85cdc5dcb1e190fd0b10301bd6 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Tue Aug 11 18:20:47 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Aug 11 18:30:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5059086
games-simulation/openrct2: drop old version Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> games-simulation/openrct2/Manifest | 3 - ...isable-desktop-and-icon-files-without-gui.patch | 52 ------- .../openrct2-0.2.4-disable-optional-features.patch | 87 ----------- games-simulation/openrct2/openrct2-0.2.4.ebuild | 164 --------------------- 4 files changed, 306 deletions(-) diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index c1149fc8327..c28aeeed2f6 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -1,8 +1,5 @@ -DIST openrct2-0.2.4.tar.gz 6805976 BLAKE2B 7860746d1705804682756097ff37d4584d0ebb20c450c08b88134795e9f3c375dfb888a67302f530cd55700eaa5cd13149c365c30a5d267d382b39225f06d210 SHA512 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03 DIST openrct2-0.2.6.tar.gz 11094308 BLAKE2B 4aed899fee4735a0237558c1c34f67f37ecc9b8138f8a66314a9abc013cf10ad3a9f80fd5159afc5860ded780d4c705fd9e394b38f981aac90c8cee883356996 SHA512 abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24 -DIST openrct2-objects-1.0.12.zip 2173875 BLAKE2B d344dde3dc376004b9e303a489c058a574c2f8babcce8c9998ef12f2b91e3fe7d3e22e1afc81aadd39637f3f91a5d36c4267aed06980686fd909cc515f4c8fde SHA512 d17d2197b66d22e33a246651a0c544a49a6d6a809612d26a851dc4b40bb9e1bf5079bbe5b1a3b7d41f541fc41ce41717d772a5579aa2cdc9ec1dfea72b5a3144 DIST openrct2-objects-1.0.14.zip 2237331 BLAKE2B 39a0c92674abc0d16fc3dd463b68e2ee8f3f7dd1c2a944d5448173ca58e6c3c4a79092a40e66ac8e919f75be2d2d691a76dc046e41caf7237138815a4e6ad526 SHA512 66e7a55ca894f2ea11af1c6300f934ef00f659137dded06f54bf749f490ff6063f95da800ae3cbfbbffe1c3e7d995e307d1281d57e4454ded6fed5affde84f8e DIST openrct2-replays-0.0.12.zip 1817941 BLAKE2B e000b005289db12b611c901e83ed785baefcee9eb34b2195f2b9679db9ff4d7c62b7b4fca072e90e464f1ecdbba685395a79889b366e04f7d28e257ecd8571a3 SHA512 d2136bbaf4f42decedcdd2f3546ffb80c93078b52325c5db80e86bfaf87548503ea941f511f905727a046d927464680f3bee3c9ec646ff286050be1ac31c7948 -DIST openrct2-replays-0.0.4.zip 1098833 BLAKE2B efe4f72b16285d8e6508313f16b892b02f1b124cf9b4d146731280f5090d071d3351834e6d4ab51122804fbbcb49044be4e681182141aac93795c3b1953b6590 SHA512 5c2469bfdaa94a6007f6788878f4e80d87fbbfd48b522e1bd2a22c2aa0c98583159b9559fd45f7f9450d544a99a59b6c17399d9ac91a171a86135f0e1a5b3e71 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 diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch b/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch deleted file mode 100644 index cddbe7a93a3..00000000000 --- a/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9df66b1f1f56427d896263728c84009c8c3b842b Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <con...@kostecki.com> -Date: Sun, 10 Nov 2019 20:05:51 +0100 -Subject: [PATCH] CMakeLists.txt: don't install desktop and icon files without - GUI (#10206) - -If OpenRCT2 is compiled without GUI (for example as a dedicated server), -it does not make sense to install the desktop and icon files. - -Signed-off-by: Conrad Kostecki <con...@kostecki.com> ---- - CMakeLists.txt | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dda401bbdd..f6e4683c9b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,18 +319,20 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "${CMAKE_INSTALL_ - install(DIRECTORY "data/" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2") - install(FILES ${DOC_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}") - install(FILES "distribution/linux/openrct2.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") --install(FILES "resources/logo/icon_x16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x24.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x96.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_flag.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "openrct2.svg") --install(FILES "distribution/linux/openrct2.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-savegame.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-scenario.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-uri.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+if (NOT DISABLE_GUI) -+ install(FILES "resources/logo/icon_x16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x24.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x96.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_flag.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "openrct2.svg") -+ install(FILES "distribution/linux/openrct2.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-savegame.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-scenario.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-uri.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+endif() - install(FILES "distribution/linux/openrct2-mimeinfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/" RENAME "openrct2.xml") - install(DIRECTORY "distribution/man/" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" FILES_MATCHING PATTERN "*.6") diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch b/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch deleted file mode 100644 index 03d6496bf3e..00000000000 --- a/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch +++ /dev/null @@ -1,87 +0,0 @@ -From fef1906d0d7050b1dfa3792f6e8d3a9b9632df68 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad+git...@kostecki.com> -Date: Sat, 9 Nov 2019 21:20:16 +0100 -Subject: [PATCH] CMakeLists.txt: make discord-rpc and google benchmark - optional (#10208) - -For a package maintainer, it should be possible to disable the support -for discord-rpc and google benchmark, as it currently always includes them, -when the library if found. ---- - CMakeLists.txt | 26 +++++++++++++++----------- - src/openrct2/CMakeLists.txt | 18 ++++++++++-------- - 2 files changed, 25 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea4bdfd8221..7dda401bbdd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,8 @@ CMAKE_DEPENDENT_OPTION(DOWNLOAD_REPLAYS "Download replays during installation." - option(STATIC "Create a static build.") - option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.") - -+option(DISABLE_DISCORD_RPC "Disable Discord-RPC support." OFF) -+option(DISABLE_GOOGLE_BENCHMARK "Disable Google Benchmarks support." OFF) - option(DISABLE_HTTP_TWITCH "Disable HTTP and Twitch support.") - option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.") - option(DISABLE_TTF "Disable support for TTF provided by freetype2.") -@@ -125,17 +127,19 @@ if (CXX_WARN_SUGGEST_FINAL_METHODS) - add_definitions(-D__WARN_SUGGEST_FINAL_METHODS__) - endif () - --if(EXISTS "${ROOT_DIR}/discord-rpc") -- # Don't build discord's examples, some of which are in C and do not honour -- # the flags we set for C++. Also we don't use the provided examples. -- set(BUILD_EXAMPLES OFF CACHE BOOL "Build example apps") -- add_subdirectory("${ROOT_DIR}/discord-rpc") -- add_definitions(-D__ENABLE_DISCORD__) -- include_directories("${ROOT_DIR}/discord-rpc/include") -- set(HAVE_DISCORD_RPC TRUE) -- message("Building with discord-rpc support") --else() -- message("No discord-rpc detected, to enable clone discord-rpc to root directory: ${ROOT_DIR}") -+if (NOT DISABLE_DISCORD_RPC) -+ if(EXISTS "${ROOT_DIR}/discord-rpc") -+ # Don't build discord's examples, some of which are in C and do not honour -+ # the flags we set for C++. Also we don't use the provided examples. -+ set(BUILD_EXAMPLES OFF CACHE BOOL "Build example apps") -+ add_subdirectory("${ROOT_DIR}/discord-rpc") -+ add_definitions(-D__ENABLE_DISCORD__) -+ include_directories("${ROOT_DIR}/discord-rpc/include") -+ set(HAVE_DISCORD_RPC TRUE) -+ message("Building with discord-rpc support") -+ else() -+ message("No discord-rpc detected, to enable clone discord-rpc to root directory: ${ROOT_DIR}") -+ endif() - endif() - - # Copied from https://github.com/opencv/opencv/blob/dcdd6af5a856826fe62c95322145731e702e54c5/cmake/OpenCVDetectCXXCompiler.cmake#L63-L70 -diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt -index 61be3d13c2a..97674911c0c 100644 ---- a/src/openrct2/CMakeLists.txt -+++ b/src/openrct2/CMakeLists.txt -@@ -73,14 +73,16 @@ if (NOT DISABLE_TTF) - endif () - endif () - --find_package(benchmark 1.4 QUIET) --if (benchmark_FOUND) -- message("Found Google benchmark, enabling support") -- set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS USE_BENCHMARK) -- target_link_libraries(${PROJECT_NAME} benchmark::benchmark) -- target_include_directories(${PROJECT_NAME} PRIVATE ${benchmark_INCLUDE_DIRS}) --else () -- message("Google benchmark not found, disabling support") -+if (NOT DISABLE_GOOGLE_BENCHMARK) -+ find_package(benchmark 1.4 QUIET) -+ if (benchmark_FOUND) -+ message("Found Google benchmark, enabling support") -+ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS USE_BENCHMARK) -+ target_link_libraries(${PROJECT_NAME} benchmark::benchmark) -+ target_include_directories(${PROJECT_NAME} PRIVATE ${benchmark_INCLUDE_DIRS}) -+ else () -+ message("Google benchmark not found, disabling support") -+ endif () - endif () - - # Third party libraries diff --git a/games-simulation/openrct2/openrct2-0.2.4.ebuild b/games-simulation/openrct2/openrct2-0.2.4.ebuild deleted file mode 100644 index 3d69a53c77e..00000000000 --- a/games-simulation/openrct2/openrct2-0.2.4.ebuild +++ /dev/null @@ -1,164 +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.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/" -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 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-disable-desktop-and-icon-files-without-gui.patch" - "${FILESDIR}/${PN}-0.2.4-disable-optional-features.patch" - "${FILESDIR}/${PN}-0.2.4-include-additional-paths.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 -}