diff options
Diffstat (limited to 'dev-games/ogre/files')
7 files changed, 151 insertions, 0 deletions
diff --git a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch new file mode 100644 index 000000000000..6e4a476fbb4c --- /dev/null +++ b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch @@ -0,0 +1,18 @@ +--- a/Samples/CMakeLists.txt 2018-04-25 07:30:38.211048775 +0200 ++++ b/Samples/CMakeLists.txt 2018-04-25 07:32:32.842049802 +0200 +@@ -97,10 +97,11 @@ + PATTERN "scripts" EXCLUDE + ) + # install a new CMakeLists.txt file to allow building of samples +- configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY) +- configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}) ++# The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25) ++# configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY) ++# configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY) ++# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../) ++# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}) + endif () + + # Install sample headers, some people rely on these diff --git a/dev-games/ogre/files/ogre-1.11.2-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch new file mode 100644 index 000000000000..aea15218c178 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.11.2-media_path.patch @@ -0,0 +1,18 @@ +--- a/CMake/InstallResources.cmake 2018-04-03 19:39:31.586129013 +0200 ++++ b/CMake/InstallResources.cmake 2018-04-03 19:40:28.169128923 +0200 +@@ -170,10 +170,11 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") +- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") ++ # No, they are fine already ++ # set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") ++ # set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") ++ # set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") ++ # set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_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.11.2-resource_path.patch b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch new file mode 100644 index 000000000000..8557d783ec41 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch @@ -0,0 +1,14 @@ +--- a/CMake/InstallResources.cmake 2018-03-23 10:48:44.371486540 +0100 ++++ b/CMake/InstallResources.cmake 2018-03-23 10:49:08.333486363 +0100 +@@ -184,8 +184,9 @@ + set(OGRE_PLUGIN_DIR_REL "") + set(OGRE_SAMPLES_DIR_REL "") + elseif (UNIX) +- set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") +- set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") ++# No, this was already configured above, the BINARY paths are wrong! ++# set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") ++# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") + endif () + + if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN) diff --git a/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch new file mode 100644 index 000000000000..365aa7c69d61 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch @@ -0,0 +1,29 @@ +--- a/OgreMain/src/OgreConfigFile.cpp 2018-07-27 07:52:31.121337386 +0200 ++++ b/OgreMain/src/OgreConfigFile.cpp 2018-07-27 07:59:51.301317661 +0200 +@@ -62,8 +62,25 @@ + //----------------------------------------------------------------------- + void ConfigFile::load(const String& filename, const String& separators, bool trimWhitespace) + { +- loadDirect(filename, separators, trimWhitespace); ++ // Try automatic loading first ++ try { ++ loadDirect(filename, separators, trimWhitespace); ++ } catch (Exception &e) { ++ // Try /etc/OGRE/<file> next ++ try { ++ loadDirect("/etc/OGRE/" + filename, separators, trimWhitespace); ++ return; ++ } catch (...) { /* was just a test */ } ++ // Try /usr/share/OGRE/<file> last ++ try { ++ loadDirect("/usr/share/OGRE/" + filename, separators, trimWhitespace); ++ return; ++ } catch (...) { /* was just a test */ } ++ /* dammit... */ ++ throw e; ++ } + } ++ + //----------------------------------------------------------------------- + void ConfigFile::load(const String& filename, const String& resourceGroup, + const String& separators, bool trimWhitespace) diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch new file mode 100644 index 000000000000..5e7ad276ac09 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-media_path.patch @@ -0,0 +1,28 @@ +--- a/CMake/InstallResources.cmake 2018-03-23 10:49:24.620486243 +0100 ++++ b/CMake/InstallResources.cmake 2018-03-23 10:50:52.089485597 +0100 +@@ -186,15 +186,16 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- if( NOT APPLE ) +- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") +- else() +- set(OGRE_MEDIA_DIR_REL "Contents/Resources") +- set(OGRE_MEDIA_DIR_DBG "Contents/Resources") +- endif() +- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") +- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") ++# No, they were fine already ++# if( NOT APPLE ) ++# set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") ++# set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") ++# else() ++# set(OGRE_MEDIA_DIR_REL "Contents/Resources") ++# set(OGRE_MEDIA_DIR_DBG "Contents/Resources") ++# endif() ++# set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") ++# set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") + else () + # iOS needs to use relative paths in the config files + set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch new file mode 100644 index 000000000000..32cfef0d8d14 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch @@ -0,0 +1,18 @@ +--- a/CMake/InstallResources.cmake 2018-03-23 10:48:44.371486540 +0100 ++++ b/CMake/InstallResources.cmake 2018-03-23 10:49:08.333486363 +0100 +@@ -226,10 +226,11 @@ + set(OGRE_SAMPLES_DIR_REL "") + set(OGRE_SAMPLES_DIR_DBG "") + elseif (UNIX) +- set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") +- set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") +- set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") +- set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") ++# No, this was already configured above, the BINARY paths are wrong! ++# set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") ++# set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") ++# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") ++# set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") + endif () + + if (WINDOWS_STORE OR WINDOWS_PHONE) diff --git a/dev-games/ogre/files/ogre-2.1-samples.patch b/dev-games/ogre/files/ogre-2.1-samples.patch new file mode 100644 index 000000000000..6d12fb4fed11 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-samples.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt 2018-03-23 10:48:02.309486850 +0100 ++++ b/CMakeLists.txt 2018-03-23 10:48:04.157486836 +0100 +@@ -614,7 +614,9 @@ + endif () + + # Setup samples +-add_subdirectory(Samples) ++if (OGRE_BUILD_SAMPLES2) ++ add_subdirectory(Samples) ++endif () + + # Add android JNI binding + if(ANDROID AND OGRE_BUILD_ANDROID_JNI_SAMPLE) +--- a/CMake/InstallResources.cmake 2018-04-06 19:18:45.095348540 +0200 ++++ b/CMake/InstallResources.cmake 2018-04-06 19:20:00.342345608 +0200 +@@ -62,8 +62,8 @@ + set(OGRE_TEST_MEDIA_DIR_DBG "${CMAKE_INSTALL_PREFIX}/Tests/Media") + set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE") + set(OGRE_PLUGIN_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE") +- set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples") +- set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples") ++ set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples") ++ set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples") + set(OGRE_CFG_INSTALL_PATH "share/OGRE") + endif () + |