🔨 Reduce amount of patches for OGRE 1.11

ogre/1.11/conandata.yml

@@ -5,9 +5,7 @@ sources:
 patches:
   "1.11.6.1":
     - patch_file: "patches/1.11.6.1/CMakeLists.txt.patch"
-    - patch_file: "patches/1.11.6.1/Dependencies.cmake.patch"
     - patch_file: "patches/1.11.6.1/Samples-CMakeList.txt.patch"
-    - patch_file: "patches/1.11.6.1/AddLibPNG.patch"
     - patch_file: "patches/1.11.6.1/FindPkgMacros.cmake.patch"
 requirements:
   - "zlib/[1.x]"

ogre/1.11/conanfile.py

@@ -8,7 +8,7 @@ class OGREConan(ConanFile):
     url = "https://github.com/AnotherFoxGuy/conan-OGRE"
     description = "scene-oriented, flexible 3D engine written in C++"
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake_paths"
+    generators = "cmake_paths", "cmake_find_package"
     exports_sources = "patches/**"
 
     def requirements(self):

ogre/1.11/patches/1.11.6.1/AddLibPNG.patch

@@ -1,32 +0,0 @@
---- Components/Overlay/CMakeLists.txt
-+++ Components/Overlay/CMakeLists.txt
-@@ -11,6 +11,20 @@
- # Overlay optional component
- ############################################################
- 
-+# FreeType from conan has seperate libraries
-+find_package(PNG)
-+find_package(BZip2)
-+
-+find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static)
-+find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static)
-+
-+if(NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLICOMMON_LIBRARY-NOTFOUND" AND NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLIDEC_LIBRARY-NOTFOUND")
-+  set(BROTLI_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY})
-+  message(STATUS "Brotli libraries found: ${BROTLI_LIBRARIES}")
-+else()
-+  message(WARNING "Brotli library not found: ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}")
-+endif()
-+
- # define header and source files for the library
- file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
- list(APPEND HEADER_FILES 
-@@ -21,7 +35,7 @@
- # setup target
- add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
- set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
--target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB)
-+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE Freetype::Freetype ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB)
- target_include_directories(OgreOverlay PUBLIC 
-   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-   $<INSTALL_INTERFACE:include/OGRE/Overlay>

ogre/1.11/patches/1.11.6.1/CMakeLists.txt.patch

@@ -8,4 +8,13 @@
 +
  set(CMAKE_CXX_STANDARD 11)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+@@ -63,6 +65,7 @@
+ 
+ # Include necessary submodules
+ set(CMAKE_MODULE_PATH
++  "${CMAKE_BINARY_DIR}"
+   "${PROJECT_SOURCE_DIR}/CMake"
+   "${PROJECT_SOURCE_DIR}/CMake/Utils"
+   "${PROJECT_SOURCE_DIR}/CMake/Packages"
+

ogre/1.11/patches/1.11.6.1/Dependencies.cmake.patch

@@ -1,11 +0,0 @@
---- CMake/Dependencies.cmake
-+++ CMake/Dependencies.cmake
-@@ -13,7 +13,7 @@
- 
- # OGRE_DEPENDENCIES_DIR can be used to specify a single base
- # folder where the required dependencies may be found.
--set(OGRE_DEPENDENCIES_DIR "" CACHE PATH "Path to prebuilt OGRE dependencies")
-+set(OGRE_DEPENDENCIES_DIR ${CMAKE_PREFIX_PATH})
- option(OGRE_BUILD_DEPENDENCIES "automatically build Ogre Dependencies (freetype, zzip)" TRUE)
- 
- include(FindPkgMacros)