From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- .../ogre/files/ogre-1.12.8-fix_Simple_demo.patch | 11 --------- dev-games/ogre/files/ogre-1.12.8-media_path.patch | 14 ----------- .../ogre/files/ogre-1.12.8-resource_path.patch | 13 ---------- .../ogre/files/ogre-1.12.8-upgrade_imgui.patch | 28 ---------------------- .../ogre/files/ogre-1.12.9-fix_Simple_demo.patch | 11 +++++++++ .../ogre-1.12.9-fix_config_window_height.patch | 11 +++++++++ .../ogre-1.12.9-gentoolize_imgui_inclusion.patch | 27 +++++++++++++++++++++ dev-games/ogre/files/ogre-1.12.9-media_path.patch | 14 +++++++++++ .../ogre/files/ogre-1.12.9-resource_path.patch | 13 ++++++++++ 9 files changed, 76 insertions(+), 66 deletions(-) delete mode 100644 dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-media_path.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-resource_path.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-media_path.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-resource_path.patch (limited to 'dev-games/ogre/files') diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch deleted file mode 100644 index 49ed0190e0a1..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Samples/Simple/include/SSAO.h 2020-04-26 13:54:31.321908377 +0200 -+++ b/Samples/Simple/include/SSAO.h 2020-04-26 13:54:47.497909935 +0200 -@@ -65,7 +65,7 @@ - SSAOGBufferSchemeHandler() - { - mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer"); -- RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer"); -+ RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect"); - mGBufRefMat->load(); - } - diff --git a/dev-games/ogre/files/ogre-1.12.8-media_path.patch b/dev-games/ogre/files/ogre-1.12.8-media_path.patch deleted file mode 100644 index 3030cc5b9fad..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-media_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Media paths are fine already, the removed lines would screw them up. - ---- a/CMake/InstallResources.cmake 2019-11-06 08:09:15.185821495 +0100 -+++ b/CMake/InstallResources.cmake 2019-11-06 08:10:41.169819050 +0100 -@@ -145,9 +145,6 @@ - - # CREATE CONFIG FILES - BUILD DIR VERSIONS - if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) -- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media") -- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media") -- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media") - else () - # iOS needs to use relative paths in the config files - set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch deleted file mode 100644 index cf35e2f99e8e..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -These was already configured above, the BINARY paths are wrong! - ---- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100 -+++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100 -@@ -163,8 +163,6 @@ - set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/") - set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") - elseif (UNIX) -- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib") -- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib") - endif () - - if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN) diff --git a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch deleted file mode 100644 index 4c7803a0a2f2..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 -@@ -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 "") - if(NOT EXISTS ${IMGUI_DIR}) - message(STATUS "Dowloading imgui") - file(DOWNLOAD -- https://github.com/ocornut/imgui/archive/v1.73.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}) -+ -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - endif() - list(APPEND SOURCE_FILES - ${IMGUI_DIR}/imgui.cpp -@@ -84,4 +84,4 @@ - ) - install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" - DESTINATION "${OGRE_MEDIA_PATH}/packs/" --) -\ Kein Zeilenumbruch am Dateiende. -+) diff --git a/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch new file mode 100644 index 000000000000..49ed0190e0a1 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch @@ -0,0 +1,11 @@ +--- a/Samples/Simple/include/SSAO.h 2020-04-26 13:54:31.321908377 +0200 ++++ b/Samples/Simple/include/SSAO.h 2020-04-26 13:54:47.497909935 +0200 +@@ -65,7 +65,7 @@ + SSAOGBufferSchemeHandler() + { + mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer"); +- RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer"); ++ RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect"); + mGBufRefMat->load(); + } + 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.9-gentoolize_imgui_inclusion.patch b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch new file mode 100644 index 000000000000..765a53d4695c --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch @@ -0,0 +1,27 @@ +--- 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.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.77.tar.gz +- ${PROJECT_BINARY_DIR}/imgui.tar.gz) ++ ${PROJECT_SOURCE_DIR}/imgui.tar.gz) + execute_process(COMMAND ${CMAKE_COMMAND} +- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) ++ -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) + endif() + list(APPEND SOURCE_FILES + ${IMGUI_DIR}/imgui.cpp +@@ -80,4 +80,4 @@ + ) + install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" + DESTINATION "${OGRE_MEDIA_PATH}/packs/" +-) +\ Kein Zeilenumbruch am Dateiende. ++) diff --git a/dev-games/ogre/files/ogre-1.12.9-media_path.patch b/dev-games/ogre/files/ogre-1.12.9-media_path.patch new file mode 100644 index 000000000000..3030cc5b9fad --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-media_path.patch @@ -0,0 +1,14 @@ +Media paths are fine already, the removed lines would screw them up. + +--- a/CMake/InstallResources.cmake 2019-11-06 08:09:15.185821495 +0100 ++++ b/CMake/InstallResources.cmake 2019-11-06 08:10:41.169819050 +0100 +@@ -145,9 +145,6 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media") +- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media") +- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media") + else () + # iOS needs to use relative paths in the config files + set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-1.12.9-resource_path.patch b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch new file mode 100644 index 000000000000..cf35e2f99e8e --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch @@ -0,0 +1,13 @@ +These was already configured above, the BINARY paths are wrong! + +--- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100 ++++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100 +@@ -163,8 +163,6 @@ + set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/") + set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") + elseif (UNIX) +- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib") +- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib") + endif () + + if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN) -- cgit v1.2.3