diff options
| -rw-r--r-- | 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch | 44 | ||||
| -rw-r--r-- | 9000-fix-build-error-for-aarch64.patch | 74 | ||||
| -rw-r--r-- | vtk.spec | 2 |
3 files changed, 45 insertions, 75 deletions
diff --git a/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch new file mode 100644 index 0000000..f48302b --- /dev/null +++ b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch @@ -0,0 +1,44 @@ +diff --git a/IO/MotionFX/vtkMotionFXCFGGrammar.h b/IO/MotionFX/vtkMotionFXCFGGrammar.h +index e58eeb80..67bc5d88 100644 +--- a/IO/MotionFX/vtkMotionFXCFGGrammar.h ++++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h +@@ -11,7 +11,7 @@ + + // for debugging + // clang-format off +-#include VTK_PEGTL(pegtl/contrib/tracer.hpp) ++#include VTK_PEGTL(pegtl/contrib/trace.hpp) + // clang-format on + + namespace MotionFX +diff --git a/IO/MotionFX/vtkMotionFXCFGReader.cxx b/IO/MotionFX/vtkMotionFXCFGReader.cxx +index 9cbf553c..7417a418 100644 +--- a/IO/MotionFX/vtkMotionFXCFGReader.cxx ++++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx +@@ -1210,7 +1210,7 @@ bool PositionFileMotion::read_position_file(const std::string& rootDir) const + } + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro("PositionFileMotion::read_position_file failed: " << e.what()); + } +@@ -1229,7 +1229,7 @@ bool UniversalTransformMotion::read_universaltransform_file(const std::string& r + in, numbers, this->transforms); + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro( + "UniversalTransformMotion::read_universaltransform_file failed: " << e.what()); +@@ -1266,7 +1266,7 @@ public: + if (getenv("MOTIONFX_DEBUG_GRAMMAR") != nullptr) + { + tao::pegtl::read_input<> in2(filename); +- tao::pegtl::parse<MotionFX::CFG::Grammar, tao::pegtl::nothing, tao::pegtl::tracer>(in2); ++ tao::pegtl::complete_trace<MotionFX::CFG::Grammar>(in2); + } + return false; + } diff --git a/9000-fix-build-error-for-aarch64.patch b/9000-fix-build-error-for-aarch64.patch deleted file mode 100644 index 84d3e9d..0000000 --- a/9000-fix-build-error-for-aarch64.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e88134e5a7fc83c82e4a38618dc6d0cb30ef9a18 Mon Sep 17 00:00:00 2001 -From: panchenbo <panchenbo@kylinsec.com.cn> -Date: Sat, 19 Apr 2025 16:56:02 +0800 -Subject: [PATCH] fix build error for aarch64 - ---- - Utilities/KWIML/vtkkwiml/include/kwiml/abi.h | 22 +++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -index 0437854d..f9aa495f 100644 ---- a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -+++ b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -@@ -153,38 +153,54 @@ suppression macro KWIML_ABI_NO_VERIFY was defined. - #endif - - #if !defined(KWIML_ABI_CHAR_IS_UNSIGNED) && !defined(KWIML_ABI_CHAR_IS_SIGNED) --# if defined(__CHAR_UNSIGNED__) /* GNU, some IBM XL, others? */ -+# if defined(__GNUC__) /* GNU default */ -+# define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("888") -+# elif defined(__CHAR_UNSIGNED__) /* GNU, some IBM XL, others? */ - # define KWIML_ABI_CHAR_IS_UNSIGNED 1 -+# pragma message("111") - # elif defined(_CHAR_UNSIGNED) /* Intel, IBM XL, MSVC, Borland, others? */ - # define KWIML_ABI_CHAR_IS_UNSIGNED 1 -+# pragma message("222") - # elif defined(_CHAR_SIGNED) /* IBM XL, others? */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("333") - # elif defined(__CHAR_SIGNED__) /* IBM XL, Watcom, others? */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("444") - # elif defined(__SIGNED_CHARS__) /* EDG, Intel, SGI MIPSpro */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("555") - # elif defined(_CHAR_IS_SIGNED) /* Some SunPro, others? */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("666") - # elif defined(_CHAR_IS_UNSIGNED) /* SunPro, others? */ - # define KWIML_ABI_CHAR_IS_UNSIGNED 1 --# elif defined(__GNUC__) /* GNU default */ --# define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("777") - # elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) /* SunPro default */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("999") - # elif defined(__HP_cc) || defined(__HP_aCC) /* HP default (unless +uc) */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("1111") - # elif defined(_SGI_COMPILER_VERSION) /* SGI MIPSpro default */ - # define KWIML_ABI_CHAR_IS_UNSIGNED 1 -+# pragma message("2222") - # elif defined(__PGIC__) /* PGI default */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("3333") - # elif defined(_MSC_VER) /* MSVC default */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("4444") - # elif defined(__WATCOMC__) /* Watcom default */ - # define KWIML_ABI_CHAR_IS_UNSIGNED 1 -+# pragma message("5555") - # elif defined(__BORLANDC__) /* Borland default */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 -+# pragma message("6666") - # elif defined(__hpux) /* Old HP: no __HP_cc/__HP_aCC/__GNUC__ above */ - # define KWIML_ABI_CHAR_IS_SIGNED 1 /* (unless +uc) */ -+# pragma message("7777") - # endif - #endif - #if !defined(KWIML_ABI_CHAR_IS_UNSIGNED) && !defined(KWIML_ABI_CHAR_IS_SIGNED) \ --- -2.27.0 - @@ -26,7 +26,7 @@ Source100: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_00 Source101: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_01 Source102: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_02 -Patch9000: 9000-fix-build-error-for-aarch64.patch +Patch01: 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch URL: https://vtk.org/ |