From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE38E138239 for ; Sun, 19 Aug 2018 12:59:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F3EBE0883; Sun, 19 Aug 2018 12:59:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C474E0883 for ; Sun, 19 Aug 2018 12:59:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 192F73410F7 for ; Sun, 19 Aug 2018 12:59:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB1EF275 for ; Sun, 19 Aug 2018 12:59:49 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1534683583.1cc76ec334765d9ee6bcee9f4c85424f8a61c9f4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/, games-simulation/openrct2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openrct2/Manifest games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch games-simulation/openrct2/openrct2-0.2.0.ebuild games-simulation/openrct2/openrct2-9999.ebuild X-VCS-Directories: games-simulation/openrct2/ games-simulation/openrct2/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1cc76ec334765d9ee6bcee9f4c85424f8a61c9f4 X-VCS-Branch: master Date: Sun, 19 Aug 2018 12:59:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9f315962-9525-4d8a-863e-b00c8e3bb702 X-Archives-Hash: 398e5adb53b9fc68aad182daadeebbf0 commit: 1cc76ec334765d9ee6bcee9f4c85424f8a61c9f4 Author: Hendrik v. Raven consetetur de> AuthorDate: Sat Aug 4 12:11:23 2018 +0000 Commit: Michał Górny gentoo 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" +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 }