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 F302A1382C5 for ; Thu, 6 May 2021 13:18:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FB8DE09B1; Thu, 6 May 2021 13:18:57 +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 22E39E09B1 for ; Thu, 6 May 2021 13:18:57 +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 03105340E63 for ; Thu, 6 May 2021 13:18:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CF4872E for ; Thu, 6 May 2021 13:18:54 +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: <1620307127.67601527665101d64ee8ffd265785d6524f7dedb.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: 67601527665101d64ee8ffd265785d6524f7dedb X-VCS-Branch: master Date: Thu, 6 May 2021 13:18:54 +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: 3fc1fa35-08b4-442b-9986-0a47e53f8470 X-Archives-Hash: f15ae770c2387cb5e27d211fa9822884 commit: 67601527665101d64ee8ffd265785d6524f7dedb Author: Alexey Sokolov google com> AuthorDate: Wed May 5 17:02:29 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu May 6 13:18:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67601527 games-engines/openmw: remove openmw-0.47.0-bullet-debian.patch https://gitlab.com/OpenMW/openmw/-/commit/e3a6cb1695336c834c9664eabc40028f01e3b99f includes it Signed-off-by: Alexey Sokolov google.com> Signed-off-by: Joonas Niilola gentoo.org> .../openmw/files/openmw-0.47.0-bullet-debian.patch | 15 --------------- games-engines/openmw/openmw-9999.ebuild | 1 - 2 files changed, 16 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 deleted file mode 100644 index 3a8486250a8..00000000000 --- a/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 d57328e79fe..7e624ccea45 100644 --- a/games-engines/openmw/openmw-9999.ebuild +++ b/games-engines/openmw/openmw-9999.ebuild @@ -63,7 +63,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/openmw-0.47.0-mygui-license.patch - "${FILESDIR}"/openmw-0.47.0-bullet-debian.patch ) src_prepare() {