[patch] Patch to fix the build, based on patch above

openmw.patch (text/plain), 2.45 KB, created by Alexey on 2021-03-07 21:33:44 UTC

commit df37ef3c787e7f91b9a387814093b9ea4ba56e00
Author: Alexey Sokolov <[e-mail]>
Date:   Sun Mar 7 21:27:57 2021 +0000

    games-engines/openmw: fix build of 9999
    
    Closes: https://bugs.gentoo.org/773211
    Signed-off-by: Alexey Sokolov <[e-mail]>

diff --git a/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch b/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch
new file mode 100644
index 000000000..3a8486250
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch
@@ -0,0 +1,15 @@
+This condition makes it link to wrong library on Gentoo Prefix on Debian
+--- a/components/CMakeLists.txt
++++ b/components/CMakeLists.txt
+@@ -246,11 +246,7 @@ target_link_libraries(components
+     RecastNavigation::Recast
+     )
+ 
+-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
+-    target_link_libraries(components BulletCollision-float64 LinearMath-float64)
+-else()
+     target_link_libraries(components ${BULLET_LIBRARIES})
+-endif()
+ 
+ if (WIN32)
+     target_link_libraries(components
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 70603fec4..512ef3855 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ RESTRICT="!test? ( test )"
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
 RDEPEND="
+	app-arch/lz4
 	dev-games/mygui
 	dev-games/recastnavigation
 	dev-libs/boost:=[threads]
@@ -62,7 +63,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
-	"${FILESDIR}"/openmw-0.46.0-recastnavigation.patch
+	"${FILESDIR}"/openmw-0.47.0-bullet-debian.patch
 )
 
 src_prepare() {
@@ -70,10 +71,6 @@ src_prepare() {
 
 	# Use the system tinyxml headers
 	rm -v extern/oics/tiny{str,xml}* || die
-
-	# Unbundle recastnavigation
-	rm -vr extern/recastnavigation || die
-	sed -i "s#GENTOO_RECAST_LIBDIR#${EPREFIX}/usr/$(get_libdir)#" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -95,6 +92,7 @@ src_configure() {
 		-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
 		-DDESIRED_QT_VERSION=5
 		-DBULLET_USE_DOUBLES=ON
 	)