public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2020-08-11 18:30 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2020-08-11 18:30 UTC (permalink / raw
  To: gentoo-commits

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 <conrad@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 <conrad@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+github@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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2024-11-23 23:36 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2024-11-23 23:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4c105e0798a1ab3e05ffae08808ff59d4478ec31
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 23:49:20 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 23:32:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c105e07

games-simulation/openrct2: drop 0.4.14, 0.4.15

Closes: https://bugs.gentoo.org/939754
Closes: https://bugs.gentoo.org/936050
Closes: https://bugs.gentoo.org/941519
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   7 -
 .../openrct2-0.4.0-include-additional-paths.patch  |  18 ---
 .../openrct2-0.4.15-include-additional-paths.patch |  17 --
 games-simulation/openrct2/openrct2-0.4.14.ebuild   | 180 ---------------------
 games-simulation/openrct2/openrct2-0.4.15.ebuild   | 180 ---------------------
 5 files changed, 402 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index b7d31b84610f..02057dfe994a 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,13 +1,6 @@
-DIST openrct2-0.4.14.tar.gz 21917635 BLAKE2B 0fc5a105a416a1a9634ca90542c5234e19da534f07554c1f278b75a1209158d3783cfd69fad1e492140788f9cf3716f5e943391c7787015ae038ccaf7da8765d SHA512 11eaec800aee9667d1a9d5f255f556572221b5f2190740d16c847e23bb1feb75fcb3876c4078ca069517eda72a27fb22f5c6fb91458bdf66dfe1f8ab51bd4e07
-DIST openrct2-0.4.15.tar.gz 22045224 BLAKE2B dd0faca7bc4a8d2b5b7b82a087520c6b2a2351481b04c7a2f69e65546428772757df7fd241e8c42adf75eed5f2f94e50d57bbffa6a96e6b50268c1d6fd93045e SHA512 c9dd483993e53addb40097bab87e040bca4f87b8708118ccf4f9aa91a645ee9805f3ceed0cedc4f08b2ea7eb172a3ceac63a1df5f123b40a44cca548b86269af
 DIST openrct2-0.4.16.tar.gz 22266650 BLAKE2B 19efa7f08d2f1b82dc3643d6627a1e4758dd679c44d6f49992969b1e75dd5edfe2ab4fce7652dfebcc2e1574a6a404fa2abbf4dc281fb36a26c25ec40024ccc5 SHA512 523ecb6c1358b7d2ee51e862b96fd72215ba5151b888af2878baec099492e097c3d7a99525041e803c5f647eb97c9082751ccf97a468fb7e071d050a9c5fa4c7
 DIST openrct2-objects-1.4.10.zip 7495378 BLAKE2B d59f17a419abc935c781075d526ba5e8d6c90d5a524fd314a8c9da3cbd211f87340d615f3a9fe292e2b28cc260734ed344cf2da1e8c76e7310076c2ad163adb0 SHA512 a137a81f6c627ac5d7222c34009d92a24e65bea9b8e0108e59fdf393f1000caee99b9dc9947f824241c055796112d11609b1bcae50ddc33f419723a06b708f64
-DIST openrct2-objects-1.4.7.zip 5411765 BLAKE2B 0ac59fbee6d22f832f52f03ad6e4e15bd60ba1955fc7a8f9deaf8fd114483cfdf20cd8ced42494716bf7a1d8dbeb7969cb1fa3852ae11e9afb0819c90ae6d389 SHA512 54f6872502333dc4063d0eca6d9e2cb6f7e6c7593be014a3c17df3b9a6dfa354b50c995953fb56973db8cef3733eedb3b64e680fe136724328156c1c590d9ae7
-DIST openrct2-objects-1.4.8.zip 5415469 BLAKE2B 685b2c0493fb367c0eb2087b486cc76b3ff86d6a6400812f13041b2298d63f881760aa6fe538ceea775b7a72b8997a1fbd2611152436057b9d749105e539cae1 SHA512 b25fbb751a8b0ee63aa76fc8559192bc32531019c4c03a27c638cf35be54b5f491c45372b1db94187b6865d0adbf0e29248d43d6b26fde7b829a7138d01d09c6
-DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
 DIST openrct2-openmusic-1.6.zip 42921141 BLAKE2B fff3ac6d944ed2021645c064de3daf88c11930bf8817e9c8620cfa73f2da076745dd5b5da36b616c8ee7b2ee0272228a88e264bf1ce948509dc90d77a7a87d5d SHA512 88e3242da45f372e06de04e58d03fc3d256b1485467a25a3f8878c03eb2570eea2c787a9e0416c1b040c15886723ced1379d762f941a23e4bd2fce81416123b0
 DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f03971b8a1d6f4280d008d5bf3e86b5d2cb46001a04edddeeb04a06a37801c3afbd35926beb54fe5a72c7fa88b50d0a0b18535 SHA512 fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a
-DIST openrct2-replays-0.0.79.zip 1934633 BLAKE2B 4b5c4d96be91055ceff8f5f5f1a894cc2544659983e61ac2f42d655229357b6a368553c1ee45d147cb360c8d54bb0ca78b61a9716efa8d1d7f37cd7c5ba50fa7 SHA512 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2
-DIST openrct2-replays-0.0.80.zip 1830711 BLAKE2B b21d658e9e3423fc4cce4a688205660530b576243cb4fefdcbeaa6312e5979052182a51ed9418339c6fcacb6e4c78dfdb617db1934ca51950ea4f89927220f8e SHA512 a6019773e0178d3fa6968f04a5880c27e92cdd270355ddb5b9616b7a9f793a0cb09c246a82d3dd2f6bbf9f2f354a903a9bc4344fafb68532d695513ace7c6922
 DIST openrct2-replays-0.0.83.zip 1829681 BLAKE2B fd3a6ff457d45b0b429b667173c95753bdbf9ecd136a7ce16b516c701d88e436e1796c32d1aa5dc7837dd35ea8db5a89a2c42a99dcd5744b826ab32f98030f98 SHA512 43877cd8452049d4519f0d3fd49d9234195a3d3e38af9a880d43509f0a578e1fef0d428673fea1a9a8307d9917be3e3c4ca9d9e466584b6abd5193a366d5f569
 DIST openrct2-title-sequences-0.4.14.zip 7791573 BLAKE2B e0bc547b26ba0032c54be0661a1e26bf63a73e3bf0183e3e3d972cbff80e95dd4fa2584852f0da6a597849d822b6d89c3154cbe5ecc99b7eb456560810ed8d17 SHA512 27a1f5e87063ed9baf5faeca15a914e1a57584da6ab0d06d2b9e1f08e801c53f2ea9826381bf5e3dd8e220ff2da601a98841a08f9bcad1e0280b04746512bfb1

diff --git a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
deleted file mode 100644
index b90d48c63c33..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/openrct2/config/Config.cpp
-+++ b/src/openrct2/config/Config.cpp
-@@ -638,6 +638,7 @@
-         log_verbose("config_find_rct1_path(...)");
- 
-         static constexpr u8string_view searchLocations[] = {
-+            R"(/usr/share/openrct2/rct1_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
-@@ -683,6 +684,7 @@
-         log_verbose("config_find_rct2_path(...)");
- 
-         static constexpr u8string_view searchLocations[] = {
-+            R"(/usr/share/openrct2/rct2_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",

diff --git a/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
deleted file mode 100644
index 16d306260e67..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/openrct2/platform/Platform.Linux.cpp
-+++ b/src/openrct2/platform/Platform.Linux.cpp
-@@ -335,12 +335,12 @@
- 
-     std::vector<std::string_view> GetSearchablePathsRCT1()
-     {
--        return {};
-+        return { "/usr/share/openrct2/rct1_data" };
-     }
- 
-     std::vector<std::string_view> GetSearchablePathsRCT2()
-     {
--        return {};
-+        return { "/usr/share/openrct2/rct2_data" };
-     }
- 
- #    ifndef NO_TTF

diff --git a/games-simulation/openrct2/openrct2-0.4.14.ebuild b/games-simulation/openrct2/openrct2-0.4.14.ebuild
deleted file mode 100644
index 267f84e957ac..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.14.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_MSX="openmusic"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_SFX="opensound"
-MY_PN_TS="title-sequences"
-MY_PV_MSX="1.5"
-MY_PV_OBJ="1.4.7"
-MY_PV_RPL="0.0.79"
-MY_PV_SFX="1.0.5"
-MY_PV_TS="0.4.14"
-
-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_MSX}/releases/download/v${MY_PV_MSX}/${MY_PN_MSX}.zip -> ${PN}-${MY_PN_MSX}-${MY_PV_MSX}.zip
-	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}/OpenSoundEffects/releases/download/v${MY_PV_SFX}/${MY_PN_SFX}.zip -> ${PN}-${MY_PN_SFX}-${MY_PV_SFX}.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 )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		flac? ( media-libs/flac:= )
-		opengl? ( virtual/opengl )
-		vorbis? ( media-libs/libvorbis )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data || die
-	cd "${S}"/data
-	unpack "${PN}-${MY_PN_MSX}-${MY_PV_MSX}".zip
-	unpack "${PN}-${MY_PN_SFX}-${MY_PV_SFX}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".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_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
-		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_IPO=ON
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_OPENMSX=OFF
-		-DDOWNLOAD_OPENSFX=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_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_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_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
-}

diff --git a/games-simulation/openrct2/openrct2-0.4.15.ebuild b/games-simulation/openrct2/openrct2-0.4.15.ebuild
deleted file mode 100644
index efb5b081135e..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.15.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_MSX="openmusic"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_SFX="opensound"
-MY_PN_TS="title-sequences"
-MY_PV_MSX="1.6"
-MY_PV_OBJ="1.4.8"
-MY_PV_RPL="0.0.80"
-MY_PV_SFX="1.0.5"
-MY_PV_TS="0.4.14"
-
-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_MSX}/releases/download/v${MY_PV_MSX}/${MY_PN_MSX}.zip -> ${PN}-${MY_PN_MSX}-${MY_PV_MSX}.zip
-	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}/OpenSoundEffects/releases/download/v${MY_PV_SFX}/${MY_PN_SFX}.zip -> ${PN}-${MY_PN_SFX}-${MY_PV_SFX}.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 )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		flac? ( media-libs/flac:= )
-		opengl? ( virtual/opengl )
-		vorbis? ( media-libs/libvorbis )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.4.15-include-additional-paths.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data || die
-	cd "${S}"/data
-	unpack "${PN}-${MY_PN_MSX}-${MY_PV_MSX}".zip
-	unpack "${PN}-${MY_PN_SFX}-${MY_PV_SFX}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".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_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
-		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_IPO=ON
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_OPENMSX=OFF
-		-DDOWNLOAD_OPENSFX=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_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_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2024-01-04 21:08 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2024-01-04 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ca9c069f8fa8b9d2d52db549f8116c2b12df1c6c
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 21:06:55 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 21:08:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9c069f

games-simulation/openrct2: fix musl build

Closes: https://bugs.gentoo.org/906989
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../openrct2/files/openrct2-0.4.7-musl.patch       | 55 ++++++++++++++++++++++
 games-simulation/openrct2/openrct2-0.4.7.ebuild    |  1 +
 2 files changed, 56 insertions(+)

diff --git a/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch b/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch
new file mode 100644
index 000000000000..1096bc018ff2
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch
@@ -0,0 +1,55 @@
+From 010c19ba61a3180dab6350aadc578414ad0c0051 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Mon, 1 Jan 2024 20:34:19 +0100
+Subject: [PATCH 1/2] src/openrct2/core/FileStream.cpp: drop ftello64, fseeko64
+
+The static usage definition of ftello64 and friends is not correct.
+While this currently works on glibc, this breaks on musl, as musl
+already is LFS aware. The solution is to drop this and add instead
+'-D_FILE_OFFSET_BITS=64' to the build system.
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ src/openrct2/core/FileStream.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/openrct2/core/FileStream.cpp b/src/openrct2/core/FileStream.cpp
+index 90a7f7a366cc..6fd7b7b1b42c 100644
+--- a/src/openrct2/core/FileStream.cpp
++++ b/src/openrct2/core/FileStream.cpp
+@@ -21,11 +21,6 @@
+ #    include <io.h>
+ #endif
+ 
+-#if defined(__linux__) && !defined(__ANDROID__)
+-#    define ftello ftello64
+-#    define fseeko fseeko64
+-#endif
+-
+ #ifdef _MSC_VER
+ #    define ftello _ftelli64
+ #    define fseeko _fseeki64
+
+From 7c638c786527a26a3e83d155ca8ff4d55f01347f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Mon, 1 Jan 2024 20:23:24 +0100
+Subject: [PATCH 2/2] CMakeLists.txt: add D_FILE_OFFSET_BITS=64
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ src/openrct2/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt
+index 367939c9622c..55882a1097d3 100644
+--- a/src/openrct2/CMakeLists.txt
++++ b/src/openrct2/CMakeLists.txt
+@@ -265,3 +265,7 @@ else ()
+     # Dummy target to ease invocation
+     add_custom_target(${PROJECT_NAME}-headers-check)
+ endif ()
++
++if (UNIX)
++    add_definitions(-D_FILE_OFFSET_BITS=64)
++endif ()

diff --git a/games-simulation/openrct2/openrct2-0.4.7.ebuild b/games-simulation/openrct2/openrct2-0.4.7.ebuild
index 46212d45c869..068fbd3cb2e5 100644
--- a/games-simulation/openrct2/openrct2-0.4.7.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.7.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.7-musl.patch"
 )
 
 src_unpack() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2024-01-01 17:56 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2024-01-01 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4fd7113ae8aa6c141f18424cca44bc98f81a6ee5
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 17:45:48 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 17:56:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd7113a

games-simulation/openrct2: drop 0.4.6

Closes: https://bugs.gentoo.org/921108
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   2 -
 .../openrct2/files/openrct2-0.4.6-gcc14.patch      |  30 ----
 games-simulation/openrct2/openrct2-0.4.6.ebuild    | 170 ---------------------
 3 files changed, 202 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index ee0fecc6b351..40b261d8439e 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,6 +1,4 @@
-DIST openrct2-0.4.6.tar.gz 21003990 BLAKE2B 910e03586249c6e1fb1320cc47034c121f74da847305a041f18e5d593d1f494a608508b69f5a2b7919a4353eff4ea7d1dc5a5f8236c8857eca8175da04f9ec33 SHA512 fd48983f231b71cce9c7f59af88a46e81c7dfd005c77ce3594a43dfac87fd9d88dd900e3137c8c2c3bdeda974392c94412d031923e2191b44e974db1e3922712
 DIST openrct2-0.4.7.tar.gz 21677290 BLAKE2B 934f26bd2117f4c5be1a20e5eff10a07a260a5f01d1df2f95f2a4b66adf603868e5ea33a88398857f35851575c38f28e6c98b7912ebe0cc3c97b745cbb280b02 SHA512 704007298d35b90cba592719649d066a2e8e546044f39ca0edddebd4c9e8e864ef8d1314e3bc5eaadf38fb2df54d9cb33ee9cb1cba3defd099aa34ea2a985a90
-DIST openrct2-objects-1.3.11.zip 4705861 BLAKE2B 10a0477fd8db9374b0e667a34ec3b0cedf6cb29fc9b602da845e33272e072c55cf5fd30b9340ec4b763a9f324c72d126290651c9eddef07013857a8228978566 SHA512 98ab374a4899f60f45d6c87a570298a5788ec8cf277b67cb6b54c2f68388a99f201705377406b883eac45a97edff3cf7736898ed0b97a290f3d999dad7c821b9
 DIST openrct2-objects-1.3.13.zip 4708920 BLAKE2B 16540805a0a9413de96837d23787ed47a84e570b2fa2480c89f4f9a644033c39ffa9167838c164511308942401fd054f2091362491a395c207bb3b779e7a740c SHA512 9e285cf922adb5b4d7c79f06cc7445e05bc755968099dc83fc62b411875bfe1e39a087559dc1730b44e78133f4c642da316fd94e7f0877189c59517e8bc1038f
 DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
 DIST openrct2-opensound-1.0.3.zip 3820122 BLAKE2B 74265800595e36ac943bf2ee5d9c8f6cb3bbd5be3713d9590cb81faac4a75154dfbf9806b1b55e9c2426c84e3cf313a6271fc378ebfd4fa94821683157be5470 SHA512 89784703fb2cda67b5440e06381b44e59ce4a42a88004761c76f0c2b23f78be3692e5fe5e2c8655943e04f7a45e479cfcbc2c3998202222dab16a092b9a73195

diff --git a/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch b/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
deleted file mode 100644
index 2c2c00fff5e7..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 11c46987aed7f8ef941140a171d55abc8cd8d0d5 Mon Sep 17 00:00:00 2001
-From: Kostadin <kocelfc@tutanota.com>
-Date: Thu, 16 Nov 2023 22:26:05 +0200
-Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 (#20981)
-
-With gcc 14 some C++ Standard Library headers have been changed to no
-longer include other headers that were used internally by the library.
-In OpenRCT2's case it is the <algorithm> header.
-
-Downstream Gentoo bug: https://bugs.gentoo.org/917016
-
-GCC 14 porting guide: https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes
-
-Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
----
- src/openrct2/core/FileWatcher.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp
-index 439be15859ed..3ce0309c8cc8 100644
---- a/src/openrct2/core/FileWatcher.cpp
-+++ b/src/openrct2/core/FileWatcher.cpp
-@@ -7,6 +7,7 @@
-  * OpenRCT2 is licensed under the GNU General Public License version 3.
-  *****************************************************************************/
- 
-+#include <algorithm>
- #include <array>
- #include <cstdio>
- #include <stdexcept>

diff --git a/games-simulation/openrct2/openrct2-0.4.6.ebuild b/games-simulation/openrct2/openrct2-0.4.6.ebuild
deleted file mode 100644
index 3049ac705a1b..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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.3.11"
-MY_PV_RPL="0.0.78"
-MY_PV_TS="0.4.6"
-
-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 )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		flac? ( media-libs/flac:= )
-		opengl? ( virtual/opengl )
-		vorbis? ( media-libs/libvorbis )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.4.6-gcc14.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || 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_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
-		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_IPO=ON
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_OPENMSX=OFF
-		-DDOWNLOAD_OPENSFX=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_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_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2023-04-02 21:12 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2023-04-02 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     cb715093871980f7f4f8d53fd22ac0be56fa45a4
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:57:56 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 21:12:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb715093

games-simulation/openrct2: add 0.4.4

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   2 +
 .../openrct2-0.4.4-dont-force-downloads.patch      |  15 ++
 games-simulation/openrct2/openrct2-0.4.4.ebuild    | 170 +++++++++++++++++++++
 3 files changed, 187 insertions(+)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index c0e0373fb202..af3c5e69248f 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,5 +1,7 @@
 DIST openrct2-0.4.3.tar.gz 16507904 BLAKE2B 37af2ff01f3ad143ab42dc37c95391480272637e163a8721878ac54b001ac49557d4100eaaafb21961ae6abab30b0f60c150bfba88205d2a77e4229e96e35424 SHA512 2c194e3d63340c61fd8caaf975e3b99a3a9f10aeb5f9ff0ca4f5556f07b2d4765583b0c63d1c77117cc003fcfb8403e8ee025758ff39027e9bd0992931eaa46c
+DIST openrct2-0.4.4.tar.gz 16554655 BLAKE2B f0770b7db82b9df5325e8740b5aa88889ac5354b07b271c824f9521ba02d0bc3eec395f216305d4737c8ad36a3096281d1a7ecb019a6514399b7d12dec0dd526 SHA512 8e969e08023a6232dfffa31593cfacedafdf5eb778d1c1471deb095b3d056006ea0c1b219c9042f9fe94118fcbde219580ba2fca29d70a042a016a7fde0abdc9
 DIST openrct2-objects-1.3.7.zip 4563769 BLAKE2B 5e8d88899d997b550df7b34ef6b2788e216861817b49f7c937127f97ec9ea8e02866e768f00e507ccf6310f7cbdce170decf021e1fddae88f219f370aee80f0c SHA512 b335cdb26a9fb20e25100c24409d3bf6c9e9de1bded79534bf8e62c198954ed6732a7524e261502e3e81941c8ba7b1e7cf9541ab121f448d5a8487bb28eb1b38
+DIST openrct2-objects-1.3.8.zip 4583315 BLAKE2B 84f104666671fe7b677390e0475fdd0b7a417ab52ece7e7b6ea8dcf5ec21cda5ffc95cf5fb989d3e8d2a353132580eacafbee3a5655c79e4528328fabc607af0 SHA512 e0ea72334195ce2d608b9a6e4102cda33271834d71783b6a0b0e408a41a6b240adb021f28ada8184ffd0720a9ee0bebbbd50635321c39c7f3229c51544b0bc9d
 DIST openrct2-objects-1.3.9.zip 4583285 BLAKE2B 90f200138254a3846913e94021fb6a19ad18590f940a814e61d848c64c9c5eb403476d759e1718ff1e1316ada1443c6a119695e8a66c51e2686f22f6e8efa8d7 SHA512 b671ee083e1317c4849f3a75009169d45102cc7a6241b5b9a079c896e8bce8bba63bd08cdd90b9aa562a18a8e023f954e411b096b21c9b112761a8b95bea69a6
 DIST openrct2-replays-0.0.70.zip 1479468 BLAKE2B 862eed6955124d5a5fbe289aee8cfaca2b4b13c680174b041d9e6f79cd02fb5b2cae42c8ae5d58493b1896824fdde75a138c071192be6f46463e0ffa293accbf SHA512 f874c931329cf78c8e4b438eed05c7340bfb920a9b0d6394165a22517543efe4f760f112579aca20e0576659f0103558083af975d9486dfbd307ad61506c811f
 DIST openrct2-replays-0.0.77.zip 2042154 BLAKE2B 38bce55f91f49a485d158a94b4ce553ffa606f652cd766b33acf299b86304ea0507b50441b2a9b1fb219b90a0dc2426eff5988c2b128a97e399b00c3392f10e0 SHA512 52e4a237b1e0be89422060e5c8f8d5a783ed81f1ccf6b205f0e73f8faf6eb9408dbddab31a411f6ad7554815e89b8c63329052aeafeb739bad06c9ac1b7d6a32

diff --git a/games-simulation/openrct2/files/openrct2-0.4.4-dont-force-downloads.patch b/games-simulation/openrct2/files/openrct2-0.4.4-dont-force-downloads.patch
new file mode 100644
index 000000000000..c92816997487
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.4-dont-force-downloads.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,12 +160,6 @@
+     endif ()
+ endif ()
+ 
+-# If OS is Linux, import OpenSoundEffects and OpenMusic
+-if(UNIX AND NOT APPLE)
+-    set(DOWNLOAD_OPENMSX ON)
+-    set(DOWNLOAD_OPENSFX ON)
+-endif()
+-
+ # LIST of supported flags, use SET_CHECK_CXX_FLAGS() to apply to target.
+ # Use ADD_CHECK_CXX_COMPILER_FLAG() to add to list.
+ set(SUPPORTED_CHECK_CXX_COMPILER_FLAGS "")

diff --git a/games-simulation/openrct2/openrct2-0.4.4.ebuild b/games-simulation/openrct2/openrct2-0.4.4.ebuild
new file mode 100644
index 000000000000..e78165775ba9
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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.3.8"
+MY_PV_RPL="0.0.77"
+MY_PV_TS="0.4.0"
+
+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 )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		flac? ( media-libs/flac:= )
+		opengl? ( virtual/opengl )
+		vorbis? ( media-libs/libvorbis )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.4-dont-force-downloads.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || 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_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
+		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_OPENMSX=OFF
+		-DDOWNLOAD_OPENSFX=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_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_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2022-10-02 17:31 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2022-10-02 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     66bc1ccc911aaa2056ee4cd899ea12be72c71608
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 17:10:01 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 17:30:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66bc1ccc

games-simulation/openrct2: drop 0.4.0

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   2 -
 .../openrct2/files/openrct2-0.2.6-gtest-1.10.patch |  20 ---
 games-simulation/openrct2/openrct2-0.4.0.ebuild    | 165 ---------------------
 3 files changed, 187 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 1958d324c2af..e12058f70edc 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,6 +1,4 @@
-DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
 DIST openrct2-0.4.1.tar.gz 14307739 BLAKE2B d50dd896128898725eb7bd347341dc23a5ef4e8c83d3334625f5484dc5d4214a6ba19981997291de3edb80baaf498e9b4fd83b460a2fd4fdc2100c080d3d0bb6 SHA512 795e94b025ebe8ce4386e59723e2442e950810652a1c95caa1e21a88bef5417c2cce18c93418788e75cd8e980ffda0dc73838693fbe2be108a4e269da9159f06
-DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
 DIST openrct2-objects-1.3.2.zip 3954437 BLAKE2B 21d79e35a3bad343a4f96e152f8b5f04820fc927557f0526e639f7c04ca1fac61804db02be57261deb01d65c81f67783ba9ed8e0230a90b2626fa2b63ed82857 SHA512 88b292961d728c1ad31dd9f68ba9a1201a59126887030b7b4a8d9fdbed758c1b9bd4f29fb924ddd3cf7b4c5fb7c95f576a00fabdef5a8403e287edeb1c740ff1
 DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487

diff --git a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
deleted file mode 100644
index f0805f408552..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Wed, 19 Aug 2020 22:56:51 +0200
-Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- test/tests/ReplayTests.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp
-index 653aa97657f..1443d1c862d 100644
---- a/test/tests/ReplayTests.cpp
-+++ b/test/tests/ReplayTests.cpp
-@@ -117,4 +117,5 @@ struct PrintReplayParameter
-     }
- };
- 
-+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
- INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());

diff --git a/games-simulation/openrct2/openrct2-0.4.0.ebuild b/games-simulation/openrct2/openrct2-0.4.0.ebuild
deleted file mode 100644
index 1058a20ce00c..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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.2.7"
-MY_PV_RPL="0.0.67"
-MY_PV_TS="0.4.0"
-
-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 )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +lightfx +opengl scripting test +truetype"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || 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_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=OFF
-		-DDISABLE_IPO=ON
-		-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)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_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_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2022-05-27 22:34 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2022-05-27 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a6cc2e8778e1a0095d91c407a1d9f04fde96350f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 21:49:28 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri May 27 22:33:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cc2e87

games-simulation/openrct2: drop 0.3.5.1-r1

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   4 -
 .../openrct2-0.2.4-include-additional-paths.patch  |  33 ----
 .../openrct2/files/openrct2-0.3.5.1-ccache.patch   |  58 -------
 .../openrct2/openrct2-0.3.5.1-r1.ebuild            | 166 ---------------------
 4 files changed, 261 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 711cad0443aa..12bcabc744f6 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,8 +1,4 @@
-DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84
 DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
-DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
 DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
-DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
 DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
-DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487

diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
deleted file mode 100644
index d7c3bb7b4442..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 370b6c6ee48dd1ccc68e03f4bba3e9a2cb2067aa Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Sat, 9 Nov 2019 22:32:03 +0100
-Subject: [PATCH] src/openrct2/config/Config.cpp: Search additional paths for
- rct data.
-
-With '/usr/share/openrct2/rct{1,2}_data' added into the search path list,
-it makes possible to install rct{1,2} game files globally,
-so every user on a linux system can run OpenRCT2 directly.
----
- src/openrct2/config/Config.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
-index 08d59488eea..969533f8820 100644
---- a/src/openrct2/config/Config.cpp
-+++ b/src/openrct2/config/Config.cpp
-@@ -615,6 +615,7 @@ namespace Config
-         log_verbose("config_find_rct1_path(...)");
- 
-         static constexpr const utf8* searchLocations[] = {
-+            R"(/usr/share/openrct2/rct1_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
-@@ -659,6 +660,7 @@ namespace Config
-         log_verbose("config_find_rct2_path(...)");
- 
-         static constexpr const utf8* searchLocations[] = {
-+            R"(/usr/share/openrct2/rct2_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",

diff --git a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
deleted file mode 100644
index 97a529c6a8e2..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cb6d7418c53e10bd4120891f6a2312d3ef839ca8 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sun, 12 Dec 2021 23:04:58 +0100
-Subject: [PATCH] CMakeLists.txt: update CCache handling (#16185)
-
-This PR updated slightly the handling of CCache. With the current
-implementation, when CCache is not being installed, CMake will complain,
-that OPENRCT2_USE_CCACHE is not set.
-
-This logic is slightly updated, so the option OPENRCT2_USE_CCACHE is always
-being available and when this option is enabled (default ON), it will
-search for CCache and warn, if it's not found.
-
-The idea behind is, as in Gentoo, we never let CCache be used by the
-package itself, instead, we enabled it globally. But this the old logic,
-on systems, which don't have CCache installed, it will complain about
-OPENRCT2_USE_CCACHE not being used, but we have to make sure, OpenRCT2
-will never use by itself CCache and this message will be gone..
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- CMakeLists.txt | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d202cf5a9b8..566f3a8a9688 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,16 +8,19 @@ endif()
- # if it is available
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
--find_package(CCache)
--
--if (CCache_FOUND)
--    option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
--    if (OPENRCT2_USE_CCACHE)
--        # Use e.g. "ccache clang++" instead of "clang++"
--        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
--        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
--    endif (OPENRCT2_USE_CCACHE)
--endif (CCache_FOUND)
-+option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
-+
-+if (OPENRCT2_USE_CCACHE)
-+    find_package(CCache)
-+
-+    if (CCache_FOUND)
-+         # Use e.g. "ccache clang++" instead of "clang++"
-+         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
-+         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
-+    else()
-+        message("Usage of CCache was enabled, but CCache was not found, so CCache is not being enabled.")
-+    endif()
-+endif (OPENRCT2_USE_CCACHE)
- 
- if (APPLE)
-     execute_process(COMMAND /usr/bin/uname -m OUTPUT_VARIABLE SYSTEM_MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)

diff --git a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
deleted file mode 100644
index e02fe6c1811b..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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.21"
-MY_PV_RPL="0.0.57"
-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 )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +lightfx +opengl scripting test +truetype"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.3.5.1-ccache.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || 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_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=OFF
-		-DDISABLE_IPO=ON
-		-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)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_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_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2021-12-12 22:42 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2021-12-12 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     a49ebf5c5fcf197d014065f3b7eb8b489f9611d2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 22:40:16 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 22:40:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49ebf5c

games-simulation/openrct2: update ccache logic

Closes: https://bugs.gentoo.org/828814
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../openrct2/files/openrct2-0.3.5.1-ccache.patch   | 58 ++++++++++++++++++++++
 games-simulation/openrct2/openrct2-0.3.5.1.ebuild  |  7 ++-
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
new file mode 100644
index 000000000000..97a529c6a8e2
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
@@ -0,0 +1,58 @@
+From cb6d7418c53e10bd4120891f6a2312d3ef839ca8 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Sun, 12 Dec 2021 23:04:58 +0100
+Subject: [PATCH] CMakeLists.txt: update CCache handling (#16185)
+
+This PR updated slightly the handling of CCache. With the current
+implementation, when CCache is not being installed, CMake will complain,
+that OPENRCT2_USE_CCACHE is not set.
+
+This logic is slightly updated, so the option OPENRCT2_USE_CCACHE is always
+being available and when this option is enabled (default ON), it will
+search for CCache and warn, if it's not found.
+
+The idea behind is, as in Gentoo, we never let CCache be used by the
+package itself, instead, we enabled it globally. But this the old logic,
+on systems, which don't have CCache installed, it will complain about
+OPENRCT2_USE_CCACHE not being used, but we have to make sure, OpenRCT2
+will never use by itself CCache and this message will be gone..
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ CMakeLists.txt | 23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d202cf5a9b8..566f3a8a9688 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,16 +8,19 @@ endif()
+ # if it is available
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+-find_package(CCache)
+-
+-if (CCache_FOUND)
+-    option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
+-    if (OPENRCT2_USE_CCACHE)
+-        # Use e.g. "ccache clang++" instead of "clang++"
+-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
+-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
+-    endif (OPENRCT2_USE_CCACHE)
+-endif (CCache_FOUND)
++option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
++
++if (OPENRCT2_USE_CCACHE)
++    find_package(CCache)
++
++    if (CCache_FOUND)
++         # Use e.g. "ccache clang++" instead of "clang++"
++         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
++         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
++    else()
++        message("Usage of CCache was enabled, but CCache was not found, so CCache is not being enabled.")
++    endif()
++endif (OPENRCT2_USE_CCACHE)
+ 
+ if (APPLE)
+     execute_process(COMMAND /usr/bin/uname -m OUTPUT_VARIABLE SYSTEM_MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)

diff --git a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
index af9c013eb4ff..6563d4bf797d 100644
--- a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
@@ -21,11 +21,13 @@ SRC_URI="
 	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 )
 "
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/icu:=
@@ -66,13 +68,10 @@ BDEPEND="
 	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"
+	"${FILESDIR}/${PN}-0.3.5.1-ccache.patch"
 )
 
 src_unpack() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2020-08-19 22:45 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2020-08-19 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     54f89e0355173685f96ec3f67e0bf1a5773cad34
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 22:10:01 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:44:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f89e03

games-simulation/openrct2: fix tests with newest gtest

Closes: https://bugs.gentoo.org/733386
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../openrct2/files/openrct2-0.2.6-gtest-1.10.patch   | 20 ++++++++++++++++++++
 games-simulation/openrct2/openrct2-0.2.6.ebuild      |  1 +
 2 files changed, 21 insertions(+)

diff --git a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
new file mode 100644
index 00000000000..f0805f40855
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
@@ -0,0 +1,20 @@
+From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 19 Aug 2020 22:56:51 +0200
+Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ test/tests/ReplayTests.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp
+index 653aa97657f..1443d1c862d 100644
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -117,4 +117,5 @@ struct PrintReplayParameter
+     }
+ };
+ 
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());

diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild
index 6a7f824c16d..856708edc6e 100644
--- a/games-simulation/openrct2/openrct2-0.2.6.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild
@@ -73,6 +73,7 @@ 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() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2019-12-02 21:16 Conrad Kostecki
  0 siblings, 0 replies; 15+ messages in thread
From: Conrad Kostecki @ 2019-12-02 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     935d4aa7df70a085d1703c2265191c61251dff79
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 14:06:35 2019 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 21:13:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935d4aa7

games-simulation/openrct2: bump to version 0.2.4

Changes:
  - Bump to EAPI=7.
  - Updated objects, replays and title-sequences versions.
  - Switch entierly from gnome2-utils to xdg-utils.
  - Added use flags for dedicated server and lightfx.
  - Added missing curl and icu dependency to DEPEND/RDEPEND.
  - Added missing pkgconfig depdendeny to BDEPEND.
  - Added initd/confd scripts for dedicated server.
  - Added GLEP 81 group/user for dedicated server.
  - Added patches for better Gentoo integration,
    so game files can be installed globally.
  - Updated options for cmake configure,
    which also fixes a QA warning.
  - Updated description how to install data files.
  - Fixed tests, so no tests needs to be disabled.
  - Updated metadata.xml with a better description.
  - Taking ownership by myself.

Closes: https://bugs.gentoo.org/660274
Closes: https://bugs.gentoo.org/687810
Closes: https://bugs.gentoo.org/696578
Closes: https://github.com/gentoo/gentoo/pull/13606
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   4 +
 games-simulation/openrct2/files/README.gentoo      |  15 ++
 ...isable-desktop-and-icon-files-without-gui.patch |  52 +++++++
 .../openrct2-0.2.4-disable-optional-features.patch |  87 +++++++++++
 .../openrct2-0.2.4-include-additional-paths.patch  |  33 +++++
 games-simulation/openrct2/files/openrct2.confd     |  11 ++
 games-simulation/openrct2/files/openrct2.initd     |  41 ++++++
 games-simulation/openrct2/metadata.xml             |  19 ++-
 games-simulation/openrct2/openrct2-0.2.4.ebuild    | 164 +++++++++++++++++++++
 9 files changed, 422 insertions(+), 4 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 640461340ff..3aaf0c0b9cf 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,4 +1,8 @@
 DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
+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/files/README.gentoo b/games-simulation/openrct2/files/README.gentoo
new file mode 100644
index 00000000000..7e5fc8c6585
--- /dev/null
+++ b/games-simulation/openrct2/files/README.gentoo
@@ -0,0 +1,15 @@
+OpenRCT2 needs the original RollerCoaster Tycoon 2 data files."
+
+You need the folders 'Data', 'ObjData', 'Scenarios' and 'Tracks'"
+from the original release and copy them into '/usr/share/openrct2/rct2_data'."
+
+For additional content, you can install the RollerCoaster Tycoon 1 data files."
+
+You need the folders 'Data', 'Scenarios' and 'Tracks'"
+from the original release and copy them into '/usr/share/openrct2/rct1_data'."
+
+Optionally, the paths can be overwritten by the parameters"
+'game_path' and 'rct1_path' in your local ~/.config/OpenRCT2/config.ini file."
+
+See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files"
+See: https://github.com/OpenRCT2/OpenRCT2/wiki/Loading-RCT1-scenarios-and-data"

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
new file mode 100644
index 00000000000..cddbe7a93a3
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch
@@ -0,0 +1,52 @@
+From 9df66b1f1f56427d896263728c84009c8c3b842b Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@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 <conrad@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
new file mode 100644
index 00000000000..03d6496bf3e
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch
@@ -0,0 +1,87 @@
+From fef1906d0d7050b1dfa3792f6e8d3a9b9632df68 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad+github@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/files/openrct2-0.2.4-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
new file mode 100644
index 00000000000..d7c3bb7b444
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
@@ -0,0 +1,33 @@
+From 370b6c6ee48dd1ccc68e03f4bba3e9a2cb2067aa Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sat, 9 Nov 2019 22:32:03 +0100
+Subject: [PATCH] src/openrct2/config/Config.cpp: Search additional paths for
+ rct data.
+
+With '/usr/share/openrct2/rct{1,2}_data' added into the search path list,
+it makes possible to install rct{1,2} game files globally,
+so every user on a linux system can run OpenRCT2 directly.
+---
+ src/openrct2/config/Config.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
+index 08d59488eea..969533f8820 100644
+--- a/src/openrct2/config/Config.cpp
++++ b/src/openrct2/config/Config.cpp
+@@ -615,6 +615,7 @@ namespace Config
+         log_verbose("config_find_rct1_path(...)");
+ 
+         static constexpr const utf8* searchLocations[] = {
++            R"(/usr/share/openrct2/rct1_data)",
+             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
+             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
+             R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
+@@ -659,6 +660,7 @@ namespace Config
+         log_verbose("config_find_rct2_path(...)");
+ 
+         static constexpr const utf8* searchLocations[] = {
++            R"(/usr/share/openrct2/rct2_data)",
+             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
+             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
+             R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",

diff --git a/games-simulation/openrct2/files/openrct2.confd b/games-simulation/openrct2/files/openrct2.confd
new file mode 100644
index 00000000000..cdc414542d2
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2.confd
@@ -0,0 +1,11 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Name of the OpenRCT2 scenario file,
+# which will be used by the dedicated server.
+# It needs to be placed in '/var/lib/openrct2/<instance>/scenario'.
+# The default instance is 'main'.
+OPENRCT2_SCENARIO_FILE="scenario.sc6"
+
+# Options, which can be passed to the dedicated server.
+OPENRCT2_OPTS="--port 11753"

diff --git a/games-simulation/openrct2/files/openrct2.initd b/games-simulation/openrct2/files/openrct2.initd
new file mode 100644
index 00000000000..de95158a68e
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "openrct2" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#*.}"
+fi
+
+openrct2_command="/usr/bin/openrct2-cli"
+openrct2_path="/var/lib/openrct2"
+openrct2_path_instance="${openrct2_path}/${instance}"
+openrct2_path_scenario="${openrct2_path_instance}/scenario"
+name="OpenRCT2 server (${instance})"
+pidfile="/run/openrct2-cli.${instance}.pid"
+start_stop_daemon_args="--chdir ${openrct2_path_instance}"
+
+command="/usr/bin/openrct2-cli"
+command_args="host \"${openrct2_path_scenario}/${OPENRCT2_SCENARIO_FILE}\" --headless --user-data-path ${openrct2_path_instance} ${OPENRCT2_OPTS}"
+command_background="true"
+command_group="openrct2"
+command_user="openrct2"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${openrct2_path}" "${openrct2_path_instance}" "${openrct2_path_scenario}"
+
+	if [ ! -f "${openrct2_path_scenario}/${OPENRCT2_SCENARIO_FILE}" ]; then
+		eerror "The scenario ${openrct2_path_scenario}/${OPENRCT2_SCENARIO_FILE} could not be found!"
+		eerror "An OpenRCT2 scenario file is needed by the dedicated server."
+		eerror "Please check, if OPENRCT2_SCENARIO is configured correctly."
+		return 1
+	else
+		checkpath -f -o "${command_user}:${command_group}" -q "${openrct2_path_scenario}/${OPENRCT2_SCENARIO_FILE}"
+		return 0
+	fi
+}

diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index e6ebc48e755..9fce1c161ff 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>jan@segre.in</email>
 		<name>Jan Segre</name>
@@ -13,15 +17,22 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		An open-source re-implementation of RollerCoaster Tycoon 2. A construction and management simulation video game that simulates amusement park management.
+	<longdescription>
+		OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2),
+		expanding the game with new features, fixing bugs and raising game limits.
+		The gameplay revolves around building and maintaining an amusement park containing attractions,
+		shops and facilities. The player must try to make a profit and maintain a good park reputation
+		whilst keeping the guests happy. OpenRCT2 allows for both scenario and sandbox play.
+		Scenarios require the player to complete a certain objective in a set time limit whilst
+		sandbox allows the player to build a more flexible park with optionally no restrictions or finance.
 	</longdescription>
 	<use>
+		<flag name="lightfx">Enables LightFX for better lightning effects.</flag>
 		<flag name="multiplayer">Enable multiplayer functionality</flag>
-		<flag name="twitch">Enable Twitch support</flag>
+		<flag name="twitch">Enables streaming of ingame content to Twitch.</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">OpenRCT2/OpenRCT2</remote-id>
 		<bugs-to>https://github.com/OpenRCT2/OpenRCT2/issues</bugs-to>
+		<remote-id type="github">OpenRCT2/OpenRCT2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-simulation/openrct2/openrct2-0.2.4.ebuild b/games-simulation/openrct2/openrct2-0.2.4.ebuild
new file mode 100644
index 00000000000..15630b9a2ce
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.2.4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2019-10-28 14:43 Joonas Niilola
  0 siblings, 0 replies; 15+ messages in thread
From: Joonas Niilola @ 2019-10-28 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4f54a059969bf498bc4c2a276eade9f13ef89ef3
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Thu Oct 24 21:10:57 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 14:14:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f54a059

games-simulation/openrct2: drop old version

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/13421
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   2 -
 .../openrct2-0.2.0-disable-tests-with-assets.patch |  50 ---------
 games-simulation/openrct2/openrct2-0.2.0.ebuild    | 121 ---------------------
 3 files changed, 173 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index cb463fa9fd2..640461340ff 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,6 +1,4 @@
-DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598ac9bafd0636fc2fe62cc0921d1e620cf29a31f2fd5d9258d5b79cd952887e853c005ed719f5990744e9849ad0ee8 SHA512 ac42509ceb52eab20964bf95d7a140dc00d9b4c2569fab1200faff31548f063e209acde29f8ca4ee14858fcf5f6781eebe6d5f7de3d4e01fd43c43ee8905863b
 DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
-DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
 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-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106

diff --git a/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
deleted file mode 100644
index 0b4c7275558..00000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001
-From: "Hendrik v. Raven" <hendrik@consetetur.de>
-Date: Sat, 4 Aug 2018 13:58:31 +0200
-Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option
-
-the option was removing when restructuring the CI system, but it is
-still usefull for package maintainers.
----
- test/tests/CMakeLists.txt | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
-index 1f862153d..34ab5c884 100644
---- a/test/tests/CMakeLists.txt
-+++ b/test/tests/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 2.6)
- 
-+option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
- option(SYSTEM_GTEST "Use the googletest library provided by the system.")
- 
- if (SYSTEM_GTEST)
-@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp"
-                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES})
- target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME ride_ratings COMMAND test_ride_ratings)
- 
- # Multi-launch test
- set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp"
-                              "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES})
- target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME multilaunch COMMAND test_multilaunch)
- 
- # Tile element test
- set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
-                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
- target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME tile_elements COMMAND test_tile_elements)
-+
-+if (NOT DISABLE_RCT2_TESTS)
-+    add_test(NAME ride_ratings COMMAND test_ride_ratings)
-+    add_test(NAME multilaunch COMMAND test_multilaunch)
-+    add_test(NAME tile_elements COMMAND test_tile_elements)
-+endif ()
--- 
-2.18.0
-

diff --git a/games-simulation/openrct2/openrct2-0.2.0.ebuild b/games-simulation/openrct2/openrct2-0.2.0.ebuild
deleted file mode 100644
index e0f361457bf..00000000000
--- a/games-simulation/openrct2/openrct2-0.2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open source re-implementation of 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.2"
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/speexdsp
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.0-disable-tests-with-assets.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	mkdir -p "${S}/data/title" || die
-	pushd "${S}/data/title" || die
-	unpack ${PN}-title-sequence-v${TSV}.zip
-	popd || die
-
-	mkdir -p "${S}/data/object" || die
-	pushd "${S}/data/object" || die
-	unpack ${PN}-objects-v${OBJV}.zip
-	popd || die
-}
-
-src_prepare() {
-	sed -i CMakeLists.txt -e 's/-Werror//' || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-		-DDOWNLOAD_OBJECTS=OFF
-		-DBUILD_SHARED_LIBS=ON
-	)
-	if use test ; then
-		mycmakeargs+=(
-			-DSYSTEM_GTEST=ON
-			-DDISABLE_RCT2_TESTS=ON
-		)
-	fi
-
-	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 ""
-	fi
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2018-12-16 16:01 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     95d33bd615f6c64a8c2fe7bf674738790b4a2289
Author:     Richard Nespithal <richard <AT> nespithal <DOT> com>
AuthorDate: Thu Dec 13 18:09:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 16:00:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d33bd6

games-simulation/openrct2: Bump to 0.2.1, bug #669226

Closes: https://bugs.gentoo.org/669226
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Richard Nespithal <richard <AT> nespithal.com>
Closes: https://github.com/gentoo/gentoo/pull/10633
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-simulation/openrct2/Manifest                 |   2 +
 .../openrct2-0.2.1-disable-tests-with-assets.patch |  50 +++++++++
 games-simulation/openrct2/openrct2-0.2.1.ebuild    | 121 +++++++++++++++++++++
 3 files changed, 173 insertions(+)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index a6c9d3963c3..1433c4cab37 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,4 +1,6 @@
 DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598ac9bafd0636fc2fe62cc0921d1e620cf29a31f2fd5d9258d5b79cd952887e853c005ed719f5990744e9849ad0ee8 SHA512 ac42509ceb52eab20964bf95d7a140dc00d9b4c2569fab1200faff31548f063e209acde29f8ca4ee14858fcf5f6781eebe6d5f7de3d4e01fd43c43ee8905863b
+DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
 DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
 DIST openrct2-objects-v1.0.3.zip 2070513 BLAKE2B 3499b022f1d1f2b05da003f87f5f885de8463ed63d751653b0d8d48e2a339496d84d025eb2e44619012aa76360f6880541a519312e6d339eca862f6274d2b73b SHA512 9012a6337df7abd2743e94e3606266cde306335f33bf4f7869cca90c9c31758806c063b697bc3a6e21af7c733841551f2b29072592850cc51090d58f5f685f99
+DIST openrct2-objects-v1.0.7.zip 2164242 BLAKE2B 003baf3400c52e3b2efdc208f6c64a45f7c9274aca3b729856a60fc1e72c8b6440b663d3fd791ebde7412df9920095367763bcad58257534b32c222d97976dcb SHA512 8e77adae59062582a22be69e81d144477482148c839abbea76e6bbbc65ca6426a8354bd4726176702a41684f01a62c5bddc0f6c2c6e42fa91c88815879c91fe5
 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106

diff --git a/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch
new file mode 100644
index 00000000000..a4f1e237532
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch
@@ -0,0 +1,50 @@
+From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001
+From: "Hendrik v. Raven" <hendrik@consetetur.de>
+Date: Sat, 4 Aug 2018 13:58:31 +0200
+Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option
+
+the option was removing when restructuring the CI system, but it is
+still usefull for package maintainers.
+---
+ test/tests/CMakeLists.txt | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
+index 1f862153d..34ab5c884 100644
+--- a/test/tests/CMakeLists.txt
++++ b/test/tests/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ cmake_minimum_required(VERSION 2.6)
+
++option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
+ option(SYSTEM_GTEST "Use the googletest library provided by the system.")
+
+ if (SYSTEM_GTEST)
+@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp"
+                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES})
+ target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME ride_ratings COMMAND test_ride_ratings)
+
+ # Multi-launch test
+ set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp"
+                              "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES})
+ target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME multilaunch COMMAND test_multilaunch)
+
+ # Tile element test
+ set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
+                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
+ target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME tile_elements COMMAND test_tile_elements)
++
++if (NOT DISABLE_RCT2_TESTS)
++    add_test(NAME ride_ratings COMMAND test_ride_ratings)
++    add_test(NAME multilaunch COMMAND test_multilaunch)
++    add_test(NAME tile_elements COMMAND test_tile_elements)
++endif ()
+--
+2.18.0
+

diff --git a/games-simulation/openrct2/openrct2-0.2.1.ebuild b/games-simulation/openrct2/openrct2-0.2.1.ebuild
new file mode 100644
index 00000000000..95681d9a2ce
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.2.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="An open source re-implementation of 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.7"
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/speexdsp
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.1-disable-tests-with-assets.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	mkdir -p "${S}/data/title" || die
+	pushd "${S}/data/title" || die
+	unpack ${PN}-title-sequence-v${TSV}.zip
+	popd || die
+
+	mkdir -p "${S}/data/object" || die
+	pushd "${S}/data/object" || die
+	unpack ${PN}-objects-v${OBJV}.zip
+	popd || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt -e 's/-Werror//' || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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
+		-DDOWNLOAD_OBJECTS=OFF
+		-DBUILD_SHARED_LIBS=ON
+	)
+	if use test ; then
+		mycmakeargs+=(
+			-DSYSTEM_GTEST=ON
+			-DDISABLE_RCT2_TESTS=ON
+		)
+	fi
+
+	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 ""
+	fi
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2018-08-19 12:59 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2018-08-19 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     1cc76ec334765d9ee6bcee9f4c85424f8a61c9f4
Author:     Hendrik v. Raven <hendrik <AT> consetetur <DOT> de>
AuthorDate: Sat Aug  4 12:11:23 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 12:59:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc76ec3

games-simulation/openrct2: version bump to 0.2.0

also apply the ebuild updates to the nightly version.

0.2.0 requires a patch disabling some tests requiring game files. This
in no longer needed in nightly.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 games-simulation/openrct2/Manifest                 |  4 +-
 .../openrct2-0.2.0-disable-tests-with-assets.patch | 50 ++++++++++++++++++++++
 ...{openrct2-9999.ebuild => openrct2-0.2.0.ebuild} | 24 ++++++++---
 games-simulation/openrct2/openrct2-9999.ebuild     | 15 ++++---
 4 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 1da0e45b5c0..9aafa6ade4d 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,3 +1,5 @@
 DIST openrct2-0.1.2.tar.gz 6769785 BLAKE2B 0cc6ef6c68c1db6c822dd6038bc2d115f487a52b5891316273ee36db1713913baa2f119dabace88a37c16f87c90b14cf84df75a24b26b22571e98966afd2adbc SHA512 489dac96e1eda1449680f98a4b500eeb7b3f1ffbdaa5a5c701300071eb3a7862c65fa5a81e769083927b95a14914db54307724756a9841cff0c769c9e5471adc
-DIST openrct2-objects-v1.0.zip 2050225 BLAKE2B 52ae6f5ab4de5d4b121cea6a3d6711b04f1c4857795c995f7568e3be2862409104be55e233781ff6708c7e821f49af8e91f9f4c87c037b6a8a77698534747925 SHA512 a125fee04c12c49ffd16880eb5b8722e25c5fb82adae305d9904c3a6251c83e73e4a29c7e3694acee3abf336894759cfbff94018c6b210df4d794ca3ec34dc84
+DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598ac9bafd0636fc2fe62cc0921d1e620cf29a31f2fd5d9258d5b79cd952887e853c005ed719f5990744e9849ad0ee8 SHA512 ac42509ceb52eab20964bf95d7a140dc00d9b4c2569fab1200faff31548f063e209acde29f8ca4ee14858fcf5f6781eebe6d5f7de3d4e01fd43c43ee8905863b
+DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
+DIST openrct2-objects-v1.0.3.zip 2070513 BLAKE2B 3499b022f1d1f2b05da003f87f5f885de8463ed63d751653b0d8d48e2a339496d84d025eb2e44619012aa76360f6880541a519312e6d339eca862f6274d2b73b SHA512 9012a6337df7abd2743e94e3606266cde306335f33bf4f7869cca90c9c31758806c063b697bc3a6e21af7c733841551f2b29072592850cc51090d58f5f685f99
 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106

diff --git a/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
new file mode 100644
index 00000000000..0b4c7275558
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
@@ -0,0 +1,50 @@
+From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001
+From: "Hendrik v. Raven" <hendrik@consetetur.de>
+Date: Sat, 4 Aug 2018 13:58:31 +0200
+Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option
+
+the option was removing when restructuring the CI system, but it is
+still usefull for package maintainers.
+---
+ test/tests/CMakeLists.txt | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
+index 1f862153d..34ab5c884 100644
+--- a/test/tests/CMakeLists.txt
++++ b/test/tests/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
++option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
+ option(SYSTEM_GTEST "Use the googletest library provided by the system.")
+ 
+ if (SYSTEM_GTEST)
+@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp"
+                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES})
+ target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME ride_ratings COMMAND test_ride_ratings)
+ 
+ # Multi-launch test
+ set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp"
+                              "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES})
+ target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME multilaunch COMMAND test_multilaunch)
+ 
+ # Tile element test
+ set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
+                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
+ add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
+ target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
+-add_test(NAME tile_elements COMMAND test_tile_elements)
++
++if (NOT DISABLE_RCT2_TESTS)
++    add_test(NAME ride_ratings COMMAND test_ride_ratings)
++    add_test(NAME multilaunch COMMAND test_multilaunch)
++    add_test(NAME tile_elements COMMAND test_tile_elements)
++endif ()
+-- 
+2.18.0
+

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-0.2.0.ebuild
similarity index 83%
copy from games-simulation/openrct2/openrct2-9999.ebuild
copy to games-simulation/openrct2/openrct2-0.2.0.ebuild
index 1058facd68f..f8059872fa8 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.0.ebuild
@@ -14,15 +14,18 @@ if [[ ${PV} == 9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 	S="${WORKDIR}/OpenRCT2-${PV}"
 fi
 
 TSV="0.1.2"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-OBJV="1.0"
-SRC_URI+=" https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip -> ${PN}-objects-v${OBJV}.zip"
+OBJV="1.0.2"
+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"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -50,6 +53,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.0-disable-tests-with-assets.patch"
+)
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -83,9 +90,14 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
 		-DDOWNLOAD_OBJECTS=OFF
-		-DSYSTEM_GTEST=ON
 		-DBUILD_SHARED_LIBS=ON
 	)
+	if use test ; then
+		mycmakeargs+=(
+			-DSYSTEM_GTEST=ON
+			-DDISABLE_RCT2_TESTS=ON
+		)
+	fi
 
 	cmake-utils_src_configure
 }

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 1058facd68f..d9c56e6aeb0 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -14,15 +14,18 @@ if [[ ${PV} == 9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 	S="${WORKDIR}/OpenRCT2-${PV}"
 fi
 
 TSV="0.1.2"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-OBJV="1.0"
-SRC_URI+=" https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip -> ${PN}-objects-v${OBJV}.zip"
+OBJV="1.0.3"
+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"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -83,9 +86,9 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
 		-DDOWNLOAD_OBJECTS=OFF
-		-DSYSTEM_GTEST=ON
 		-DBUILD_SHARED_LIBS=ON
 	)
+	use test && mycmakeargs+=( -DSYSTEM_GTEST=ON )
 
 	cmake-utils_src_configure
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2017-08-11 22:12 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-08-11 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     dcc2f6b146d0060e77564f6e87e56e64b59c569d
Author:     Jan Segre <jan <AT> segre <DOT> in>
AuthorDate: Fri Aug 11 21:12:31 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 22:12:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc2f6b1

games-simulation/openrct2: drop old

Closes: https://github.com/gentoo/gentoo/pull/5377
Package-Manager: Portage-2.3.6, Repoman-2.3.1

 games-simulation/openrct2/Manifest                 |   1 -
 .../openrct2-0.1.0-remove-external-gtest.patch     |  67 --------------
 .../files/openrct2-0.1.0-respect-libdir.patch      |  11 ---
 games-simulation/openrct2/openrct2-0.1.0.ebuild    | 100 ---------------------
 4 files changed, 179 deletions(-)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 267f4e9c3e9..178565bb243 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,3 +1,2 @@
-DIST openrct2-0.1.0.tar.gz 6253207 SHA256 0347a47d380fc18ea543928c92a13d1bdb4431573154afeb80fa33f1149e6992 SHA512 102902f47948e2dc648a48897eddbb53bbd451fd6e9a66f397c6f026012131c11e3c5a5aa208b9d719a0e75aa244c9a3967ae3b98c33ba695fd622cb1bd18f12 WHIRLPOOL 18d1fc763606b9fb85fae9ba056ef3b8ae9be68903fbd137e045f594e273c954777c2ea2f2ede65e3695d43e4c4a714df9f77afaf07b5a6555a314e616188a3d
 DIST openrct2-0.1.1.tar.gz 6284135 SHA256 5d7a6c7f3c770e7de506958f86789c438c543c27d312fd096322cde4e89f50ad SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427 WHIRLPOOL 9e673852d653fe8e1839db96d124b1cc1e7e4f7a594ec05c1a895c883da234e536851025c75e0fcacb3be776cb3dd1dea9ad7ac028cfda6434095146ba68c5e7
 DIST openrct2-title-sequence-v0.1.0.zip 1766393 SHA256 1df6ad253896bd09b728616f7bf12f4b797ef9db2b9bab8465b08662f47f4bef SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b WHIRLPOOL f78612445dda2c55aa224e4df0ece92a5f762049ca1b6bcf4e00f72f6aaf900fb944a6a1dd358900b1968a63b301af8bf4b1ca0a645c43c0ca2221279efabd9a

diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch b/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch
deleted file mode 100644
index 2c1392b731f..00000000000
--- a/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/test/tests/CMakeLists.txt	2017-07-13 14:46:34.690292993 +0200
-+++ b/test/tests/CMakeLists.txt	2017-07-13 14:56:57.678054368 +0200
-@@ -2,61 +2,13 @@
- 
- option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
- 
--# Bootstrap GoogleTest
--INCLUDE(ExternalProject)
-+find_package(GTest REQUIRED)
- 
--ExternalProject_Add(
--        googletest-distribution
--        URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz
--        URL_HASH SHA1=e7e646a6204638fe8e87e165292b8dd9cd4c36ed
--        TIMEOUT 10
--        CONFIGURE_COMMAND ""
--        BUILD_COMMAND ""
--        INSTALL_COMMAND ""
--)
--
--# Specify include dir
--ExternalProject_Get_Property(googletest-distribution SOURCE_DIR)
--set(GOOGLETEST_DISTRIB_SOURCE_DIR "${SOURCE_DIR}")
--
--ExternalProject_Add(
--        googletest
--        DEPENDS googletest-distribution
--        DOWNLOAD_COMMAND ""
--        SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest"
--        CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M}"
--        BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
--        BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
--        # Disable install step
--        INSTALL_COMMAND ""
--        # Wrap download, configure and build steps in a script to log output
--        LOG_DOWNLOAD ON
--        LOG_CONFIGURE ON
--        LOG_BUILD ON)
--
--
--# Specify include dir
--set(GTEST_INCLUDE_DIR ${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest/include)
--
--# Library
--ExternalProject_Get_Property(googletest BINARY_DIR)
--set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}")
--set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
--set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
--set(GTEST_LIBRARY gtest)
--set(GTEST_MAIN_LIBRARY gtest_main)
--add_library(${GTEST_LIBRARY} STATIC IMPORTED)
--add_library(${GTEST_MAIN_LIBRARY} STATIC IMPORTED)
--set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
--set_property(TARGET ${GTEST_MAIN_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH})
--add_dependencies(${GTEST_LIBRARY} googletest)
--add_dependencies(${GTEST_MAIN_LIBRARY} ${GTEST_LIBRARY})
--
--include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
-+include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
- include_directories("${ROOT_DIR}/src")
- include_directories(${SDL2_INCLUDE_DIRS})
- 
--set(GTEST_LIBRARIES gtest gtest_main pthread)
-+set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES})
- 
- # Some most common files required in tests
- set(COMMON_TEST_SOURCES

diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch b/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch
deleted file mode 100644
index 60695802764..00000000000
--- a/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2017-07-26 00:54:48.021345174 -0300
-+++ b/CMakeLists.txt	2017-07-26 00:54:39.510156990 -0300
-@@ -140,7 +140,7 @@
-     if (PORTABLE)
-         install(TARGETS "libopenrct2" LIBRARY DESTINATION "bin")
-     else ()
--        install(TARGETS "libopenrct2" LIBRARY DESTINATION "lib")
-+        install(TARGETS "libopenrct2" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-     endif ()
- endif ()
- install(TARGETS "openrct2" RUNTIME DESTINATION "bin")

diff --git a/games-simulation/openrct2/openrct2-0.1.0.ebuild b/games-simulation/openrct2/openrct2-0.1.0.ebuild
deleted file mode 100644
index a0f3e627052..00000000000
--- a/games-simulation/openrct2/openrct2-0.1.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
-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.0"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
-REQUIRED_USE="multiplayer? ( twitch )"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	|| (
-		media-libs/speexdsp
-		<media-libs/speex-1.2.0
-	)
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.0-remove-external-gtest.patch"
-	"${FILESDIR}/${PN}-0.1.0-respect-libdir.patch"
-)
-
-if [[ ${PV} == 9999 ]]; then
-src_unpack() {
-	default
-	git-r3_src_unpack
-}
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		-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_RCT2_TESTS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openrct2/title
-	doins "${WORKDIR}"/*.parkseq
-}
-
-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 ""
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/
@ 2017-07-26  8:12 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-07-26  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3e16317b57e96c4875486f111707727e056a0f4b
Author:     Jan Segre <jan <AT> segre <DOT> in>
AuthorDate: Sat Jan 28 14:21:34 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 08:12:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e16317b

games-simulation/openrct2: new package, #607444

OpenRCT2 (https://openrct2.website/) is an open source re-implementation
of RollerCoaster Tycoon 2. The original data files from RCT2 are still
needed to play this game, see:
https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve

Closes: https://github.com/gentoo/gentoo/pull/3694
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Signed-off-by: Jan Segre <jan <AT> segre.in>

 games-simulation/openrct2/Manifest                 |   2 +
 .../openrct2-0.1.0-remove-external-gtest.patch     |  67 ++++++++++++++
 .../files/openrct2-0.1.0-respect-libdir.patch      |  11 +++
 games-simulation/openrct2/metadata.xml             |  27 ++++++
 games-simulation/openrct2/openrct2-0.1.0.ebuild    | 100 +++++++++++++++++++++
 games-simulation/openrct2/openrct2-9999.ebuild     | 100 +++++++++++++++++++++
 6 files changed, 307 insertions(+)

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
new file mode 100644
index 00000000000..545dbe32f6b
--- /dev/null
+++ b/games-simulation/openrct2/Manifest
@@ -0,0 +1,2 @@
+DIST openrct2-0.1.0.tar.gz 6253207 SHA256 0347a47d380fc18ea543928c92a13d1bdb4431573154afeb80fa33f1149e6992 SHA512 102902f47948e2dc648a48897eddbb53bbd451fd6e9a66f397c6f026012131c11e3c5a5aa208b9d719a0e75aa244c9a3967ae3b98c33ba695fd622cb1bd18f12 WHIRLPOOL 18d1fc763606b9fb85fae9ba056ef3b8ae9be68903fbd137e045f594e273c954777c2ea2f2ede65e3695d43e4c4a714df9f77afaf07b5a6555a314e616188a3d
+DIST openrct2-title-sequence-v0.1.0.zip 1766393 SHA256 1df6ad253896bd09b728616f7bf12f4b797ef9db2b9bab8465b08662f47f4bef SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b WHIRLPOOL f78612445dda2c55aa224e4df0ece92a5f762049ca1b6bcf4e00f72f6aaf900fb944a6a1dd358900b1968a63b301af8bf4b1ca0a645c43c0ca2221279efabd9a

diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch b/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch
new file mode 100644
index 00000000000..2c1392b731f
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch
@@ -0,0 +1,67 @@
+--- a/test/tests/CMakeLists.txt	2017-07-13 14:46:34.690292993 +0200
++++ b/test/tests/CMakeLists.txt	2017-07-13 14:56:57.678054368 +0200
+@@ -2,61 +2,13 @@
+ 
+ option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
+ 
+-# Bootstrap GoogleTest
+-INCLUDE(ExternalProject)
++find_package(GTest REQUIRED)
+ 
+-ExternalProject_Add(
+-        googletest-distribution
+-        URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz
+-        URL_HASH SHA1=e7e646a6204638fe8e87e165292b8dd9cd4c36ed
+-        TIMEOUT 10
+-        CONFIGURE_COMMAND ""
+-        BUILD_COMMAND ""
+-        INSTALL_COMMAND ""
+-)
+-
+-# Specify include dir
+-ExternalProject_Get_Property(googletest-distribution SOURCE_DIR)
+-set(GOOGLETEST_DISTRIB_SOURCE_DIR "${SOURCE_DIR}")
+-
+-ExternalProject_Add(
+-        googletest
+-        DEPENDS googletest-distribution
+-        DOWNLOAD_COMMAND ""
+-        SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest"
+-        CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M}"
+-        BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
+-        BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
+-        # Disable install step
+-        INSTALL_COMMAND ""
+-        # Wrap download, configure and build steps in a script to log output
+-        LOG_DOWNLOAD ON
+-        LOG_CONFIGURE ON
+-        LOG_BUILD ON)
+-
+-
+-# Specify include dir
+-set(GTEST_INCLUDE_DIR ${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest/include)
+-
+-# Library
+-ExternalProject_Get_Property(googletest BINARY_DIR)
+-set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}")
+-set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
+-set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
+-set(GTEST_LIBRARY gtest)
+-set(GTEST_MAIN_LIBRARY gtest_main)
+-add_library(${GTEST_LIBRARY} STATIC IMPORTED)
+-add_library(${GTEST_MAIN_LIBRARY} STATIC IMPORTED)
+-set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
+-set_property(TARGET ${GTEST_MAIN_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH})
+-add_dependencies(${GTEST_LIBRARY} googletest)
+-add_dependencies(${GTEST_MAIN_LIBRARY} ${GTEST_LIBRARY})
+-
+-include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
++include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
+ include_directories("${ROOT_DIR}/src")
+ include_directories(${SDL2_INCLUDE_DIRS})
+ 
+-set(GTEST_LIBRARIES gtest gtest_main pthread)
++set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES})
+ 
+ # Some most common files required in tests
+ set(COMMON_TEST_SOURCES

diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch b/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch
new file mode 100644
index 00000000000..60695802764
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-07-26 00:54:48.021345174 -0300
++++ b/CMakeLists.txt	2017-07-26 00:54:39.510156990 -0300
+@@ -140,7 +140,7 @@
+     if (PORTABLE)
+         install(TARGETS "libopenrct2" LIBRARY DESTINATION "bin")
+     else ()
+-        install(TARGETS "libopenrct2" LIBRARY DESTINATION "lib")
++        install(TARGETS "libopenrct2" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+     endif ()
+ endif ()
+ install(TARGETS "openrct2" RUNTIME DESTINATION "bin")

diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
new file mode 100644
index 00000000000..e6ebc48e755
--- /dev/null
+++ b/games-simulation/openrct2/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jan@segre.in</email>
+		<name>Jan Segre</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hendrik@consetetur.de</email>
+		<name>Hendrik v. Raven (lorem_ipsum)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		An open-source re-implementation of RollerCoaster Tycoon 2. A construction and management simulation video game that simulates amusement park management.
+	</longdescription>
+	<use>
+		<flag name="multiplayer">Enable multiplayer functionality</flag>
+		<flag name="twitch">Enable Twitch support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">OpenRCT2/OpenRCT2</remote-id>
+		<bugs-to>https://github.com/OpenRCT2/OpenRCT2/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

diff --git a/games-simulation/openrct2/openrct2-0.1.0.ebuild b/games-simulation/openrct2/openrct2-0.1.0.ebuild
new file mode 100644
index 00000000000..a0f3e627052
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.website/"
+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.0"
+SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
+REQUIRED_USE="multiplayer? ( twitch )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	|| (
+		media-libs/speexdsp
+		<media-libs/speex-1.2.0
+	)
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.0-remove-external-gtest.patch"
+	"${FILESDIR}/${PN}-0.1.0-respect-libdir.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-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_RCT2_TESTS=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/openrct2/title
+	doins "${WORKDIR}"/*.parkseq
+}
+
+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 ""
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
new file mode 100644
index 00000000000..a0f3e627052
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.website/"
+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.0"
+SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
+REQUIRED_USE="multiplayer? ( twitch )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	|| (
+		media-libs/speexdsp
+		<media-libs/speex-1.2.0
+	)
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.0-remove-external-gtest.patch"
+	"${FILESDIR}/${PN}-0.1.0-respect-libdir.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-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_RCT2_TESTS=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/openrct2/title
+	doins "${WORKDIR}"/*.parkseq
+}
+
+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 ""
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-11-23 23:36 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-11 18:30 [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 23:36 Conrad Kostecki
2024-01-04 21:08 Conrad Kostecki
2024-01-01 17:56 Conrad Kostecki
2023-04-02 21:12 Conrad Kostecki
2022-10-02 17:31 Conrad Kostecki
2022-05-27 22:34 Conrad Kostecki
2021-12-12 22:42 Conrad Kostecki
2020-08-19 22:45 Conrad Kostecki
2019-12-02 21:16 Conrad Kostecki
2019-10-28 14:43 Joonas Niilola
2018-12-16 16:01 Andreas Sturmlechner
2018-08-19 12:59 Michał Górny
2017-08-11 22:12 Michał Górny
2017-07-26  8:12 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox