automatic import of vtkopeneuler25.03

3 files changed, 147 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..cf20ea2
--- /dev/null
+++ b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch
@@ -0,0 +1,145 @@
+From f62eb94a049482c6dc6f5d830087a91b6bbae886 Mon Sep 17 00:00:00 2001
+From: mimanchiok <mimanchiok@qq.com>
+Date: Thu, 7 Aug 2025 19:33:51 +0800
+Subject: [PATCH] fix tao/pegtl/contrib/tracer.hpp: No such file or directory
+
+---
+ CMake/FindPEGTL.cmake                | 62 +++++++++++++++++-----------
+ IO/MotionFX/vtkMotionFXCFGGrammar.h  |  2 +-
+ IO/MotionFX/vtkMotionFXCFGReader.cxx |  6 +--
+ ThirdParty/pegtl/CMakeLists.txt      |  1 -
+ 4 files changed, 41 insertions(+), 30 deletions(-)
+
+diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake
+index 4c9e108b..87ab49d6 100644
+--- a/CMake/FindPEGTL.cmake
++++ b/CMake/FindPEGTL.cmake
+@@ -20,31 +20,43 @@
+ #
+ #  PEGTL::PEGTL
+ 
+-find_path(PEGTL_INCLUDE_DIR
+-  NAMES pegtl/version.hpp
+-  PATH_SUFFIXES tao
+-  DOC "Path to PEGTL headers")
+-mark_as_advanced(PEGTL_INCLUDE_DIR)
++message(STATUS "Searching for PEGTL")
++find_package(PEGTL CONFIG REQUIRED)
++if(TARGET taocpp::pegtl)
++    message(STATUS "Searching for PEGTL - found target taocpp::pegtl")
++    set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE)
++    if(NOT TARGET PEGTL::PEGTL)
++       add_library(PEGTL::PEGTL IMPORTED INTERFACE)
++       target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl)
++    endif()
++else()
++    find_path(PEGTL_INCLUDE_DIR
++      NAMES pegtl/version.hpp
++      PATH_SUFFIXES tao
++      DOC "Path to PEGTL headers")
++    mark_as_advanced(PEGTL_INCLUDE_DIR)
+ 
+-if (PEGTL_INCLUDE_DIR)
+-  file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
+-    REGEX "TAO_PEGTL_VERSION")
+-  string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
+-  set(PEGTL_VERSION "${CMAKE_MATCH_1}")
+-  unset(_pegtl_version_header)
+-  unset(_pegtl_version_match)
+-endif ()
++    if (PEGTL_INCLUDE_DIR)
++      file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
++        REGEX "TAO_PEGTL_VERSION")
++      string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
++      set(PEGTL_VERSION "${CMAKE_MATCH_1}")
++      unset(_pegtl_version_header)
++      unset(_pegtl_version_match)
++    endif ()
+ 
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(PEGTL
+-  REQUIRED_VARS PEGTL_INCLUDE_DIR
+-  VERSION_VAR PEGTL_VERSION)
++    include(FindPackageHandleStandardArgs)
++    find_package_handle_standard_args(PEGTL
++      REQUIRED_VARS PEGTL_INCLUDE_DIR
++      VERSION_VAR PEGTL_VERSION)
+ 
+-if (PEGTL_FOUND)
+-  set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}")
+-  if (NOT TARGET PEGTL::PEGTL)
+-    add_library(PEGTL::PEGTL INTERFACE IMPORTED)
+-    set_target_properties(PEGTL::PEGTL PROPERTIES
+-      INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}")
+-  endif ()
+-endif ()
++    if (PEGTL_FOUND)
++      set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}")
++      if (NOT TARGET PEGTL::PEGTL)
++        add_library(PEGTL::PEGTL INTERFACE IMPORTED)
++        set_target_properties(PEGTL::PEGTL PROPERTIES
++          INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}")
++      endif ()
++      message(STATUS "Searching for PEGTL - found")
++    endif ()
++endif ()
+\ No newline at end of file
+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/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt
+index 27c89427..d2fd1267 100644
+--- a/ThirdParty/pegtl/CMakeLists.txt
++++ b/ThirdParty/pegtl/CMakeLists.txt
+@@ -13,7 +13,6 @@ vtk_module_third_party(
+       "2.8.3"
+   EXTERNAL
+     PACKAGE PEGTL
+-    VERSION 2.0.0
+     TARGETS PEGTL::PEGTL
+     STANDARD_INCLUDE_DIRS)
+ 
+-- 
+2.27.0
+
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
-
diff --git a/vtk.spec b/vtk.spec
index 5af2dde..5c70773 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -26,7 +26,8 @@ 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
+#Patch9000: 9000-fix-build-error-for-aarch64.patch
 
 URL: https://vtk.org/