diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
| commit | 3f71901f8c228f4de570abed1831ce3ee425343e (patch) | |
| tree | a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /dev-games/ogre/files | |
| parent | 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff) | |
gentoo resync 08.09.2018
Diffstat (limited to 'dev-games/ogre/files')
| -rw-r--r-- | dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch | 29 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch | 42 |
2 files changed, 42 insertions, 29 deletions
diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch deleted file mode 100644 index 53d7a0925d51..000000000000 --- a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User niparx <koliap@gmail.com> -# Date 1515160111 -7200 -# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159 -# Parent bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c -[OGRE-592] RTShaderSystem compile error when using double precision (#622) - -RTShaderSystem: compile error when using double precision - -https://ogre3d.atlassian.net/browse/OGRE-592 - -diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp ---- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -+++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -@@ -654,8 +654,12 @@ - curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN); - } - else -- { -- curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN); -+ { -+ curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r, -+ (Real)colourValue.g, -+ (Real)colourValue.b, -+ (Real)colourValue.a)), -+ Operand::OPS_IN); - } - - curFuncInvocation->pushOperand(arg, Operand::OPS_OUT); diff --git a/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch new file mode 100644 index 000000000000..ef15931940da --- /dev/null +++ b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch @@ -0,0 +1,42 @@ +--- a/CMake/Dependencies.cmake 2018-09-04 07:50:49.091120793 +0200 ++++ b/CMake/Dependencies.cmake 2018-09-04 07:51:55.429118519 +0200 +@@ -383,6 +383,10 @@ + find_package(Softimage) + macro_log_feature(Softimage_FOUND "Softimage" "Softimage SDK needed for building XSIExporter" FALSE "6.0" "") + ++# Find TinyXML ++find_package(TinyXML) ++macro_log_feature(TINYXML_FOUND "TinyXML" "TinyXML needed for building OgreXMLConverter" FALSE "" "") ++ + ####################################################################### + # Tests + ####################################################################### +--- /dev/null 2018-09-03 08:18:52.571907158 +0200 ++++ b/CMake/Packages/FindTinyXML.cmake 2018-09-04 19:15:06.392129319 +0200 +@@ -0,0 +1,26 @@ ++# - Find TinyXML ++# Find the native TinyXML includes and library ++# ++# TINYXML_FOUND - True if TinyXML found. ++# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc. ++# TINYXML_LIBRARIES - List of libraries when using TinyXML. ++# ++ ++IF( TINYXML_INCLUDE_DIR ) ++ # Already in cache, be silent ++ SET( TinyXML_FIND_QUIETLY TRUE ) ++ENDIF( TINYXML_INCLUDE_DIR ) ++ ++FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h" ++ PATH_SUFFIXES "tinyxml" ) ++ ++FIND_LIBRARY( TINYXML_LIBRARIES ++ NAMES "tinyxml" ++ PATH_SUFFIXES "tinyxml" ) ++ ++# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if ++# all listed variables are TRUE ++INCLUDE( "FindPackageHandleStandardArgs" ) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES ) ++ ++MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES ) |