From ad4f562213f463a3a6578bccf36454ac4ea74ed3 Mon Sep 17 00:00:00 2001 From: Edgar Date: Wed, 2 Nov 2022 16:00:55 +0100 Subject: [PATCH 1/5] :arrow_up: Updated OGRE to 13.5 --- ogre/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogre/CMakeLists.txt b/ogre/CMakeLists.txt index 80be6753..05bdc758 100644 --- a/ogre/CMakeLists.txt +++ b/ogre/CMakeLists.txt @@ -13,8 +13,8 @@ endif () # First build the required dependencies for Ogre itself. They are provided in a dedicated repository. ExternalProject_Add( ogredeps - URL https://github.com/AnotherFoxGuy/ogredeps/archive/17f4c583c82559074a96f1436670a4f10961b9d9.tar.gz - URL_MD5 d5425da9f4ffa9f24dd021e32a8665ad + URL https://github.com/AnotherFoxGuy/ogredeps/archive/9bb6925e815273ce6bee031e06e4df2a588f8cf3.tar.gz + URL_MD5 0f79899efa51ad1dd45f379525f3f6ad CMAKE_ARGS -DOGREDEPS_BUILD_AMD_QBS=OFF -DOGREDEPS_BUILD_NVIDIA_NVAPI=OFF @@ -41,8 +41,8 @@ endif () ExternalProject_Add( ogre DEPENDS ogredeps - URL https://github.com/OGRECave/ogre/archive/refs/tags/v1.11.6.tar.gz - URL_MD5 36ca3915aa41a0351bdf08b3953e9ae2 + URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.5.0.tar.gz + URL_MD5 d97f33be47f8af873c0e82bb70f0f0f6 PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_OUTPUT_DIR} From 3be59e615d3fed7940e10da6c7e83958a65c7389 Mon Sep 17 00:00:00 2001 From: Edgar Date: Thu, 3 Nov 2022 11:16:21 +0100 Subject: [PATCH 2/5] :arrow_up: Updated caelum, mygui and pagedgeometry --- caelum/CMakeLists.txt | 4 ++-- mygui/CMakeLists.txt | 4 ++-- pagedgeometry/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/caelum/CMakeLists.txt b/caelum/CMakeLists.txt index 7751e6cc..4a131aed 100644 --- a/caelum/CMakeLists.txt +++ b/caelum/CMakeLists.txt @@ -15,8 +15,8 @@ endif () ExternalProject_Add( caelum DEPENDS ogre - URL https://github.com/RigsOfRods/ogre-caelum/archive/70fcf62f306288c9472cc03a42367c9625c839ea.tar.gz - URL_MD5 6fa41168cb93d67e7169d0e8e2d73f24 + URL https://github.com/OGRECave/ogre-caelum/archive/4bd1b0581d55896d37922483981582661ca557de.tar.gz + URL_MD5 e6378f99faf131624b364829de9d0b8a CMAKE_ARGS -DCaelum_BUILD_SAMPLES=FALSE -DINSTALL_OGRE_PLUGIN=OFF diff --git a/mygui/CMakeLists.txt b/mygui/CMakeLists.txt index acfa6579..a8b310ca 100644 --- a/mygui/CMakeLists.txt +++ b/mygui/CMakeLists.txt @@ -1,8 +1,8 @@ ExternalProject_Add( mygui DEPENDS ogre - URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.0.tar.gz - URL_MD5 30e64cdb3dc09a209259a5ffd13dc2ab + URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.1.tar.gz + URL_MD5 bceded801d68f7aedeb14099d1fdfcbb CMAKE_ARGS -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON -DCMAKE_PREFIX_PATH=${DEPENDENCIES_OUTPUT_DIR} diff --git a/pagedgeometry/CMakeLists.txt b/pagedgeometry/CMakeLists.txt index d8f33166..bb2e728c 100644 --- a/pagedgeometry/CMakeLists.txt +++ b/pagedgeometry/CMakeLists.txt @@ -14,8 +14,8 @@ endif () ExternalProject_Add( pagedgeometry DEPENDS ogre - URL https://github.com/RigsOfRods/ogre-pagedgeometry/archive/9b4ee07dd7a884c667fc4051523b26b746bbd2c7.tar.gz - URL_MD5 5514a85cccd4132594d17582f9273047 + URL https://github.com/OGRECave/ogre-pagedgeometry/archive/8637c7f4b6238ced28e741bb6e4d4ddc8b60b477.tar.gz + URL_MD5 32b282190b78a6146f2f1388ccb56b08 CMAKE_ARGS -DPAGEDGEOMETRY_BUILD_SAMPLES=OFF -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/OgreDependencies/;${DEPENDENCIES_OUTPUT_DIR} From 4d526560ea6fb5cc08da2ce1bb3009136e590e42 Mon Sep 17 00:00:00 2001 From: Edgar Date: Sun, 15 Jan 2023 11:58:04 +0100 Subject: [PATCH 3/5] :arrow_up: Updated OGRE to 13.6.0 --- CMakeLists.txt | 2 +- ogre/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e264016..9e2c5dc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ endif () # the ExternalProject module of CMake to build the individual dependencies. # ------------------------------------------------------------------------------------------------# -project(ror-dependencies VERSION 30) +project(ror-dependencies VERSION 31) # ------------------------------------------------------------------------------------------------# diff --git a/ogre/CMakeLists.txt b/ogre/CMakeLists.txt index 05bdc758..8045de14 100644 --- a/ogre/CMakeLists.txt +++ b/ogre/CMakeLists.txt @@ -41,9 +41,9 @@ endif () ExternalProject_Add( ogre DEPENDS ogredeps - URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.5.0.tar.gz - URL_MD5 d97f33be47f8af873c0e82bb70f0f0f6 - PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch + URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.0.tar.gz + URL_HASH SHA256=d32e58ad18d5fd9518f6a0dff4e566c281adc7a458b8231aa730983a8646bf95 + #PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_OUTPUT_DIR} -DOGRE_DEPENDENCIES_DIR=${DEPENDENCIES_OUTPUT_DIR} From be21bb8e733f2ade344a329b2fcd036a419c9b1a Mon Sep 17 00:00:00 2001 From: Edgar Date: Tue, 23 May 2023 10:51:53 +0200 Subject: [PATCH 4/5] :arrow_up: Updated OGRE to 13.6.4 --- ogre/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogre/CMakeLists.txt b/ogre/CMakeLists.txt index 8045de14..59a86d47 100644 --- a/ogre/CMakeLists.txt +++ b/ogre/CMakeLists.txt @@ -41,8 +41,8 @@ endif () ExternalProject_Add( ogre DEPENDS ogredeps - URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.0.tar.gz - URL_HASH SHA256=d32e58ad18d5fd9518f6a0dff4e566c281adc7a458b8231aa730983a8646bf95 + URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.4.tar.gz + URL_HASH SHA256=9a8bde4884b2ce66594d2192c5147a07ad0e7b0fc87de86c798597142867d272 #PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_OUTPUT_DIR} From 19098d7c0a2e95c2ebbf0eacb6e8000290a90238 Mon Sep 17 00:00:00 2001 From: Edgar Date: Tue, 23 May 2023 10:52:12 +0200 Subject: [PATCH 5/5] :arrow_up: Updated MyGUI to 3.4.2 --- mygui/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mygui/CMakeLists.txt b/mygui/CMakeLists.txt index a8b310ca..ac8d1ff9 100644 --- a/mygui/CMakeLists.txt +++ b/mygui/CMakeLists.txt @@ -1,8 +1,8 @@ ExternalProject_Add( mygui DEPENDS ogre - URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.1.tar.gz - URL_MD5 bceded801d68f7aedeb14099d1fdfcbb + URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.2.tar.gz + URL_HASH SHA256=1cc45fb96c9438e3476778449af0378443d84794a458978a29c75306e45dd45a CMAKE_ARGS -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON -DCMAKE_PREFIX_PATH=${DEPENDENCIES_OUTPUT_DIR}