From d466f926f8dc07ec23efa5807fff35a0b6dd4146 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 22 May 2014 15:39:43 +0200 Subject: opencollada: move patches to an own folder Change-Id: I0b60fa5b0af8224b4c517367130aa9738f071531 --- .../opencollada/UnpackedTarball_opencollada.mk | 6 ++-- .../generatedsaxparser_utils_touri_fix.patch.1 | 35 ---------------------- external/opencollada/opencollada.clang.patch.0 | 22 -------------- external/opencollada/opencollada.libxml.patch.0 | 12 -------- .../generatedsaxparser_utils_touri_fix.patch.1 | 35 ++++++++++++++++++++++ .../opencollada/patches/opencollada.clang.patch.0 | 22 ++++++++++++++ .../opencollada/patches/opencollada.libxml.patch.0 | 12 ++++++++ 7 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 delete mode 100644 external/opencollada/opencollada.clang.patch.0 delete mode 100644 external/opencollada/opencollada.libxml.patch.0 create mode 100644 external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 create mode 100644 external/opencollada/patches/opencollada.clang.patch.0 create mode 100644 external/opencollada/patches/opencollada.libxml.patch.0 (limited to 'external') diff --git a/external/opencollada/UnpackedTarball_opencollada.mk b/external/opencollada/UnpackedTarball_opencollada.mk index 487a858c937e..7670784951b8 100644 --- a/external/opencollada/UnpackedTarball_opencollada.mk +++ b/external/opencollada/UnpackedTarball_opencollada.mk @@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,opencollada)) $(eval $(call gb_UnpackedTarball_set_tarball,opencollada,$(OPENCOLLADA_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\ - external/opencollada/opencollada.clang.patch.0 \ - external/opencollada/opencollada.libxml.patch.0 \ - external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 \ + external/opencollada/patches/opencollada.clang.patch.0 \ + external/opencollada/patches/opencollada.libxml.patch.0 \ + external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 b/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 deleted file mode 100644 index 892d4b93020d..000000000000 --- a/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp ---- opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:25.437939696 +0200 -+++ opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:50.769938623 +0200 -@@ -865,13 +865,14 @@ - { - if ( *buffer == bufferEnd ) - { -- failed = false; -+ failed = true; - return COLLADABU::URI(0); - } - //Just get the string as it is for ids, so that we are able to read FBX-COLLADA - //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces - //const ParserString& string = toStringListItem(buffer, bufferEnd, failed); - //return COLLADABU::URI(string.str, string.length); -+ failed = false; - return COLLADABU::URI((const char*)*buffer, bufferEnd - *buffer); - } - -@@ -880,13 +881,14 @@ - { - if ( **buffer == '\0' ) - { -- failed = false; -+ failed = true; - return COLLADABU::URI(0); - } - //Just get the string as it is for ids, so that we are able to read FBX-COLLADA - //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces - //const ParserString& string = toStringListItem(buffer, failed); - //return COLLADABU::URI(string.str, string.length); -+ failed = false; - return COLLADABU::URI((const char*)*buffer); - } - diff --git a/external/opencollada/opencollada.clang.patch.0 b/external/opencollada/opencollada.clang.patch.0 deleted file mode 100644 index 14e67e9501a7..000000000000 --- a/external/opencollada/opencollada.clang.patch.0 +++ /dev/null @@ -1,22 +0,0 @@ --*- Mode: Diff -*- -diff -ur opencollada.org/COLLADABaseUtils/include/COLLADABUhash_map.h opencollada/COLLADABaseUtils/include/COLLADABUhash_map.h ---- COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:12:05.740858077 +0200 -+++ COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:17:38.616861995 +0200 -@@ -60,7 +60,7 @@ - #define COLLADABU_HASH_NAMESPACE_CLOSE } - #define COLLADABU_HASH_FUN hash - #endif --#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION) -+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION) - #include - #include - #define COLLADABU_HASH_MAP std::unordered_map -@@ -70,7 +70,7 @@ - #define COLLADABU_HASH_NAMESPACE_CLOSE - #define COLLADABU_HASH_FUN hash - #else // Linux or Mac or FreeBSD with GCC -- #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) -+ #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) - #include - #include - #if !(defined(__APPLE__) && defined(__MACH__)) diff --git a/external/opencollada/opencollada.libxml.patch.0 b/external/opencollada/opencollada.libxml.patch.0 deleted file mode 100644 index beccc92bd6f3..000000000000 --- a/external/opencollada/opencollada.libxml.patch.0 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur opencollada.org/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h opencollada/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h ---- GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h 2014-05-13 10:37:05.029390239 +0200 -+++ GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h 2014-05-13 10:37:37.093390617 +0200 -@@ -11,8 +11,6 @@ - #ifndef __GENERATEDSAXPARSER_PREREQUISITES_H__ - #define __GENERATEDSAXPARSER_PREREQUISITES_H__ - --#define LIBXML_STATIC -- - #include - - #include "COLLADABUPlatform.h" diff --git a/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 b/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 new file mode 100644 index 000000000000..892d4b93020d --- /dev/null +++ b/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 @@ -0,0 +1,35 @@ +diff -ur opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp +--- opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:25.437939696 +0200 ++++ opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:50.769938623 +0200 +@@ -865,13 +865,14 @@ + { + if ( *buffer == bufferEnd ) + { +- failed = false; ++ failed = true; + return COLLADABU::URI(0); + } + //Just get the string as it is for ids, so that we are able to read FBX-COLLADA + //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces + //const ParserString& string = toStringListItem(buffer, bufferEnd, failed); + //return COLLADABU::URI(string.str, string.length); ++ failed = false; + return COLLADABU::URI((const char*)*buffer, bufferEnd - *buffer); + } + +@@ -880,13 +881,14 @@ + { + if ( **buffer == '\0' ) + { +- failed = false; ++ failed = true; + return COLLADABU::URI(0); + } + //Just get the string as it is for ids, so that we are able to read FBX-COLLADA + //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces + //const ParserString& string = toStringListItem(buffer, failed); + //return COLLADABU::URI(string.str, string.length); ++ failed = false; + return COLLADABU::URI((const char*)*buffer); + } + diff --git a/external/opencollada/patches/opencollada.clang.patch.0 b/external/opencollada/patches/opencollada.clang.patch.0 new file mode 100644 index 000000000000..14e67e9501a7 --- /dev/null +++ b/external/opencollada/patches/opencollada.clang.patch.0 @@ -0,0 +1,22 @@ +-*- Mode: Diff -*- +diff -ur opencollada.org/COLLADABaseUtils/include/COLLADABUhash_map.h opencollada/COLLADABaseUtils/include/COLLADABUhash_map.h +--- COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:12:05.740858077 +0200 ++++ COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:17:38.616861995 +0200 +@@ -60,7 +60,7 @@ + #define COLLADABU_HASH_NAMESPACE_CLOSE } + #define COLLADABU_HASH_FUN hash + #endif +-#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION) ++#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION) + #include + #include + #define COLLADABU_HASH_MAP std::unordered_map +@@ -70,7 +70,7 @@ + #define COLLADABU_HASH_NAMESPACE_CLOSE + #define COLLADABU_HASH_FUN hash + #else // Linux or Mac or FreeBSD with GCC +- #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) ++ #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) + #include + #include + #if !(defined(__APPLE__) && defined(__MACH__)) diff --git a/external/opencollada/patches/opencollada.libxml.patch.0 b/external/opencollada/patches/opencollada.libxml.patch.0 new file mode 100644 index 000000000000..beccc92bd6f3 --- /dev/null +++ b/external/opencollada/patches/opencollada.libxml.patch.0 @@ -0,0 +1,12 @@ +diff -ur opencollada.org/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h opencollada/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h +--- GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h 2014-05-13 10:37:05.029390239 +0200 ++++ GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h 2014-05-13 10:37:37.093390617 +0200 +@@ -11,8 +11,6 @@ + #ifndef __GENERATEDSAXPARSER_PREREQUISITES_H__ + #define __GENERATEDSAXPARSER_PREREQUISITES_H__ + +-#define LIBXML_STATIC +- + #include + + #include "COLLADABUPlatform.h" -- cgit