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 A696D13835A for ; Mon, 8 Mar 2021 07:35:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0610FE0937; Mon, 8 Mar 2021 07:35:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E5B65E0937 for ; Mon, 8 Mar 2021 07:35:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2009B335D5A for ; Mon, 8 Mar 2021 07:35:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C869D587 for ; Mon, 8 Mar 2021 07:35:13 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1615188905.7a7657e01bf33cba95cf23d4877106b76f793fee.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch games-engines/openmw/openmw-9999.ebuild X-VCS-Directories: games-engines/openmw/files/ games-engines/openmw/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 7a7657e01bf33cba95cf23d4877106b76f793fee X-VCS-Branch: master Date: Mon, 8 Mar 2021 07:35:13 +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: 9c180982-ad74-4425-bd2c-1815a1567f80 X-Archives-Hash: 6b19eca678122ad22eb7aaa292f7bf30 commit: 7a7657e01bf33cba95cf23d4877106b76f793fee Author: Alexey Sokolov google com> AuthorDate: Mon Mar 8 07:29:04 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 8 07:35:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7657e0 games-engines/openmw: fix build of 9999 Closes: https://bugs.gentoo.org/773211 Signed-off-by: Alexey Sokolov google.com> Thanks-to: Benjamin Winger disroot.org> Signed-off-by: Joonas Niilola gentoo.org> .../openmw/files/openmw-0.47.0-bullet-debian.patch | 15 +++++++++++++++ games-engines/openmw/openmw-9999.ebuild | 10 ++++------ 2 files changed, 19 insertions(+), 6 deletions(-) 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 00000000000..3a8486250a8 --- /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 70603fec46a..512ef385589 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 )