update ogre to 1.12.9 (#14006)

fix Bites error
2024-11-28 04:09:00 +08:00 · 2020-10-14 04:23:43 +08:00 · 2020-10-14 04:23:43 +08:00 · 8e40ffc03f
commit 8e40ffc03f
parent ff41de2fd2
5 changed files with 61 additions and 44 deletions
--- a/ports/ogre/fix-dependency.patch
+++ b/ports/ogre/fix-dependency.patch
@ -1,8 +1,8 @@
 diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
-index 959fdf5..dcd28bb 100644
+index 2ae0b6694..068dd27dd 100644
 --- a/CMake/Dependencies.cmake
 +++ b/CMake/Dependencies.cmake
-@@ -217,7 +217,7 @@ find_package(FreeImage)
+@@ -242,7 +242,7 @@ find_package(FreeImage)
 macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "")
 
 # Find FreeType
@ -11,7 +11,16 @@ index 959fdf5..dcd28bb 100644
 macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
 
 # Find X11
-@@ -291,7 +291,7 @@ macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OG
+@@ -310,7 +310,7 @@ find_package(SWIG 3.0.8 QUIET)
+ macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "")
+ 
+ # pugixml
+-find_package(pugixml QUIET)
+find_package(pugixml CONFIG REQUIRED)
+ macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "")
+ 
+ # Assimp
+@@ -336,7 +336,7 @@ endif()
 # Find sdl2
 if(NOT ANDROID AND NOT EMSCRIPTEN)
   # find script does not work in cross compilation environment
@ -20,26 +29,3 @@ index 959fdf5..dcd28bb 100644
   macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "")
   if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
     add_library(SDL2::SDL2 INTERFACE IMPORTED)
-diff --git a/PlugIns/DotScene/CMakeLists.txt b/PlugIns/DotScene/CMakeLists.txt
-index fd285df..ab8e9c1 100644
--- a/PlugIns/DotScene/CMakeLists.txt
-+++ b/PlugIns/DotScene/CMakeLists.txt
-@@ -1,4 +1,4 @@
-find_package(pugixml QUIET)
-+find_package(pugixml CONFIG REQUIRED)
- 
- file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
- list(APPEND HEADER_FILES ${PROJECT_BINARY_DIR}/include/OgreDotScenePluginExports.h)
-diff --git a/Tools/XMLConverter/CMakeLists.txt b/Tools/XMLConverter/CMakeLists.txt
-index 8fe9683..2a516b2 100644
--- a/Tools/XMLConverter/CMakeLists.txt
-+++ b/Tools/XMLConverter/CMakeLists.txt
-@@ -22,7 +22,7 @@ set(SOURCE_FILES
- )
- 
- # allow override by cmake
-find_package(pugixml QUIET)
-+find_package(pugixml CONFIG REQUIRED)
- 
- add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES})
- target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
--- a/ports/ogre/fix-findimgui.patch
+++ b/ports/ogre/fix-findimgui.patch
@ -1,28 +1,41 @@
 diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
-index 1cea873..d3e756e 100644
+index df8f32af4..42be1e8f2 100644
 --- a/Components/Overlay/CMakeLists.txt
 +++ b/Components/Overlay/CMakeLists.txt
-@@ -19,12 +19,8 @@ list(APPEND HEADER_FILES
+@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES
 file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
 if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
+-  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
+-  if(NOT EXISTS ${IMGUI_DIR})
+-    message(STATUS "Dowloading imgui")
+-    file(DOWNLOAD
+-        https://github.com/ocornut/imgui/archive/v1.77.tar.gz
+-        ${PROJECT_BINARY_DIR}/imgui.tar.gz)
+-    execute_process(COMMAND ${CMAKE_COMMAND}
+-        -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+-  endif()
 -  list(APPEND SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/imgui.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/imgui_draw.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/imgui_widgets.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/imgui_demo.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/misc/freetype/imgui_freetype.cpp)
-+  find_package(imgui CONFIG REQUIRED)
-+  find_path(IMGUI_INCLUDE_DIR imgui.h)
+-    ${IMGUI_DIR}/imgui.cpp
+-    ${IMGUI_DIR}/imgui_draw.cpp
+-    ${IMGUI_DIR}/imgui_widgets.cpp
+-    ${IMGUI_DIR}/imgui_demo.cpp
+-    ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp)
+    find_package(imgui CONFIG REQUIRED)
+    find_path(IMGUI_INCLUDE_DIR imgui.h)
 else()
     list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp")
 endif()
-@@ -32,13 +28,13 @@ endif()
+@@ -41,13 +28,17 @@ endif()
 # setup target
 add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${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_LIBRARIES} ZLIB::ZLIB imgui::imgui)
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
+    target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui)
+else()
+    target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB)
+endif()
 target_include_directories(OgreOverlay PUBLIC 
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   $<INSTALL_INTERFACE:include/OGRE/Overlay>
@ -31,5 +44,22 @@ index 1cea873..d3e756e 100644
 -if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
 +if(0)
   target_include_directories(OgreOverlay PUBLIC
-     PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/imgui>"
-     PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/misc/freetype>")
+     PUBLIC "$<BUILD_INTERFACE:${IMGUI_DIR}>"
+     PRIVATE "$<BUILD_INTERFACE:${IMGUI_DIR}/misc/freetype>")
+diff --git "a/Components/Bites/CMakeLists.txt" "b/Components/Bites/CMakeLists.txt"
+index 5d58a8d74..fe41e4a28 100644
+--- "a/Components/Bites/CMakeLists.txt"
+++ "b/Components/Bites/CMakeLists.txt"
+@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN)
+   message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites")
+ endif()
+ 
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
+  find_package(imgui CONFIG REQUIRED)
+  target_link_libraries(OgreBites PRIVATE imgui::imgui)
+endif()
+
+ generate_export_header(OgreBites 
+     EXPORT_MACRO_NAME _OgreBitesExport
+     EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h)
+
--- a/ports/ogre/portfile.cmake
+++ b/ports/ogre/portfile.cmake
@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO OGRECave/ogre
-    REF 8ff1a4046716244fc4b3a3e44e5b6abeda755b0a #v1.12.7
-    SHA512 60c66118e35904cbabe881301f3e59026483507341450956f99b67220e1aaebd7035caac69c3e06cf45f08163254264da111b93d0c6b3402c3fba64858786b66
+    REF 7d0c8181ac43ad20bdba326abbd3deeddf310f0b #v1.12.9
+    SHA512 f223075f49a2465cd5070f5efa796aa715f3ea2fefd578e4ec0a11be2fd3330922849ed804e1df004209abafaa7b24ff42432dd79f336a56063e3cf38ae0e8c9
    HEAD_REF master
    PATCHES
        toolchain_fixes.patch
@ -59,6 +59,7 @@ vcpkg_configure_cmake(
        -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
        -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
        -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
+        -DFREETYPE_FOUND=ON
 # Optional stuff
        ${FEATURE_OPTIONS}
 # vcpkg specific stuff
--- a/ports/ogre/toolchain_fixes.patch
+++ b/ports/ogre/toolchain_fixes.patch
@ -23,7 +23,7 @@ diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
 index 06a055b..09d10bd 100644
 --- a/CMake/InstallResources.cmake
 +++ b/CMake/InstallResources.cmake
-@@ -201,10 +201,12 @@ endif ()
+@@ -204,10 +204,12 @@ endif ()
 # Create the CMake package files
 include(CMakePackageConfigHelpers)
 
@ -241,7 +241,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1602572..9fddbe7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -269,7 +269,7 @@ elseif(EMSCRIPTEN)
+@@ -271,7 +271,7 @@ elseif(EMSCRIPTEN)
 elseif (APPLE AND NOT APPLE_IOS)
 
   set(XCODE_ATTRIBUTE_SDKROOT macosx)
--- a/ports/ogre/vcpkg.json
+++ b/ports/ogre/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "ogre",
-  "version-string": "1.12.7",
+  "version-string": "1.12.9",
  "description": "3D Object-Oriented Graphics Rendering Engine",
  "homepage": "https://github.com/OGRECave/ogre",
  "dependencies": [