[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/

[Ionen Wolkens]

commit:     007e8f1a7bcb63fe11749a6c65d76151d1e5608a
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon May 23 00:16:19 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May 26 04:27:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007e8f1a

games-engines/openmw: update live ebuild

Closes: https://bugs.gentoo.org/840188
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/25602
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/openmw/Manifest           |  1 +
 games-engines/openmw/openmw-9999.ebuild | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 607fa30988f1..cba80402aaec 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1 +1,2 @@
 DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 
40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d
 SHA512 
517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
+DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730 
BLAKE2B 
bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e
 SHA512 
6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6

diff --git a/games-engines/openmw/openmw-9999.ebuild 
b/games-engines/openmw/openmw-9999.ebuild
index c4315facbc5c..45b3ed5e772f 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,11 @@ else
        S="${WORKDIR}/${PN}-${P}"
 fi
 
+MY_TEMPLATE_COMMIT="8966dab24692555eec720c854fb0f73d108070cd"
+SRC_URI+="
+       test? ( 
https://gitlab.com/OpenMW/example-suite/-/raw/${MY_TEMPLATE_COMMIT}/data/template.omwgame
 -> openmw-template-${MY_TEMPLATE_COMMIT}.omwgame )
+"
+
 LICENSE="GPL-3 MIT BitstreamVera ZLIB"
 SLOT="0"
 IUSE="doc devtools +osg-fork test +qt5"
@@ -30,8 +35,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="${LUA_DEPS}
        app-arch/lz4:=
        >=dev-games/mygui-3.4.1
+       dev-cpp/yaml-cpp:=
+       dev-db/sqlite:3
        dev-games/recastnavigation:=
        dev-libs/boost:=[threads(+),zlib]
+       dev-libs/icu:=
        dev-libs/tinyxml[stl]
        media-libs/libsdl2[joystick,opengl,video]
        media-libs/openal
@@ -74,7 +82,7 @@ src_prepare() {
 
        # Use the system tinyxml headers
        rm -v extern/oics/tiny{str,xml}* || die
-       rm -rv extern/sol3.2.2 || die
+       rm -rv extern/sol3 || die
 }
 
 src_configure() {
@@ -92,7 +100,6 @@ src_configure() {
                -DBUILD_UNITTESTS=$(usex test)
                -DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
                -DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
-               -DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
                -DUSE_SYSTEM_TINYXML=ON
                -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
        )
@@ -111,6 +118,11 @@ src_configure() {
                )
        fi
 
+       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
+       fi
+
        cmake_src_configure
 }