summaryrefslogtreecommitdiff
path: root/dev-games
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-07-18 03:04:45 -0500
committerroot <root@alpha.trunkmasters.com>2026-07-18 03:04:45 -0500
commit08bfa3f8ec685ab603d0c1995d79d00a1a0fbe1a (patch)
tree1b4baa71dceb3809c3f4373acb9d1b4cc906dae2 /dev-games
parentc15a01fb364f840a250479998f64702430097a88 (diff)
downloadbaldeagleos-repo-08bfa3f8ec685ab603d0c1995d79d00a1a0fbe1a.tar.gz
baldeagleos-repo-08bfa3f8ec685ab603d0c1995d79d00a1a0fbe1a.tar.xz
baldeagleos-repo-08bfa3f8ec685ab603d0c1995d79d00a1a0fbe1a.zip
Adding metadata
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ogre/Manifest2
-rw-r--r--dev-games/ogre/files/ogre-14.4.0-avx512-nan.patch39
-rw-r--r--dev-games/ogre/files/ogre-14.5.2-clang22.patch20
-rw-r--r--dev-games/ogre/files/ogre-14.5.2-fix-tests.patch34
-rw-r--r--dev-games/ogre/ogre-14.5.2.ebuild (renamed from dev-games/ogre/ogre-14.4.0-r1.ebuild)5
5 files changed, 58 insertions, 42 deletions
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index b2264ce63849..bfbd18293062 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,3 +1,3 @@
DIST imgui-1.91.9b.tar.gz 1846599 BLAKE2B 4e12b099b186ee082da18baeb7b5a0418abba73a3f9d3bf79a720258acc6ed2052e8cea867321235fb5df30536a41b4e467dc55365cd5af781032713a179b8c4 SHA512 5d0b7fd9949242ef818531df298ad206bbd0d1e152cd06e6cd6eaab12a63ef836468d316e96cb3c4b368e29e5079d4f9f5ae204fc901a39d8ff6462d9133a5fa
-DIST ogre-14.4.0.tar.gz 94148698 BLAKE2B 9560629dc0da54e64bd29ced307a63ecb41203f772ed7adef69c19742ab0c4b45e6bb890969da66d51a2ac219df2d51e492143af2f7c4d925ae2a1cddc74faf6 SHA512 2752d2c585aa92c53f8c223d3e06964bea98240ac9536b3d4a943a7459e29b96f62e16a9e71ea72aac0744f180a96748aa7cd4eac91f7d72d11333846b18f33a
DIST ogre-14.4.1.tar.gz 94149361 BLAKE2B ece4e0b122b7313f9cc0afffdbbf483f9c6f51349fe33ff5bb9c105c6c24c3e7f990020332bb226e210121b6c17887a5707fcc126dce1739f87d17e8d585c08a SHA512 fbacb7c94beb1ba16b9f2185556c83086be3fb89196566e91bdb7a7655adda8139f1344aaa267d5fce7d83798f20e2f8fa31a9ad823bcbd1c3090c9c13d51183
+DIST ogre-14.5.2.tar.gz 94136285 BLAKE2B 76ee74d8335d233da3703446dcdcb440bf78f1554a777895f724f2cb463e47aa6b0cdaf9b86c1e8cbae625e25786b72a698a21698cc0a3e1ecd837d65068023d SHA512 74c83cd4248bce7c8ee603845e753acde0fe2efaa8edb5f3f0205bc43534d9334acd3e16c0f3836888aa77fc0ed43f739184181548509c59389aac494dac722b
diff --git a/dev-games/ogre/files/ogre-14.4.0-avx512-nan.patch b/dev-games/ogre/files/ogre-14.4.0-avx512-nan.patch
deleted file mode 100644
index 366c26acf97f..000000000000
--- a/dev-games/ogre/files/ogre-14.4.0-avx512-nan.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/961871
-https://github.com/OGRECave/ogre/issues/3431
-https://github.com/OGRECave/ogre/pull/3434
-
-From 2130758685a58b963ee1012e0bf0ef50859d38f5 Mon Sep 17 00:00:00 2001
-From: Pavel Rojtberg <rojtberg@gmail.com>
-Date: Sat, 23 Aug 2025 01:36:01 +0200
-Subject: [PATCH] Main: Bitwise - do not generate nan for bits=0
-
----
- OgreMain/include/OgreBitwise.h | 2 +-
- Tests/OgreMain/src/BitwiseTests.cpp | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/OgreMain/include/OgreBitwise.h b/OgreMain/include/OgreBitwise.h
-index 3ce2115546b..ab321cfc5fb 100644
---- a/OgreMain/include/OgreBitwise.h
-+++ b/OgreMain/include/OgreBitwise.h
-@@ -246,7 +246,7 @@ namespace Ogre {
- */
- static inline float fixedToFloat(unsigned value, unsigned int bits)
- {
-- return (float)value/(float)((1<<bits)-1);
-+ return bits ? (float)value/(float)((1<<bits)-1) : 0.0f;
- }
-
- /**
-diff --git a/Tests/OgreMain/src/BitwiseTests.cpp b/Tests/OgreMain/src/BitwiseTests.cpp
-index 2d482795904..3afb4e86acb 100644
---- a/Tests/OgreMain/src/BitwiseTests.cpp
-+++ b/Tests/OgreMain/src/BitwiseTests.cpp
-@@ -46,6 +46,7 @@ TEST(BitwiseTests,FixedPointConversion)
-
- EXPECT_EQ(Bitwise::fixedToFloat(0xFF, 8), 1.0f);
- EXPECT_EQ(Bitwise::fixedToFloat(0x00, 8), 0.0f);
-+ EXPECT_EQ(Bitwise::fixedToFloat(0xFF, 0), 0.0f);
-
- EXPECT_EQ(Bitwise::floatToFixed(1.0f, 8), (unsigned int)0xFF);
- EXPECT_EQ(Bitwise::floatToFixed(0.0f, 8), (unsigned int)0x00);
diff --git a/dev-games/ogre/files/ogre-14.5.2-clang22.patch b/dev-games/ogre/files/ogre-14.5.2-clang22.patch
new file mode 100644
index 000000000000..009f386da411
--- /dev/null
+++ b/dev-games/ogre/files/ogre-14.5.2-clang22.patch
@@ -0,0 +1,20 @@
+https://github.com/OGRECave/ogre/issues/3639
+https://github.com/OGRECave/ogre/pull/3642
+https://github.com/OGRECave/ogre/commit/6ededa21899d1f76c4bb1e471b7830311c5662d8
+
+From cb25260f1171617e6e78c427fd69fbf7a0d41027 Mon Sep 17 00:00:00 2001
+From: Pavel Rojtberg <rojtberg@gmail.com>
+Date: Sun, 31 May 2026 13:36:04 +0200
+Subject: [PATCH] Main: Mesh - add missing vector include
+
+--- a/OgreMain/include/OgreMesh.h
++++ b/OgreMain/include/OgreMesh.h
+@@ -30,6 +30,8 @@ THE SOFTWARE.
+
+ #include "OgrePrerequisites.h"
+
++#include <vector>
++
+ #include "OgreResource.h"
+ #include "OgreAxisAlignedBox.h"
+ #include "OgreVertexBoneAssignment.h"
diff --git a/dev-games/ogre/files/ogre-14.5.2-fix-tests.patch b/dev-games/ogre/files/ogre-14.5.2-fix-tests.patch
new file mode 100644
index 000000000000..4eb74eb8b7bc
--- /dev/null
+++ b/dev-games/ogre/files/ogre-14.5.2-fix-tests.patch
@@ -0,0 +1,34 @@
+https://github.com/OGRECave/ogre/issues/3640
+https://github.com/OGRECave/ogre/pull/3642
+https://github.com/OGRECave/ogre/commit/526fc2571ec7785822e440656ae841070f5901f5
+
+From 9d5ded11a1b6a7ea078816318fde64645d176e3c Mon Sep 17 00:00:00 2001
+From: Pavel Rojtberg <rojtberg@gmail.com>
+Date: Sun, 31 May 2026 13:48:23 +0200
+Subject: [PATCH] Plugins: DotScene - unregister in uninstall
+
+to match registration
+--- a/PlugIns/DotScene/include/OgreDotSceneLoader.h
++++ b/PlugIns/DotScene/include/OgreDotSceneLoader.h
+@@ -87,8 +87,8 @@ class _OgreDotScenePluginExport DotScenePlugin : public Plugin
+
+ void install() override;
+ void initialise() override {}
+- void shutdown() override;
+- void uninstall() override {}
++ void uninstall() override;
++ void shutdown() override {}
+ private:
+ Codec* mCodec;
+ };
+--- a/PlugIns/DotScene/src/DotSceneLoader.cpp
++++ b/PlugIns/DotScene/src/DotSceneLoader.cpp
+@@ -1143,7 +1143,7 @@ void DotScenePlugin::install()
+ Codec::registerCodec(mCodec);
+ }
+
+-void DotScenePlugin::shutdown() {
++void DotScenePlugin::uninstall() {
+ Codec::unregisterCodec(mCodec);
+ delete mCodec;
+ }
diff --git a/dev-games/ogre/ogre-14.4.0-r1.ebuild b/dev-games/ogre/ogre-14.5.2.ebuild
index 224da5506a69..4e06f4d73f39 100644
--- a/dev-games/ogre/ogre-14.4.0-r1.ebuild
+++ b/dev-games/ogre/ogre-14.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -74,7 +74,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-14.4.0-avx512-nan.patch
+ "${FILESDIR}"/ogre-14.5.2-fix-tests.patch
+ "${FILESDIR}"/ogre-14.5.2-clang22.patch
)
src_prepare() {