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 AF6B313835A for ; Wed, 19 Aug 2020 22:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4182E0AF0; Wed, 19 Aug 2020 22:45:10 +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 ABA8DE0AF0 for ; Wed, 19 Aug 2020 22:45:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A590234F023 for ; Wed, 19 Aug 2020 22:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CDBB310 for ; Wed, 19 Aug 2020 22:45:08 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1597877098.7b0cfd8d335cfa1f7f5b1159d156d57804e571ef.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openrct2/metadata.xml games-simulation/openrct2/openrct2-9999.ebuild X-VCS-Directories: games-simulation/openrct2/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 7b0cfd8d335cfa1f7f5b1159d156d57804e571ef X-VCS-Branch: master Date: Wed, 19 Aug 2020 22:45:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 284b1ac4-599c-45aa-9585-8b950fb1543d X-Archives-Hash: c7fd301299d67258bdba405c4aa74f25 commit: 7b0cfd8d335cfa1f7f5b1159d156d57804e571ef Author: Conrad Kostecki gentoo org> AuthorDate: Wed Aug 19 22:14:27 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Wed Aug 19 22:44:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0cfd8d games-simulation/openrct2: update live ebuild Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Conrad Kostecki gentoo.org> games-simulation/openrct2/metadata.xml | 1 + games-simulation/openrct2/openrct2-9999.ebuild | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml index 4e87269e0d5..533b34deeec 100644 --- a/games-simulation/openrct2/metadata.xml +++ b/games-simulation/openrct2/metadata.xml @@ -16,6 +16,7 @@ Enables LightFX for better lightning effects. + Enable the dev-lang/duktape scripting engine for executing user scripts. Enables streaming of ingame content to Twitch. diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild index edadb738265..f0a1d342c95 100644 --- a/games-simulation/openrct2/openrct2-9999.ebuild +++ b/games-simulation/openrct2/openrct2-9999.ebuild @@ -27,25 +27,23 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" +IUSE="dedicated libressl +lightfx +opengl scripting test +truetype" COMMON_DEPEND=" - dev-lang/duktape 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 ) - twitch? ( - net-misc/curl[ssl] - ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) + scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 @@ -74,13 +72,14 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" + "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" ) src_unpack() { git-r3_src_unpack - mkdir -p "${S}"/data/title || die - cd "${S}"/data/title || die + 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 @@ -108,7 +107,7 @@ src_configure() { -DDISABLE_DISCORD_RPC=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_GUI=$(usex dedicated) - -DDISABLE_HTTP_TWITCH=$(usex !twitch) + -DDISABLE_HTTP=OFF -DDISABLE_NETWORK=OFF $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") -DDISABLE_TTF=$(usex !truetype) @@ -116,6 +115,8 @@ src_configure() { -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" "") @@ -138,6 +139,8 @@ src_test() { } src_install() { + use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" ) + cmake_src_install if use dedicated; then