diff options
Diffstat (limited to 'graphics/ogre3d/files')
-rw-r--r-- | graphics/ogre3d/files/patch-Docs_CMakeLists.txt | 16 | ||||
-rw-r--r-- | graphics/ogre3d/files/patch-OgreBitwise.h | 12 | ||||
-rw-r--r-- | graphics/ogre3d/files/patch-OgreMain_include_Ogre.i (renamed from graphics/ogre3d/files/patch-Ogre.i) | 6 | ||||
-rw-r--r-- | graphics/ogre3d/files/patch-OgreMain_include_OgreBitwise.h | 12 | ||||
-rw-r--r-- | graphics/ogre3d/files/patch-OgreMain_include_OgrePlatformInformation.h | 10 |
5 files changed, 33 insertions, 23 deletions
diff --git a/graphics/ogre3d/files/patch-Docs_CMakeLists.txt b/graphics/ogre3d/files/patch-Docs_CMakeLists.txt index 59711416dd06..c8577f5ebbec 100644 --- a/graphics/ogre3d/files/patch-Docs_CMakeLists.txt +++ b/graphics/ogre3d/files/patch-Docs_CMakeLists.txt @@ -1,11 +1,11 @@ ---- Docs/CMakeLists.txt.orig 2019-04-24 16:21:46 UTC +--- Docs/CMakeLists.txt.orig 2023-07-07 21:29:06 UTC +++ Docs/CMakeLists.txt -@@ -16,7 +16,7 @@ - if (WIN32 OR APPLE) - set(OGRE_DOCS_PATH "Docs") - elseif (UNIX) -- set(OGRE_DOCS_PATH "share/OGRE/docs") -+ set(OGRE_DOCS_PATH "share/doc/ogre3d") +@@ -17,7 +17,7 @@ if (NOT OGRE_DOCS_PATH) + if (WIN32 OR APPLE) + set(OGRE_DOCS_PATH "Docs") + elseif (UNIX) +- set(OGRE_DOCS_PATH "share/doc/OGRE") ++ set(OGRE_DOCS_PATH "share/doc/ogre3d") + endif () endif () - # Build and install API documentation if doxygen is available diff --git a/graphics/ogre3d/files/patch-OgreBitwise.h b/graphics/ogre3d/files/patch-OgreBitwise.h deleted file mode 100644 index d44b87a3d0a3..000000000000 --- a/graphics/ogre3d/files/patch-OgreBitwise.h +++ /dev/null @@ -1,12 +0,0 @@ ---- OgreMain/include/OgreBitwise.h.orig 2019-03-30 05:11:05 UTC -+++ OgreMain/include/OgreBitwise.h -@@ -29,6 +29,9 @@ THE SOFTWARE. - #define _Bitwise_H__ - - #include "OgrePrerequisites.h" -+#undef bswap16 -+#undef bswap32 -+#undef bswap64 - - #ifndef __has_builtin - // Compatibility with non-clang compilers diff --git a/graphics/ogre3d/files/patch-Ogre.i b/graphics/ogre3d/files/patch-OgreMain_include_Ogre.i index eb89e0743ab0..eb0a6335ccf1 100644 --- a/graphics/ogre3d/files/patch-Ogre.i +++ b/graphics/ogre3d/files/patch-OgreMain_include_Ogre.i @@ -1,8 +1,8 @@ ---- OgreMain/include/Ogre.i.orig 2019-03-30 12:47:36 UTC +--- OgreMain/include/Ogre.i.orig 2023-07-07 21:29:06 UTC +++ OgreMain/include/Ogre.i -@@ -386,7 +386,7 @@ SHARED_PTR(HardwareUniformBuffer); - %ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool, Resource*) const; +@@ -611,7 +611,7 @@ SHARED_PTR(HardwarePixelBuffer); %ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool) const; + %ignore Ogre::ResourceGroupManager::getResourceManagerIterator; %include "OgreResourceGroupManager.h" -#if SWIG_VERSION < 0x030012 || defined(SWIGJAVA) +#if SWIG_VERSION <= 0x030012 || defined(SWIGJAVA) diff --git a/graphics/ogre3d/files/patch-OgreMain_include_OgreBitwise.h b/graphics/ogre3d/files/patch-OgreMain_include_OgreBitwise.h new file mode 100644 index 000000000000..2e21996f73b0 --- /dev/null +++ b/graphics/ogre3d/files/patch-OgreMain_include_OgreBitwise.h @@ -0,0 +1,12 @@ +--- OgreMain/include/OgreBitwise.h.orig 2021-08-04 18:33:45 UTC ++++ OgreMain/include/OgreBitwise.h +@@ -29,6 +29,9 @@ ------------------------------------------------------ + #define _Bitwise_H__ + + #include "OgrePrerequisites.h" ++#undef bswap16 ++#undef bswap32 ++#undef bswap64 + + #ifdef bswap16 + #undef bswap16 diff --git a/graphics/ogre3d/files/patch-OgreMain_include_OgrePlatformInformation.h b/graphics/ogre3d/files/patch-OgreMain_include_OgrePlatformInformation.h new file mode 100644 index 000000000000..be3a704ff2e6 --- /dev/null +++ b/graphics/ogre3d/files/patch-OgreMain_include_OgrePlatformInformation.h @@ -0,0 +1,10 @@ +--- OgreMain/include/OgrePlatformInformation.h.orig 2025-07-24 17:32:02 UTC ++++ OgreMain/include/OgrePlatformInformation.h +@@ -36,7 +36,7 @@ namespace Ogre { + #if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_MSVC + # define __OGRE_HAVE_SSE 1 + #elif OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && (OGRE_COMPILER == OGRE_COMPILER_GNUC || OGRE_COMPILER == OGRE_COMPILER_CLANG) && \ +- OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS ++ OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS && defined(__amd64__) + # define __OGRE_HAVE_SSE 1 + #endif |