aboutsummaryrefslogtreecommitdiffstats
path: root/community/assimp/03-fix-aiGetLegalStringTest.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/assimp/03-fix-aiGetLegalStringTest.patch')
-rw-r--r--community/assimp/03-fix-aiGetLegalStringTest.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/community/assimp/03-fix-aiGetLegalStringTest.patch b/community/assimp/03-fix-aiGetLegalStringTest.patch
deleted file mode 100644
index 9bbb9edaf94..00000000000
--- a/community/assimp/03-fix-aiGetLegalStringTest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001
-From: RichardTea <31507749+RichardTea@users.noreply.github.com>
-Date: Fri, 11 Oct 2019 16:28:14 +0100
-Subject: [PATCH] Update assimp legal and version
-
-Will now report the major and minor versions specified in cmakelists
----
- code/Common/Version.cpp | 14 +++++---------
- test/unit/utVersion.cpp | 2 +-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
-index 868cfb06af..cf1da7d5ba 100644
---- a/code/Common/Version.cpp
-+++ b/code/Common/Version.cpp
-@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <assimp/scene.h>
- #include "ScenePrivate.h"
-
--static const unsigned int MajorVersion = 5;
--static const unsigned int MinorVersion = 0;
-+#include "revision.h"
-
- // --------------------------------------------------------------------------------
- // Legal information string - don't remove this.
-@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION =
- "Open Asset Import Library (Assimp).\n"
- "A free C/C++ library to import various 3D file formats into applications\n\n"
-
--"(c) 2008-2020, assimp team\n"
-+"(c) 2006-2020, assimp team\n"
- "License under the terms and conditions of the 3-clause BSD license\n"
--"https://github.com/assimp/assimp\n"
-+"http://assimp.org\n"
- ;
-
- // ------------------------------------------------------------------------------------------------
-@@ -70,13 +69,13 @@ ASSIMP_API const char* aiGetLegalString () {
- // ------------------------------------------------------------------------------------------------
- // Get Assimp minor version
- ASSIMP_API unsigned int aiGetVersionMinor () {
-- return MinorVersion;
-+ return VER_MINOR;
- }
-
- // ------------------------------------------------------------------------------------------------
- // Get Assimp major version
- ASSIMP_API unsigned int aiGetVersionMajor () {
-- return MajorVersion;
-+ return VER_MAJOR;
- }
-
- // ------------------------------------------------------------------------------------------------
-@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags () {
- return flags;
- }
-
--// include current build revision, which is even updated from time to time -- :-)
--#include "revision.h"
--
- // ------------------------------------------------------------------------------------------------
- ASSIMP_API unsigned int aiGetVersionRevision() {
- return GitVersion;
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index 233b2fb0b2..66e832baae 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
- EXPECT_NE( lv, nullptr );
- std::string text( lv );
-
-- size_t pos( text.find( std::string( "2017" ) ) );
-+ size_t pos( text.find( std::string( "2020" ) ) );
- EXPECT_NE( pos, std::string::npos );
- }
-