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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED42D15801B for ; Sat, 22 Jul 2023 17:01:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B03EE081E; Sat, 22 Jul 2023 17:01:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC018E081E for ; Sat, 22 Jul 2023 17:01:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0274B340B9B for ; Sat, 22 Jul 2023 17:01:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DF50BED for ; Sat, 22 Jul 2023 17:01:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1690045254.2f9e56ed6c4bac83a1c63a3f3f13331b12fb321c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/openmw/openmw-9999.ebuild X-VCS-Directories: games-engines/openmw/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 2f9e56ed6c4bac83a1c63a3f3f13331b12fb321c X-VCS-Branch: master Date: Sat, 22 Jul 2023 17:01:05 +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: 6e3c3e81-9e58-4174-80b9-2e566bf2c714 X-Archives-Hash: 8b8176310892af8ff4406c8ecd97710d commit: 2f9e56ed6c4bac83a1c63a3f3f13331b12fb321c Author: Alexey Sokolov asokolov org> AuthorDate: Sat Jul 22 17:00:54 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jul 22 17:00:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9e56ed games-engines/openmw: sync live Closes: https://github.com/gentoo/gentoo/pull/32002 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: David Seifert gentoo.org> games-engines/openmw/openmw-9999.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild index 47e3aee609e5..a7b997f5b8a9 100644 --- a/games-engines/openmw/openmw-9999.ebuild +++ b/games-engines/openmw/openmw-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LUA_COMPAT=( lua5-{1,3,4} luajit ) +LUA_COMPAT=( luajit ) inherit cmake lua-single readme.gentoo-r1 xdg DESCRIPTION="Open source reimplementation of TES III: Morrowind" @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/OpenMW/openmw.git" else SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" S="${WORKDIR}/${PN}-${P}" fi @@ -34,7 +34,7 @@ RESTRICT="!test? ( test )" RDEPEND="${LUA_DEPS} app-arch/lz4:= - >=dev-games/mygui-3.4.1 + dev-games/mygui dev-cpp/yaml-cpp:= dev-db/sqlite:3 dev-games/recastnavigation:= @@ -105,6 +105,8 @@ src_configure() { -DUSE_LUAJIT=ON ) else + # 5.1 (and other 5.x) are supported in theory, but don't work well (eg. test fails) + # In a future version consider adding it back to LUA_COMPAT or dropping this branch mycmakeargs+=( -DUSE_LUAJIT=OFF -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version)) @@ -116,7 +118,8 @@ src_configure() { if use test ; then mkdir -p "${BUILD_DIR}"/apps/openmw_test_suite/data || die - cp "${DISTDIR}"/openmw-template-${MY_TEMPLATE_COMMIT}.omwgame "${BUILD_DIR}"/apps/openmw_test_suite/data/template.omwgame || die + cp "${DISTDIR}"/openmw-template-${MY_TEMPLATE_COMMIT}.omwgame \ + "${BUILD_DIR}"/apps/openmw_test_suite/data/template.omwgame || die fi cmake_src_configure @@ -134,7 +137,9 @@ src_compile() { } src_test() { - "${BUILD_DIR}/openmw_test_suite" || die + pushd "${BUILD_DIR}" > /dev/null || die + ./openmw_test_suite || die + popd > /dev/null || die } src_install() {