diff options
| author |   Sven Eden <yamakuzure@gmx.net> | 2018-09-07 08:27:06 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-07 20:22:28 +0200 |
| commit | 6951cd9bba219de923a83bcd5c7ca4c18346c89f (patch) | |
| tree | 996560cdc6f9be0872ef5d46f2882208f582577b /dev-games/ogre/files | |
| parent | profiles: Mask >=dev-games/ogre-1.11.2 for more revdep-testing (diff) | |
| download | gentoo-6951cd9bba219de923a83bcd5c7ca4c18346c89f.tar.gz gentoo-6951cd9bba219de923a83bcd5c7ca4c18346c89f.tar.bz2 gentoo-6951cd9bba219de923a83bcd5c7ca4c18346c89f.zip | |
dev-games/ogre: 1.11.2 version bump
This is the second stable release of the current 1.11 series.
Apart from stabilizing Ogre BITES, this series also adds json material support.
Bug: https://bugs.gentoo.org/647266
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9474
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-games/ogre/files')
3 files changed, 50 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) |