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 D0E4813933E for ; Wed, 14 Jul 2021 05:47:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D0D1E0C5A; Wed, 14 Jul 2021 05:47:33 +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 4BC2BE0C5A for ; Wed, 14 Jul 2021 05:47:32 +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 BA914342CA9 for ; Wed, 14 Jul 2021 05:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A5457CE for ; Wed, 14 Jul 2021 05:47:29 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1626241581.1bebdf7b67974441a745e299d644dbf7f1c96eb3.ionen@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: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1bebdf7b67974441a745e299d644dbf7f1c96eb3 X-VCS-Branch: master Date: Wed, 14 Jul 2021 05:47:29 +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: fca22c22-78c1-460c-8c37-d7f65de5f10b X-Archives-Hash: 105defb309717ed513ff514d1556454e commit: 1bebdf7b67974441a745e299d644dbf7f1c96eb3 Author: Alexey Sokolov asokolov org> AuthorDate: Sun Jul 11 23:34:09 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jul 14 05:46:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bebdf7b games-engines/openmw: add lua support Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/21606 Signed-off-by: Ionen Wolkens gentoo.org> games-engines/openmw/openmw-9999.ebuild | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild index 9b13f4d95f9..82aa73331fd 100644 --- a/games-engines/openmw/openmw-9999.ebuild +++ b/games-engines/openmw/openmw-9999.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit cmake flag-o-matic xdg-utils readme.gentoo-r1 +LUA_COMPAT=( lua5-{1,3,4} luajit ) +inherit cmake flag-o-matic lua-single xdg-utils readme.gentoo-r1 DESCRIPTION="Open source reimplementation of TES III: Morrowind" HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw" @@ -20,12 +21,13 @@ fi LICENSE="GPL-3 MIT BitstreamVera ZLIB" SLOT="0" IUSE="doc devtools +osg-fork test +qt5" +REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" # FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory, # used when BUILD_OPENCS flag is enabled. See bug #676266. -RDEPEND=" +RDEPEND="${LUA_DEPS} app-arch/lz4 dev-games/mygui dev-games/recastnavigation @@ -48,7 +50,9 @@ RDEPEND=" ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-cpp/sol2 +" BDEPEND=" virtual/pkgconfig @@ -70,6 +74,7 @@ src_prepare() { # Use the system tinyxml headers rm -v extern/oics/tiny{str,xml}* || die + rm -rv extern/sol3.2.2 || die } src_configure() { @@ -96,6 +101,20 @@ src_configure() { -DBULLET_USE_DOUBLES=ON ) + if [[ ${ELUA} == luajit ]]; then + mycmakeargs+=( + -DUSE_LUAJIT=ON + ) + else + mycmakeargs+=( + -DUSE_LUAJIT=OFF + -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version)) + -DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version)) + -DLua_FIND_VERSION_COUNT=2 + -DLua_FIND_VERSION_EXACT=ON + ) + fi + cmake_src_configure }