[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 546afd11b7bde55829c409c406eac51c8d023d78
Author: Alexey Sokolov asokolov org>
AuthorDate: Thu Feb 22 22:46:38 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Mar 4 21:48:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546afd11
games-engines/openmw: fix build with gcc 14
Closes: https://bugs.gentoo.org/925105
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/35490
Signed-off-by: James Le Cuirot gentoo.org>
games-engines/openmw/files/openmw-0.48.0-gcc14.patch | 13 +
games-engines/openmw/openmw-0.48.0.ebuild| 4
2 files changed, 17 insertions(+)
diff --git a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
new file mode 100644
index ..b352d0536c8b
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
@@ -0,0 +1,13 @@
+Fix build with gcc 14
+https://bugs.gentoo.org/925105
+
+--- a/components/bsa/bsa_file.cpp
b/components/bsa/bsa_file.cpp
+@@ -26,6 +26,7 @@
+ #include
+
+ #include
++#include
+
+ #include
+ #include
diff --git a/games-engines/openmw/openmw-0.48.0.ebuild
b/games-engines/openmw/openmw-0.48.0.ebuild
index eb7f2b4e8286..287a32cb26c6 100644
--- a/games-engines/openmw/openmw-0.48.0.ebuild
+++ b/games-engines/openmw/openmw-0.48.0.ebuild
@@ -73,6 +73,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/openmw-0.48.0-gcc14.patch"
+)
+
src_prepare() {
cmake_src_prepare
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 05c2df081afa33374ebdf5405f43819578a06c65
Author: Alexey Sokolov asokolov org>
AuthorDate: Fri Sep 8 23:38:19 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Sep 9 00:46:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c2df08
games-engines/openmw: drop 0.47.0-r2
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/32696
Signed-off-by: Ionen Wolkens gentoo.org>
games-engines/openmw/Manifest | 1 -
.../openmw/files/openmw-0.47.0-gcc12.patch | 33 -
.../openmw/files/openmw-0.47.0-gcc13.patch | 22
.../openmw/files/openmw-0.47.0-mygui-license.patch | 16 ---
.../openmw/files/openmw-0.47.0-sigstksz.patch | 42 --
games-engines/openmw/openmw-0.47.0-r2.ebuild | 145 -
6 files changed, 259 deletions(-)
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 0bfdae772a9c..1146884524c0 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,2 @@
-DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B
40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d
SHA512
517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
DIST openmw-0.48.0.tar.gz 6020423 BLAKE2B
6a6f710f06efc0e844115018365db8148e9f6acefd453df74904144f53f5e896e9ab4d4f563ab95a3231500a2c1a5e1f8c5b6d6ac5c1315805c61657d13a7aa8
SHA512
969c10b285c039b54810c56f202f9c33bd03c83d87fec722c3389525e87fc7104760ea12527be5fb19a3f7ae2dc9aef0e4c6b7375d8bbcd6eb726e1d7859b833
DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730
BLAKE2B
bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e
SHA512
6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6
diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
deleted file mode 100644
index 4c04d7b25c78..
--- a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Backport missing includes causing issues with gcc12.
-https://bugs.gentoo.org/858725
-https://gitlab.com/OpenMW/openmw/-/commit/5f2e282359
-From: elsid
-Date: Tue, 17 May 2022 00:58:24 +0200
-Subject: [PATCH] Add includes for used types and functions
a/components/myguiplatform/myguidatamanager.cpp
-+++ b/components/myguiplatform/myguidatamanager.cpp
-@@ -1,8 +1,11 @@
- #include "myguidatamanager.hpp"
-
-+#include
-+#include
-+
- #include
-
--#include
-+#include
- #include
-
- #include
a/components/myguiplatform/myguidatamanager.hpp
-+++ b/components/myguiplatform/myguidatamanager.hpp
-@@ -3,6 +3,8 @@
-
- #include
-
-+#include
-+
- namespace osgMyGUI
- {
-
-GitLab
diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
b/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
deleted file mode 100644
index bb99b7c77880..
--- a/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix missing includes causing issues with gcc13.
-https://bugs.gentoo.org/905337
a/apps/openmw/mwinput/controlswitch.hpp
-+++ b/apps/openmw/mwinput/controlswitch.hpp
-@@ -3,6 +3,7 @@
-
- #include
- #include
-+#include
-
- namespace ESM
- {
a/components/misc/utf8stream.hpp
-+++ b/components/misc/utf8stream.hpp
-@@ -3,6 +3,7 @@
-
- #include
- #include
-+#include
-
- class Utf8Stream
- {
diff --git a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
deleted file mode 100644
index 3bf5915bb65d..
--- a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We don't install license files
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d69352c94..5f97c86e9 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -856,9 +856,6 @@ elseif(NOT APPLE)
- INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-wizard" DESTINATION
"${BINDIR}" )
- ENDIF(BUILD_WIZARD)
-
--# Install licenses
--INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION
"${LICDIR}" )
--
- # Install icon and desktop file
- INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop"
DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
- INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png"
DESTINATION "${ICONDIR}" COMPONENT "openmw")
diff --git a/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch
b/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch
deleted file mode 100644
index 588d6d639726..
---
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 924881b4e6497164f15f7145b3528f09af0099fd
Author: Alexey Sokolov asokolov org>
AuthorDate: Sat May 27 18:04:35 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun May 28 13:21:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924881b4
games-engines/openmw: fix build with gcc13
Closes: https://bugs.gentoo.org/905337
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/31190
Signed-off-by: Joonas Niilola gentoo.org>
.../openmw/files/openmw-0.47.0-gcc13.patch | 22 ++
games-engines/openmw/openmw-0.47.0-r2.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
b/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
new file mode 100644
index ..bb99b7c77880
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-gcc13.patch
@@ -0,0 +1,22 @@
+Fix missing includes causing issues with gcc13.
+https://bugs.gentoo.org/905337
+--- a/apps/openmw/mwinput/controlswitch.hpp
b/apps/openmw/mwinput/controlswitch.hpp
+@@ -3,6 +3,7 @@
+
+ #include
+ #include
++#include
+
+ namespace ESM
+ {
+--- a/components/misc/utf8stream.hpp
b/components/misc/utf8stream.hpp
+@@ -3,6 +3,7 @@
+
+ #include
+ #include
++#include
+
+ class Utf8Stream
+ {
diff --git a/games-engines/openmw/openmw-0.47.0-r2.ebuild
b/games-engines/openmw/openmw-0.47.0-r2.ebuild
index 91dd01645c25..98cbd99efd3a 100644
--- a/games-engines/openmw/openmw-0.47.0-r2.ebuild
+++ b/games-engines/openmw/openmw-0.47.0-r2.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
"${FILESDIR}"/openmw-0.47.0-sigstksz.patch
"${FILESDIR}"/openmw-0.47.0-gcc12.patch
+ "${FILESDIR}"/openmw-0.47.0-gcc13.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 59ff79ab1c87e63d8b6a6b5d9828f4bc48b56ec2
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Aug 27 23:52:39 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Aug 28 00:08:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ff79ab
games-engines/openmw: fix build with gcc12
Seeing users hit this, so fixing myself quick. Builds but not
thoroughly tested so there could be other issues.
Closes: https://bugs.gentoo.org/858725
Signed-off-by: Ionen Wolkens gentoo.org>
.../openmw/files/openmw-0.47.0-gcc12.patch | 33 ++
games-engines/openmw/openmw-0.47.0-r1.ebuild | 3 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
new file mode 100644
index ..4c04d7b25c78
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
@@ -0,0 +1,33 @@
+Backport missing includes causing issues with gcc12.
+https://bugs.gentoo.org/858725
+https://gitlab.com/OpenMW/openmw/-/commit/5f2e282359
+From: elsid
+Date: Tue, 17 May 2022 00:58:24 +0200
+Subject: [PATCH] Add includes for used types and functions
+--- a/components/myguiplatform/myguidatamanager.cpp
b/components/myguiplatform/myguidatamanager.cpp
+@@ -1,8 +1,11 @@
+ #include "myguidatamanager.hpp"
+
++#include
++#include
++
+ #include
+
+-#include
++#include
+ #include
+
+ #include
+--- a/components/myguiplatform/myguidatamanager.hpp
b/components/myguiplatform/myguidatamanager.hpp
+@@ -3,6 +3,8 @@
+
+ #include
+
++#include
++
+ namespace osgMyGUI
+ {
+
+GitLab
diff --git a/games-engines/openmw/openmw-0.47.0-r1.ebuild
b/games-engines/openmw/openmw-0.47.0-r1.ebuild
index 7dd2a4a0a958..0d9ccae64cb6 100644
--- a/games-engines/openmw/openmw-0.47.0-r1.ebuild
+++ b/games-engines/openmw/openmw-0.47.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -64,6 +64,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
"${FILESDIR}"/openmw-0.47.0-sigstksz.patch
+ "${FILESDIR}"/openmw-0.47.0-gcc12.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 7d9a09fdbbac2bcaaeb79ce9cc4d852f7f656101
Author: Alexey Sokolov asokolov org>
AuthorDate: Mon Dec 6 10:40:28 2021 +
Commit: David Seifert gentoo org>
CommitDate: Mon Dec 6 10:40:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9a09fd
games-engines/openmw: drop old
Closes: https://github.com/gentoo/gentoo/pull/23194
Closes: https://bugs.gentoo.org/794538
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: David Seifert gentoo.org>
games-engines/openmw/Manifest | 2 -
.../openmw/files/openmw-0.46.0-boost-1.77.patch| 10 -
.../openmw/files/openmw-0.46.0-fix-cast.patch | 214 -
.../openmw/files/openmw-0.46.0-floattest2.patch| 139 -
.../openmw/files/openmw-0.46.0-gcc11.patch | 36 ---
.../files/openmw-0.46.0-missing-include.patch | 19 --
.../openmw/files/openmw-0.46.0-mygui-license.patch | 16 -
.../files/openmw-0.46.0-nifbullet-test.patch | 335 -
.../files/openmw-0.46.0-recastnavigation.patch | 24 --
games-engines/openmw/openmw-0.46.0-r2.ebuild | 163 --
10 files changed, 958 deletions(-)
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 088a9b8fd26c..607fa30988f1 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1 @@
-DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B
060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea
SHA512
0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
-DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B
8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c
SHA512
da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B
40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d
SHA512
517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
diff --git a/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
b/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
deleted file mode 100644
index 708fd9e9f52f..
--- a/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bugs.gentoo.org/808763
-
a/components/vfs/filesystemarchive.cpp
-+++ b/components/vfs/filesystemarchive.cpp
-@@ -1,4 +1,5 @@
- #include "filesystemarchive.hpp"
-
-+#include
- #include
-
diff --git a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
deleted file mode 100644
index f6e82cb3a2c9..
--- a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
-
-From 208a50340db5506dded60c05272ce9692773baa9 Mon Sep 17 00:00:00 2001
-From: elsid
-Date: Mon, 13 Apr 2020 20:45:07 +0200
-Subject: [PATCH] Specialize DetourNavigator::ObjectId ctor for pointers
-
-To fix msvc error:
-components\detournavigator\objectid.hpp(14,13): error C2440:
'reinterpret_cast': cannot convert from 'const T' to 'size_t'
- with
- [
- T=unsigned long
- ]
-diff --git
a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-index 5275d9119e..e44ae48786 100644
a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-@@ -61,15 +61,15 @@ namespace
- {
- TileCachedRecastMeshManager manager(mSettings);
- const btBoxShape boxShape(btVector3(20, 20, 100));
--EXPECT_TRUE(manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
-+EXPECT_TRUE(manager.addObject(ObjectId(), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
- }
-
- TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
add_object_for_existing_object_should_return_false)
- {
- TileCachedRecastMeshManager manager(mSettings);
- const btBoxShape boxShape(btVector3(20, 20, 100));
--manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground);
--EXPECT_FALSE(manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
-+manager.addObject(ObjectId(), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground);
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: c1911b70f86e3f764570bd5bd32b5c6363d540d1
Author: Alexey Sokolov google com>
AuthorDate: Thu May 6 09:41:00 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu May 6 13:18:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1911b70
games-engines/openmw: fix build with gcc 11
Signed-off-by: Alexey Sokolov google.com>
Signed-off-by: Joonas Niilola gentoo.org>
.../openmw/files/openmw-0.46.0-gcc11.patch | 36 ++
games-engines/openmw/openmw-0.46.0.ebuild | 1 +
2 files changed, 37 insertions(+)
diff --git a/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
b/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
new file mode 100644
index 000..0dc3106fb3b
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
@@ -0,0 +1,36 @@
+diff --git a/components/sceneutil/mwshadowtechnique.cpp
b/components/sceneutil/mwshadowtechnique.cpp
+index cb3a1b2..62cfeec 100644
+--- a/components/sceneutil/mwshadowtechnique.cpp
b/components/sceneutil/mwshadowtechnique.cpp
+@@ -24,6 +24,7 @@
+ #include
+
+ #include
++#include
+
+ namespace {
+
+diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
+index 035c19a..aba1b81 100644
+--- a/components/sceneutil/shadow.cpp
b/components/sceneutil/shadow.cpp
+@@ -4,6 +4,7 @@
+
+ #include
+ #include
++#include
+
+ namespace SceneUtil
+ {
+diff --git a/components/terrain/quadtreeworld.cpp
b/components/terrain/quadtreeworld.cpp
+index f998b78..e0e47dd 100644
+--- a/components/terrain/quadtreeworld.cpp
b/components/terrain/quadtreeworld.cpp
+@@ -3,6 +3,7 @@
+ #include
+
+ #include
++#include
+
+ #include
+ #include
diff --git a/games-engines/openmw/openmw-0.46.0.ebuild
b/games-engines/openmw/openmw-0.46.0.ebuild
index ce3fb564e71..9b4a6bfa4e9 100644
--- a/games-engines/openmw/openmw-0.46.0.ebuild
+++ b/games-engines/openmw/openmw-0.46.0.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
# https://gitlab.com/OpenMW/openmw/-/merge_requests/163
"${DISTDIR}"/openmw-0.46.0-floattest.patch
"${FILESDIR}"/openmw-0.46.0-floattest2.patch
+ "${FILESDIR}"/openmw-0.46.0-gcc11.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 67601527665101d64ee8ffd265785d6524f7dedb
Author: Alexey Sokolov google com>
AuthorDate: Wed May 5 17:02:29 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu May 6 13:18:47 2021 +
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-.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..000
--- 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-.ebuild
b/games-engines/openmw/openmw-.ebuild
index d57328e79fe..7e624ccea45 100644
--- a/games-engines/openmw/openmw-.ebuild
+++ b/games-engines/openmw/openmw-.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() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 7a7657e01bf33cba95cf23d4877106b76f793fee
Author: Alexey Sokolov google com>
AuthorDate: Mon Mar 8 07:29:04 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Mar 8 07:35:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7657e0
games-engines/openmw: fix build of
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-.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 000..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-.ebuild
b/games-engines/openmw/openmw-.ebuild
index 70603fec46a..512ef385589 100644
--- a/games-engines/openmw/openmw-.ebuild
+++ b/games-engines/openmw/openmw-.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
)
[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
commit: 82798aecb9bff3f2a3c883b7f2fc14dc58ff0010
Author: Alexey Sokolov google com>
AuthorDate: Fri May 29 07:40:37 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jul 8 05:44:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82798aec
games-engines/openmw: version bump - 0.46.0
Add option to use forked OSG
Fix build on ~arch, fix tests on i686, fix installation on Prefix
Closes: https://bugs.gentoo.org/673864
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/16000
Signed-off-by: Joonas Niilola gentoo.org>
games-engines/openmw/Manifest | 2 +
.../openmw/files/openmw-0.46.0-fix-cast.patch | 214 +
.../openmw/files/openmw-0.46.0-floattest2.patch| 139 +
.../files/openmw-0.46.0-missing-include.patch | 19 ++
.../openmw/files/openmw-0.46.0-mygui-license.patch | 16 +
.../files/openmw-0.46.0-nifbullet-test.patch | 335 +
.../files/openmw-0.46.0-recastnavigation.patch | 24 ++
games-engines/openmw/metadata.xml | 2 +
.../{openmw-.ebuild => openmw-0.46.0.ebuild} | 43 ++-
games-engines/openmw/openmw-.ebuild| 32 +-
10 files changed, 803 insertions(+), 23 deletions(-)
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index fd925092a09..6f88c3b39a9 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1 +1,3 @@
DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B
85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e833129d64954cdcdb3af4eb4b84dc3
SHA512
b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
+DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B
060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea
SHA512
0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
+DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B
8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c
SHA512
da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
diff --git a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
new file mode 100644
index 000..f6e82cb3a2c
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
@@ -0,0 +1,214 @@
+Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
+
+From 208a50340db5506dded60c05272ce9692773baa9 Mon Sep 17 00:00:00 2001
+From: elsid
+Date: Mon, 13 Apr 2020 20:45:07 +0200
+Subject: [PATCH] Specialize DetourNavigator::ObjectId ctor for pointers
+
+To fix msvc error:
+components\detournavigator\objectid.hpp(14,13): error C2440:
'reinterpret_cast': cannot convert from 'const T' to 'size_t'
+ with
+ [
+ T=unsigned long
+ ]
+diff --git
a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+index 5275d9119e..e44ae48786 100644
+--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+@@ -61,15 +61,15 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+-EXPECT_TRUE(manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
++EXPECT_TRUE(manager.addObject(ObjectId(), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
add_object_for_existing_object_should_return_false)
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+-manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground);
+-EXPECT_FALSE(manager.addObject(ObjectId(1ul), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
++manager.addObject(ObjectId(), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground);
++EXPECT_FALSE(manager.addObject(ObjectId(), boxShape,
btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest,
update_object_for_changed_object_should_return_changed_tiles)
+@@ -77,9 +77,9 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape
