diff options
Diffstat (limited to 'dev-games/ogre/files')
-rw-r--r-- | dev-games/ogre/files/ogre-1.10.11-media_path.patch | 18 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.10.11-resource_path.patch | 18 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.10.11-samples.patch | 13 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.11.2-media_path.patch | 18 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.11.2-resource_path.patch | 14 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch (renamed from dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch) | 9 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.12.4-media_path.patch | 14 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.12.4-resource_path.patch | 13 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.9.0-samples.patch | 4 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-2.1-media_path.patch | 14 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-2.1-resource_path.patch | 9 |
11 files changed, 38 insertions, 106 deletions
diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch deleted file mode 100644 index 4d2547ab75a4..000000000000 --- a/dev-games/ogre/files/ogre-1.10.11-media_path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMake/InstallResources.cmake 2014-10-29 12:43:49.000000000 +0100 -+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100 -@@ -165,10 +165,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 were 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.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch deleted file mode 100644 index 9c39dfc0762a..000000000000 --- a/dev-games/ogre/files/ogre-1.10.11-resource_path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMake/InstallResources.cmake 2013-12-01 18:28:12.000000000 +0100 -+++ b/CMake/InstallResources.cmake 2014-10-29 12:38:29.963602465 +0100 -@@ -189,10 +189,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 (MSVC AND NOT NMAKE) diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch deleted file mode 100644 index 80b989e980c4..000000000000 --- a/dev-games/ogre/files/ogre-1.10.11-samples.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -536,7 +536,9 @@ - endif () - - # Setup samples --add_subdirectory(Samples) -+if (OGRE_BUILD_SAMPLES) -+ add_subdirectory(Samples) -+endif () - - #Add android JNI binding - if(ANDROID) 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 deleted file mode 100644 index aea15218c178..000000000000 --- a/dev-games/ogre/files/ogre-1.11.2-media_path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 8557d783ec41..000000000000 --- a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch index 6e4a476fbb4c..616a5e33680b 100644 --- a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch +++ b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch @@ -1,6 +1,8 @@ +The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25) + --- 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 @@ +@@ -97,10 +97,6 @@ PATTERN "scripts" EXCLUDE ) # install a new CMakeLists.txt file to allow building of samples @@ -8,11 +10,6 @@ - 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.12.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.4-media_path.patch new file mode 100644 index 000000000000..3030cc5b9fad --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.4-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.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch new file mode 100644 index 000000000000..cf35e2f99e8e --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.4-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) diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch index d7573d7662b0..0bf886b27d7c 100644 --- a/dev-games/ogre/files/ogre-1.9.0-samples.patch +++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -519,7 +519,9 @@ endif () diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch index 5e7ad276ac09..a51d0576c983 100644 --- a/dev-games/ogre/files/ogre-2.1-media_path.patch +++ b/dev-games/ogre/files/ogre-2.1-media_path.patch @@ -1,6 +1,8 @@ +Media paths are fine already, the removed lines would screw them up. + --- 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 @@ +@@ -186,15 +186,6 @@ # CREATE CONFIG FILES - BUILD DIR VERSIONS if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) @@ -13,16 +15,6 @@ - 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 index 32cfef0d8d14..32cbc94e7d01 100644 --- a/dev-games/ogre/files/ogre-2.1-resource_path.patch +++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch @@ -1,6 +1,8 @@ +These was already configured above, the BINARY paths are wrong! + --- 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 @@ +@@ -226,10 +226,6 @@ set(OGRE_SAMPLES_DIR_REL "") set(OGRE_SAMPLES_DIR_DBG "") elseif (UNIX) @@ -8,11 +10,6 @@ - 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) |