From ad2652a1bd7376a831b34ca5501aad0f4fd362bc Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Fri, 28 Oct 2022 12:54:18 +0200
Subject: [PATCH] :arrow_up: Updated pagedgeometry and caelum

---
 ogre-caelum/all/conandata.yml                 |  3 +++
 .../{0.6.4 => 2022.08}/CMakeLists.txt.patch   |  0
 ogre-caelum/config.yml                        |  2 +-
 ogre-pagedgeometry/all/conandata.yml          |  5 ++++-
 .../all/patches/1.3.0/CMakeLists.txt.patch    | 20 -------------------
 .../all/patches/2022.08/CMakeLists.txt.patch  | 20 +++++++++++++++++++
 ogre-pagedgeometry/config.yml                 |  2 +-
 7 files changed, 29 insertions(+), 23 deletions(-)
 rename ogre-caelum/all/patches/{0.6.4 => 2022.08}/CMakeLists.txt.patch (100%)
 delete mode 100644 ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch
 create mode 100644 ogre-pagedgeometry/all/patches/2022.08/CMakeLists.txt.patch

diff --git a/ogre-caelum/all/conandata.yml b/ogre-caelum/all/conandata.yml
index 69ac9d0..22985b2 100644
--- a/ogre-caelum/all/conandata.yml
+++ b/ogre-caelum/all/conandata.yml
@@ -3,5 +3,8 @@ sources:
     url: "https://github.com/OGRECave/ogre-caelum/archive/94913d2040a41148c14001c33a0bdc0f100842f8.zip"
     sha256: "9de4159ae8050fd0858b3c1c09005aa50b36079a3a06accfb67203669be9a09e"
   "0.6.4":
+    url: "https://github.com/OGRECave/ogre-caelum/archive/4bd1b0581d55896d37922483981582661ca557de.zip"
+    sha256: "deffe26ba169d89954f62ade50e856fdae293078c73836378d7bf3051eff0a8d"
+  "2022.08":
     url: "https://github.com/OGRECave/ogre-caelum/archive/4bd1b0581d55896d37922483981582661ca557de.zip"
     sha256: "deffe26ba169d89954f62ade50e856fdae293078c73836378d7bf3051eff0a8d"
\ No newline at end of file
diff --git a/ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch b/ogre-caelum/all/patches/2022.08/CMakeLists.txt.patch
similarity index 100%
rename from ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch
rename to ogre-caelum/all/patches/2022.08/CMakeLists.txt.patch
diff --git a/ogre-caelum/config.yml b/ogre-caelum/config.yml
index 34796f7..404c35f 100644
--- a/ogre-caelum/config.yml
+++ b/ogre-caelum/config.yml
@@ -1,5 +1,5 @@
 versions:
   "0.6.3":
     folder: all
-  "0.6.4":
+  "2022.08":
     folder: all
diff --git a/ogre-pagedgeometry/all/conandata.yml b/ogre-pagedgeometry/all/conandata.yml
index 77688b4..b7e85ae 100644
--- a/ogre-pagedgeometry/all/conandata.yml
+++ b/ogre-pagedgeometry/all/conandata.yml
@@ -4,4 +4,7 @@ sources:
     sha256: "513043eecf1aaf6f8b2335c953b0664128aa492007fe3d93068e5f4be436093a"
   "1.3.0":
     url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/18ca8a0abd26cb5d52b99ad8e8fa0c8f7e6e7d79.zip"
-    sha256: "4a3d97d75f7417208403bd0f5e8c3b010ae0dd9a36968f78ecc5cd0161b2ddb9"
\ No newline at end of file
+    sha256: "4a3d97d75f7417208403bd0f5e8c3b010ae0dd9a36968f78ecc5cd0161b2ddb9"
+  "2022.08":
+    url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/8637c7f4b6238ced28e741bb6e4d4ddc8b60b477.zip"
+    sha256: "b83884652dc773e6c58e8efebfb950de714f6e34161a0fb388d2f546efea3a87"
\ No newline at end of file
diff --git a/ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch b/ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch
deleted file mode 100644
index 94fffc9..0000000
--- a/ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -7,7 +7,7 @@
- # cmake system for PagedGeometry updated on 2-9-2021 by Edgar{at}AnotherFoxGuy{DOT}com
- 
- cmake_minimum_required(VERSION 3.0.2)
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
-+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
- 
- # define the project
- project(
-@@ -101,7 +101,7 @@
- ENDIF ()
- 
- # --- Ogre 3D graphics engine ---
--find_package(OGRE REQUIRED CONFIG)
-+find_package(OGRE REQUIRED)
- 
- # now add the directories
- add_subdirectory(source)
diff --git a/ogre-pagedgeometry/all/patches/2022.08/CMakeLists.txt.patch b/ogre-pagedgeometry/all/patches/2022.08/CMakeLists.txt.patch
new file mode 100644
index 0000000..1d14aab
--- /dev/null
+++ b/ogre-pagedgeometry/all/patches/2022.08/CMakeLists.txt.patch
@@ -0,0 +1,20 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -8,6 +8,8 @@
+ 
+ cmake_minimum_required(VERSION 3.1)
+ 
++set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
++
+ # define the project
+ project(
+         PagedGeometry
+@@ -100,7 +102,7 @@
+ ENDIF ()
+ 
+ # --- Ogre 3D graphics engine ---
+-find_package(OGRE REQUIRED CONFIG)
++find_package(OGRE REQUIRED)
+ 
+ # now add the directories
+ add_subdirectory(source)
diff --git a/ogre-pagedgeometry/config.yml b/ogre-pagedgeometry/config.yml
index 5466b7d..10c724c 100644
--- a/ogre-pagedgeometry/config.yml
+++ b/ogre-pagedgeometry/config.yml
@@ -1,5 +1,5 @@
 versions:
   "1.2.0":
     folder: all
-  "1.3.0":
+  "2022.08":
     folder: all