gentoo resync : 23.09.2020

5 files changed, 17 insertions, 7 deletions

diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch
index 49ed0190e0a1..49ed0190e0a1 100644
--- a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch
diff --git a/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch
new file mode 100644
index 000000000000..12b4ce86a86f
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch
@@ -0,0 +1,11 @@
+--- a/Components/Bites/src/OgreGLXConfigDialog.cpp	2020-09-21 15:17:33.783741691 +0200
++++ b/Components/Bites/src/OgreGLXConfigDialog.cpp	2020-09-21 15:17:35.948741768 +0200
+@@ -74,7 +74,7 @@
+ class GLXConfigurator {
+     /* GUI constants */
+     static const int wWidth = 500;      // Width of window
+-    static const int wHeight = 380;     // Height of window
++    static const int wHeight = 340;     // Height of window
+     static const int col1x = 20;        // Starting x of column 1 (labels)
+     static const int col2x = 230;       // Starting x of column 2 (options)
+     static const int col1w = 200;       // Width of column 1 (labels)
diff --git a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch
index 4c7803a0a2f2..765a53d4695c 100644
--- a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch
@@ -1,17 +1,16 @@
---- a/Components/Overlay/CMakeLists.txt	2020-08-16 17:45:59.605165822 +0200
-+++ b/Components/Overlay/CMakeLists.txt	2020-08-16 17:48:45.796175402 +0200
+--- a/Components/Overlay/CMakeLists.txt	2020-09-20 16:13:41.280993468 +0200
++++ b/Components/Overlay/CMakeLists.txt	2020-09-20 16:14:52.468997571 +0200
 @@ -19,14 +19,14 @@
  file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
  
  if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
--  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "")
-+  set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "")
+-  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
++  set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.77" CACHE PATH "")
    if(NOT EXISTS ${IMGUI_DIR})
      message(STATUS "Dowloading imgui")
      file(DOWNLOAD
--        https://github.com/ocornut/imgui/archive/v1.73.tar.gz
+         https://github.com/ocornut/imgui/archive/v1.77.tar.gz
 -        ${PROJECT_BINARY_DIR}/imgui.tar.gz)
-+        https://github.com/ocornut/imgui/archive/v1.76.tar.gz
 +        ${PROJECT_SOURCE_DIR}/imgui.tar.gz)
      execute_process(COMMAND ${CMAKE_COMMAND}
 -        -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -19,7 +18,7 @@
    endif()
    list(APPEND SOURCE_FILES
      ${IMGUI_DIR}/imgui.cpp
-@@ -84,4 +84,4 @@
+@@ -80,4 +80,4 @@
  )
  install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
    DESTINATION "${OGRE_MEDIA_PATH}/packs/"
diff --git a/dev-games/ogre/files/ogre-1.12.8-media_path.patch b/dev-games/ogre/files/ogre-1.12.9-media_path.patch
index 3030cc5b9fad..3030cc5b9fad 100644
--- a/dev-games/ogre/files/ogre-1.12.8-media_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-media_path.patch
diff --git a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch
index cf35e2f99e8e..cf35e2f99e8e 100644
--- a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch