diff options
| author |   Sven Eden <yamakuzure@gmx.net> | 2019-11-10 16:43:00 +0100 |
|---|---|---|
| committer |   James Le Cuirot <chewi@gentoo.org> | 2020-01-07 22:58:02 +0000 |
| commit | f5337cdf544c153250ab4602f297a390a4b0ca29 (patch) | |
| tree | ab2976fa409a2b88c268f709b037631971b53a21 /dev-games/ogre/files | |
| parent | dev-games/ogre: New ebuild for latest stable release 1.12.4 (diff) | |
| download | gentoo-f5337cdf544c153250ab4602f297a390a4b0ca29.tar.gz gentoo-f5337cdf544c153250ab4602f297a390a4b0ca29.tar.bz2 gentoo-f5337cdf544c153250ab4602f297a390a4b0ca29.zip | |
dev-games/ogre: Bump 2.1 to pre20191212 and move to GitHub
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sven Eden <sven.eden@gmx.de>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'dev-games/ogre/files')
| -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 |
2 files changed, 6 insertions, 17 deletions
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) |