gentoo auto-resync : 29:11:2024 - 02:06:03

4 files changed, 57 insertions, 27 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 0a41f7b586b9..80c52568fea6 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 6d678d7ee437..0634ee53bb9a 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,7 +1,7 @@
 AUX openmw-0.48.0-Xt.patch 531 BLAKE2B 155a19ec9f341a3f424918ec8f8ebc853023a594750c0bc49fab34caac69c62f69a3f60a71e8988b81c7d66f9a6afef9c95592ad6122d5bbf3f1c8094fc87d12 SHA512 752ccf065dcd2bdee709f2f678b0b885008082c00292e9e9df658b4a606930614ba0d9552e697d4fbbd229fcff9139fd8eba4721c4d00b20afc9702072fa0ffd
-AUX openmw-0.48.0-gcc14.patch 593 BLAKE2B 775f8671ad303bf7ba1c630d4f86a8f7709d712e7f26de34a199fac42621df975671649e365b4f636904e1a23884dc073397a597f5905920c0042d5f418daaf3 SHA512 d66d9b6560c40b971cfc4100723bc1d7f5c8c262607d43781b311e4caa3e4d2b4700a269a106d12d64b34900439fb7cb427e42cbfc51477a4048891f28d08d7b
+AUX openmw-0.48.0-gcc14.patch 821 BLAKE2B 0582c273504fa220b2ad29b5e8b4748c0da19ddddfb701182c459d09c85da16adc842601fa7da9114f8f2e6dea7e0f25ef068438412e6e710b61abe7b17a856a SHA512 dc8a4f43032b53279afbc098b590740883bcacbf24188bcdb3a2570c8b316ffe024b46a63d9b251d64cebd3e6533586dbd9277dc0abacc824a696e7bff39108f
 DIST openmw-0.48.0.tar.gz 6020423 BLAKE2B 6a6f710f06efc0e844115018365db8148e9f6acefd453df74904144f53f5e896e9ab4d4f563ab95a3231500a2c1a5e1f8c5b6d6ac5c1315805c61657d13a7aa8 SHA512 969c10b285c039b54810c56f202f9c33bd03c83d87fec722c3389525e87fc7104760ea12527be5fb19a3f7ae2dc9aef0e4c6b7375d8bbcd6eb726e1d7859b833
 DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730 BLAKE2B bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e SHA512 6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6
 EBUILD openmw-0.48.0.ebuild 4796 BLAKE2B 33ee3f2595cb401e06bafe58fe611242dd4c845a9e727689c1c5342ca006ead66b1578905e6026da916817064832164aef0a1f55e796ccd4b4bac7e2c2f85fa8 SHA512 bdda82e6aec01e7711990479977e028f33dacd30304f4d72d711b7d4f78d8bdfaecaa1ada191ef4379865ea976e51c59a68f8eb22092907af9c1d348fdfa0099
-EBUILD openmw-9999.ebuild 4675 BLAKE2B ef25987d4cae7ba54a0a4a9693f4e2667fe5bc257cd588edb54b91c52fbe94a554f16ecf9eaec521a02fbd8427a87f59ecd74c3c16eef220e9e9f027c5ad00e2 SHA512 c3e7dd6a643dae9b5c5604586197ffe9ea4f4800ea73ed73e52d48a55b8ae521f253fc6c191a77713ed087ca374252fc70c4167d89987cefb2139752cf1066fd
+EBUILD openmw-9999.ebuild 5199 BLAKE2B 70dafd100163a5d220bdeedfa0b10bb0d3110765316c6000155cfc348f9d217342059058792f0dc707af414c0d55ea6122a65c72aad21d98e38d996c5af48e61 SHA512 90a81ea08f9695948ffc7225782ed9a808212ae84aebb58181a2fcf0161876f0c591bc6a018e48e9daf9a39adcd62b50f01f9f7b15f7c4bc4b445f098e7f12b6
 MISC metadata.xml 1454 BLAKE2B f0cfc77e752bbd3b7a4cd1bee5d7e76aa913e402525928980f728273807be80555fb03e8b9891d28fea8b941c3e632395322536f006b94dea5a00d74bced610b SHA512 9aa67b87fd886d8c3fe29f5eb3f5fbd943a7d690c1dca21a34746a286d0b193e36ec8c96b75554ca3f98c4d149dcd7e072aa702b09c6670d63739a3c8b766df3
diff --git a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
index 423aea9734af..d1214339ee2d 100644
--- a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
+++ b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
@@ -22,3 +22,13 @@ https://bugs.gentoo.org/925105
  #include <boost/filesystem/path.hpp>
 
  #include "character.hpp"
+--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
++++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include <algorithm>
+ #include <type_traits>
++#include <iomanip>
+ 
+ namespace
+ {
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index b1a63beee240..ee6896875926 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -14,30 +14,37 @@ 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 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
+# This particular commit is hardcoded in
+# https://gitlab.com/OpenMW/openmw/-/blob/ffe164b28d3a10408e20fdadd2f0168c1e32fd6e/apps/components_tests/CMakeLists.txt#L114-118
 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 )
+	test? (
+		https://gitlab.com/OpenMW/example-suite/-/raw/${MY_TEMPLATE_COMMIT}/game_template/data/template.omwgame
+		-> openmw-template-${MY_TEMPLATE_COMMIT}.omwgame
+	)
 "
 
 LICENSE="GPL-3 MIT BitstreamVera ZLIB"
 SLOT="0"
-IUSE="doc devtools +osg-fork test +qt5"
+IUSE="doc devtools +gui +osg-fork test"
 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.
+# TODO: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
+# used when BUILD_OPENCS flag is enabled.
+# OpenMW has custom changes to this library.
+# See bug #676266.
 
 RDEPEND="${LUA_DEPS}
 	app-arch/lz4:=
-	>=dev-games/mygui-3.4.3:=
 	dev-cpp/yaml-cpp:=
 	dev-db/sqlite:3
 	dev-games/recastnavigation:=
+	>=dev-games/mygui-3.4.3:=
 	dev-libs/boost:=[zlib]
 	dev-libs/icu:=
 	dev-libs/tinyxml[stl]
@@ -45,16 +52,14 @@ RDEPEND="${LUA_DEPS}
 	media-libs/openal
 	media-video/ffmpeg:=
 	>=sci-physics/bullet-2.86:=[double-precision]
+	sys-libs/zlib
 	virtual/opengl
 	osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] )
-	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] )
-	qt5? (
+	!osg-fork? ( >=dev-games/openscenegraph-3.6.5:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] )
+	gui? (
 		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
+		dev-qt/qtbase:6[gui,network,opengl,widgets]
+		dev-qt/qtsvg:6
 	)
 "
 
@@ -68,6 +73,9 @@ BDEPEND="
 		app-text/doxygen[dot]
 		dev-python/sphinx
 	)
+	gui? (
+		dev-qt/qttools:6[linguist]
+	)
 	test? (
 		dev-cpp/gtest
 	)
@@ -78,27 +86,34 @@ src_prepare() {
 
 	# Use the system tinyxml headers
 	rm -v extern/oics/tiny{str,xml}* || die
-	rm -rv extern/sol3 || die
+
+	# Use the system sol2 (v3) headers
+	rm -r extern/sol3 || die
 }
 
 src_configure() {
-	use devtools && ! use qt5 &&
-		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
+	use devtools && ! use gui &&
+		elog "'gui' USE flag is disabled, 'openmw-cs' will not be installed"
 
 	local mycmakeargs=(
 		-DBUILD_BSATOOL=$(usex devtools)
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_ESMTOOL=$(usex devtools)
-		-DBUILD_LAUNCHER=$(usex qt5)
+		-DBUILD_LAUNCHER=$(usex gui)
+		-DBUILD_OPENCS=$(usex devtools $(usex gui))
+		-DBUILD_WIZARD=$(usex gui)
 		-DBUILD_NIFTEST=$(usex devtools)
-		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
-		-DBUILD_WIZARD=$(usex qt5)
-		-DBUILD_UNITTESTS=$(usex test)
+		-DBUILD_COMPONENTS_TESTS=$(usex test)
+		-DBUILD_OPENMW_TESTS=$(usex test)
+		-DBUILD_OPENCS_TESTS=$(usex test $(usex devtools))
+
 		-DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
 		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
 		-DUSE_SYSTEM_TINYXML=ON
 		-DOPENMW_USE_SYSTEM_GOOGLETEST=ON
 		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
+
+		-DQT_DIR="${ESYSROOT}/usr/lib64/cmake/Qt6"
 	)
 
 	if [[ ${ELUA} == luajit ]]; then
@@ -116,9 +131,9 @@ src_configure() {
 	fi
 
 	if use test ; then
-		mkdir -p "${BUILD_DIR}"/apps/openmw_test_suite/data || die
+		mkdir -p "${BUILD_DIR}"/apps/components_tests/data || die
 		cp "${DISTDIR}"/openmw-template-${MY_TEMPLATE_COMMIT}.omwgame \
-			"${BUILD_DIR}"/apps/openmw_test_suite/data/template.omwgame || die
+			"${BUILD_DIR}"/apps/components_tests/data/template.omwgame || die
 	fi
 
 	cmake_src_configure
@@ -142,8 +157,13 @@ src_test() {
 		elog "Skipping tests on ${ELUA}"
 		return
 	fi
+
 	pushd "${BUILD_DIR}" > /dev/null || die
-	./openmw_test_suite || die
+	./components-tests || die
+	./openmw-tests || die
+	if use gui && use devtools; then
+		./openmw-cs-tests || die
+	fi
 	popd > /dev/null || die
 }
 
@@ -157,9 +177,9 @@ src_install() {
 	(either by using the launcher or by calling 'openmw-wizard'
 	directly).\n"
 
-	if ! use qt5; then
+	if ! use gui ; then
 		DOC_CONTENTS+="\n\n
-		USE flag 'qt5' is disabled, 'openmw-launcher' and
+		USE flag 'gui' is disabled, 'openmw-launcher' and
 		'openmw-wizard' are not available. You are on your own for
 		making the Morrowind data files available and pointing
 		openmw at them.\n\n