-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Adds new version 14.3.4
- Updates workflows to use debian/ubuntu images- Loading branch information
Showing
8 changed files
with
587 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From e9c18904b7a252191ba2c48ae63b7e5eb4b7cd60 Mon Sep 17 00:00:00 2001 | ||
| From: Joakim Haugen <[email protected]> | ||
| Date: Thu, 13 Feb 2025 17:25:31 +0100 | ||
| Subject: [PATCH 1/4] Set rpath with origin variants | ||
|
|
||
| --- | ||
| CMakeLists.txt | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 14c3ee7e3..858dd7caa 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -420,8 +420,8 @@ mark_as_advanced( | ||
| ################################################################### | ||
| include(ConfigureBuild) | ||
|
|
||
| -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}") | ||
| -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) | ||
| +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};$ORIGIN;$ORIGIN/..;$ORIGIN/../lib;$ORIGIN/../lib/OGRE;$ORIGIN/../..") | ||
| +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) | ||
|
|
||
| ################################################################### | ||
| # disable way too common compiler warnings on project level | ||
| -- | ||
| 2.39.5 | ||
|
|
76 changes: 76 additions & 0 deletions
76
patches/14.3.4-0002-Remove-absolute-paths-from-ogre-config.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| From c871aad7779816320bbafc6aa1747f24771db073 Mon Sep 17 00:00:00 2001 | ||
| From: Joakim Haugen <[email protected]> | ||
| Date: Thu, 13 Feb 2025 17:30:27 +0100 | ||
| Subject: [PATCH 2/4] Remove absolute paths from ogre config | ||
|
|
||
| --- | ||
| CMake/InstallResources.cmake | 8 ++++---- | ||
| CMake/Templates/OgreConfigPaths.h.in | 6 +++--- | ||
| Components/Bites/src/OgreGLXConfigDialog.cpp | 3 +-- | ||
| 3 files changed, 8 insertions(+), 9 deletions(-) | ||
|
|
||
| diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake | ||
| index e24d9fa1b..43e791509 100644 | ||
| --- a/CMake/InstallResources.cmake | ||
| +++ b/CMake/InstallResources.cmake | ||
| @@ -33,10 +33,10 @@ endif() | ||
| if (NOT OGRE_PLUGINS_PATH) | ||
| if (WIN32) | ||
| set(OGRE_PLUGINS_PATH "${OGRE_BIN_DIRECTORY}") | ||
| - set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_BIN_DIRECTORY}") | ||
| + set(OGRE_PLUGIN_DIR_REL "../${OGRE_BIN_DIRECTORY}") | ||
| else () | ||
| set(OGRE_PLUGINS_PATH "${OGRE_LIB_DIRECTORY}/OGRE") | ||
| - set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE") | ||
| + set(OGRE_PLUGIN_DIR_REL "../../${OGRE_LIB_DIRECTORY}/OGRE") | ||
| endif() | ||
| else () | ||
| set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_PLUGINS_PATH}") | ||
| @@ -63,8 +63,8 @@ elseif (APPLE) | ||
| set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") | ||
| set(OGRE_CFG_INSTALL_PATH "bin") | ||
| elseif (UNIX) | ||
| - set(OGRE_TEST_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/Tests/Media") | ||
| - set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples") | ||
| + set(OGRE_TEST_MEDIA_DIR_REL "../../Tests/Media") | ||
| + set(OGRE_SAMPLES_DIR_REL "../${OGRE_LIB_DIRECTORY}/OGRE/Samples") | ||
| endif () | ||
|
|
||
| # generate OgreConfigPaths.h | ||
| diff --git a/CMake/Templates/OgreConfigPaths.h.in b/CMake/Templates/OgreConfigPaths.h.in | ||
| index d51aab547..e139f5922 100644 | ||
| --- a/CMake/Templates/OgreConfigPaths.h.in | ||
| +++ b/CMake/Templates/OgreConfigPaths.h.in | ||
| @@ -1,8 +1,8 @@ | ||
| #ifndef OGRECONFIGPATHS_H_ | ||
| #define OGRECONFIGPATHS_H_ | ||
|
|
||
| -#define OGRE_CONFIG_DIR "@CMAKE_INSTALL_PREFIX@/@OGRE_CFG_INSTALL_PATH@" | ||
| -#define OGRE_MEDIA_DIR "@CMAKE_INSTALL_PREFIX@/@OGRE_MEDIA_PATH@" | ||
| -#define OGRE_PLUGIN_DIR "@OGRE_PLUGIN_DIR_REL@" | ||
| +#define OGRE_CONFIG_DIR "@OGRE_CFG_INSTALL_PATH@" | ||
| +#define OGRE_MEDIA_DIR "@OGRE_MEDIA_PATH_REL@" | ||
| +#define OGRE_PLUGIN_DIR "@OGRE_PLUGIN_DIR_REL@" | ||
|
|
||
| #endif /* OGRECONFIGPATHS_H_ */ | ||
| diff --git a/Components/Bites/src/OgreGLXConfigDialog.cpp b/Components/Bites/src/OgreGLXConfigDialog.cpp | ||
| index 9ce1157e3..02ad00846 100644 | ||
| --- a/Components/Bites/src/OgreGLXConfigDialog.cpp | ||
| +++ b/Components/Bites/src/OgreGLXConfigDialog.cpp | ||
| @@ -337,7 +337,7 @@ Pixmap GLXConfigurator::CreateBackdrop(Window rootWindow, int depth) { | ||
| Image img; | ||
|
|
||
| // Load backdrop image using OGRE | ||
| - String path = FileSystemLayer::resolveBundlePath(OGRE_MEDIA_DIR "/../GLX_backdrop.png"); | ||
| + String path = FileSystemLayer::resolveBundlePath("../" OGRE_MEDIA_DIR "/GLX_backdrop.png"); | ||
| DataStreamPtr imgStreamPtr = Root::openFileStream(path); | ||
| img.load(imgStreamPtr, "png"); | ||
|
|
||
| @@ -501,4 +501,3 @@ bool ConfigDialog::display() | ||
| return true; | ||
| } | ||
| } | ||
| - | ||
| -- | ||
| 2.39.5 | ||
|
|
Oops, something went wrong.