diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-17 19:04:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-17 19:04:28 +0100 |
| commit | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch) | |
| tree | 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /games-engines/openmw | |
| parent | 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff) | |
gentoo resync : 17.07.2021
Diffstat (limited to 'games-engines/openmw')
| -rw-r--r-- | games-engines/openmw/Manifest | 2 | ||||
| -rw-r--r-- | games-engines/openmw/openmw-9999.ebuild | 25 |
2 files changed, 23 insertions, 4 deletions
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest index 9f8eeaac40e2..a6c70f40083e 100644 --- a/games-engines/openmw/Manifest +++ b/games-engines/openmw/Manifest @@ -9,5 +9,5 @@ AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9de DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486 EBUILD openmw-0.46.0-r2.ebuild 4282 BLAKE2B 78ebe705fe5e2365b3a2e0684d7e8bffd4ea6c94e0890d4e67377d5b6b03dd6c86c13861106c660cc65c39691d4c4df1f09d016fcf5f5eafa65c0d1412b14d61 SHA512 0c77d328ff9398cb7fe361c5ce19653905adf41030e7f041be9a9948b4c88c1a3e84b0283e32afb960c8f30cd55d2019b128c2fb1ab9887ad678b072865dc969 -EBUILD openmw-9999.ebuild 3727 BLAKE2B 554dc7681cf47861b0e970387391ebb5f4f4a843cc73b6a8795c83bdd4a71133ca86b6b99dce2ff1972fc464d039183a3f46e9f34a59e13c101e93b78ae2a21f SHA512 a0030693c3b0f237a470da259ecf705101b2c217aeaa551ee0234d95b45f941eb388993681b4254fcb8f1d85c20df5292d541fd34569bcdf07defc9197f93e19 +EBUILD openmw-9999.ebuild 4172 BLAKE2B 2f19592efdea0f822a71b80b289b5e75e6b6eb8bfbf87c56967a3638362a519bf7696ba4a10e47c770e51769cc164255caba3d23f912abcbb386d977ba44fab0 SHA512 e51ce2640fb002ac389f2673e6d2f91b316a5965f8a8f2802910d1d9a3ced64ff94fb35eaa4995b6b3a0c6e89433214b4be39eb3205f3f4f43c5beb6749444b9 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild index 9b13f4d95f9d..82aa73331fdf 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 } |