Add v14.1.0 and drop build of v13.5.0

sintef-ocean · Oct 26, 2023 · 1628c16 · 1628c16
1 parent 72688c8
commit 1628c16
Show file tree

Hide file tree

Showing 9 changed files with 21,532 additions and 6 deletions.
diff --git a/.github/workflows/ci-conan-clang.yml b/.github/workflows/ci-conan-clang.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.5.0, 13.6.5]
+        version: [13.6.5, 14.1.0]
         build_type: [Debug, Release]
         profile: [clang]
         compiler_version: [11, 12, 13, 14]

diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.5.0, 13.6.5]
+        version: [13.6.5, 14.1.0]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
         profile: [gcc]

diff --git a/.github/workflows/ci-conan-msvc.yml b/.github/workflows/ci-conan-msvc.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.5.0, 13.6.5]
+        version: [13.6.5, 14.1.0]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
         profile: [msvc17]

diff --git a/conandata.yml b/conandata.yml
@@ -1,5 +1,9 @@
 ---
 sources:
+  14.1.0:
+    sha256: b5ff3d7def376a42cbfa35cbf0c85464f69fb2815a5fe9c85e4a261358dbcc06
+    url:
+      - https://github.com/OGRECave/ogre/archive/refs/tags/v14.1.0.tar.gz
   13.6.5:
     sha256: 857f74d18c4bb484f0e31c288b8d27837615a59c3da2b3d8304496c83ef669cd
     url:
@@ -10,8 +14,30 @@ sources:
       - https://github.com/OGRECave/ogre/archive/refs/tags/v13.5.0.tar.gz
 
 dependencies:
-  #14.1.0:
-    # sdl: "[>=2.28.0 <2.30]" #
+  14.1.0:
+    assimp: 5.2.2
+    bullet3: 3.25
+    egl: system
+    freeimage: 3.18.0
+    freetype: 2.13.0
+    glslang: 11.7.0
+    gtest: 1.11.0
+    llvm-openmp: 12.0.1
+    cmake: "[>=3.16 <4]"
+    openexr: 2.5.7
+    opengl: system
+    openssl: "[>=1.1 <4]"
+    pugixml: 1.13
+    qt5: "[>=5.15 <6]"
+    qt6: "[>=6.1]"
+    sdl: "[>=2.28.0 <2.30]"
+    swig: "[>=4 <5]"
+    vulkan-loader: 1.3.243.0
+    xkbcommon: 1.6.0
+    xorg: system
+    zlib: "[>=1.2.11 <2]"
+    libjpeg: 9e
+    libpng: 1.6.40
   13.6.5:
     assimp: 5.2.2
     bullet3: 3.25
@@ -63,6 +89,11 @@ dependencies:
 
 
 patches:
+  14.1.0:
+    - patch_file: patches/14.1.0-0001-Set-rpath-with-origin-variants.patch
+    - patch_file: patches/14.1.0-0002-Remove-absolute-paths-from-ogre-config.patch
+    - patch_file: patches/14.1.0-0003-Fix-conanized-zip-linking-issue.patch
+    - patch_file: patches/14.1.0-0004-Do-conanization-fixes.patch
   13.6.5:
     - patch_file: patches/13.6.5-0001-Set-rpath-with-origin-variants.patch
     - patch_file: patches/13.6.5-0002-Remove-absolute-paths-from-ogre-config.patch

diff --git a/patches/13.6.5-0004-Do-conanization-fixes.patch b/patches/13.6.5-0004-Do-conanization-fixes.patch
@@ -135,7 +135,7 @@ index 4cec2898d..366db14f6 100644
 -    add_library(SDL2::SDL2 INTERFACE IMPORTED)
 -    set_target_properties(SDL2::SDL2 PROPERTIES
 +  if(OGRE_WITH_SDL)
-+    find_package(SDL2 MODULE QUIET)
++    find_package(SDL2)
 +    macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/")
 +    if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
 +      add_library(SDL2::SDL2 INTERFACE IMPORTED)

diff --git a/patches/14.1.0-0001-Set-rpath-with-origin-variants.patch b/patches/14.1.0-0001-Set-rpath-with-origin-variants.patch
@@ -0,0 +1,27 @@
+From 0077b01c5b558042c984ef586cc73b7b32f9c6a2 Mon Sep 17 00:00:00 2001
+From: Joakim Haugen <joakim.haugen@sintef.no>
+Date: Thu, 26 Oct 2023 14:33:43 +0200
+Subject: [PATCH] Set rpath with
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e04c61bcc..6e94a8052 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -427,8 +427,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.30.2
+
diff --git a/patches/14.1.0-0002-Remove-absolute-paths-from-ogre-config.patch b/patches/14.1.0-0002-Remove-absolute-paths-from-ogre-config.patch
@@ -0,0 +1,71 @@
+From fc0a1e92c926f86bd8c3f4e5edd9ad36a81f47ba Mon Sep 17 00:00:00 2001
+From: Joakim Haugen <joakim.haugen@sintef.no>
+Date: Thu, 26 Oct 2023 14:42:13 +0200
+Subject: [PATCH 1/2] Remove absolute paths from ogre config
+
+---
+ CMake/InstallResources.cmake                 | 8 ++++----
+ CMake/Templates/OgreConfigPaths.h.in         | 6 +++---
+ Components/Bites/src/OgreGLXConfigDialog.cpp | 2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
+index ad531b3cf..cc1285528 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..7fea892cc 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");
+
+-- 
+2.30.2
+