[rpms/vtk] epel9: - Remove bundled eigen3 on ppc64le

[Than Ngo <than@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/vtk
            Branch : epel9
            Commit : 6456f89ab9f4085a8e967d0315f879573215bd49
            Author : Than Ngo <than@redhat.com>
            Date   : 2026-06-09T20:59:50+02:00
            Stats  : +12/-32 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/vtk/c/6456f89ab9f4085a8e967d0315f879573215bd49?branch=epel9

            Log:
            - Remove bundled eigen3 on ppc64le
- Fix FTBFS caused by target specific option mismatch on ppc64le

---
diff --git a/vtk-eigen3.patch b/vtk-eigen3.patch
deleted file mode 100644
index 7fa124a..0000000
--- a/vtk-eigen3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up VTK-9.1.0/ThirdParty/eigen/vtkeigen/CMakeLists.txt.eigen3 VTK-9.1.0/ThirdParty/eigen/vtkeigen/CMakeLists.txt
---- VTK-9.1.0/ThirdParty/eigen/vtkeigen/CMakeLists.txt.eigen3	2021-11-04 13:48:20.000000000 -0600
-+++ VTK-9.1.0/ThirdParty/eigen/vtkeigen/CMakeLists.txt	2025-12-03 21:34:28.475070319 -0700
-@@ -486,7 +486,7 @@ endif ()
- 
- foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
-   if(IS_ABSOLUTE "${${var}}")
--    message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}")
-+    file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}")
-   endif()
- endforeach()
- 

diff --git a/vtk.spec b/vtk.spec
index 0115bea..d3fcabb 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -31,13 +31,6 @@
 %bcond_without flexiblas
 %endif
 
-%ifarch ppc64le
-# Deal with ppc64le issue - https://issues.redhat.com/browse/RHEL-131497
-%bcond_with eigen3
-%else
-%bcond_without eigen3
-%endif
-
 # VTK currently is carrying local modifications to gl2ps
 %bcond_with gl2ps
 
@@ -47,7 +40,7 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 9.1.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
 # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
@@ -71,8 +64,6 @@ Patch4: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9621.patch
 # https://gitlab.kitware.com/vtk/vtk/-/issues/19622
 # https://bugzilla.redhat.com/show_bug.cgi?id=2386242
 Patch5: vtk-ppc64-no-always-inline.patch
-# Fix build of bundled eigen3
-Patch6: vtk-eigen3.patch
 
 URL: https://vtk.org/
 
@@ -97,9 +88,7 @@ BuildRequires:  boost-devel
 BuildRequires:  cgnslib-devel
 BuildRequires:  cli11-devel
 BuildRequires:  double-conversion-devel
-%if %{with eigen3}
 BuildRequires:  eigen3-devel
-%endif
 BuildRequires:  expat-devel
 %if %{with fmt}
 BuildRequires:  fmt-devel >= 8.1.0
@@ -185,9 +174,7 @@ Requires: cgnslib-devel%{?_isa} \
 Requires: cli11-static \
 Requires: double-conversion-devel%{?_isa} \
 # eigen3 is noarch and header-only \
-%if %{with eigen3} \
 Requires: eigen3-static \
-%endif \
 Requires: expat-devel%{?_isa} \
 %if %{with fmt} \
 Requires: fmt-devel%{?_isa} \
@@ -510,7 +497,7 @@ programming languages.
 # TODO - VPIC - not yet packaged
 # TODO - xdmf2 - not yet packaged
 # TODO - xdmf3 - not yet packaged
-for x in vtk{cli11,doubleconversion,%{?with_eigen3:eigen,}expat,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib}
+for x in vtk{cli11,doubleconversion,eigen,expat,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib}
 do
   rm -r ThirdParty/*/${x}
 done
@@ -525,8 +512,13 @@ find vtk-examples -type f | xargs chmod -R a-x
 
 
 %build
+%ifarch ppc64le
+export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T -DEIGEN_ALTIVEC_DISABLE_MMA -mvsx -maltivec"
+export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T -DEIGEN_ALTIVEC_DISABLE_MMA -mvsx -maltivec"
+%else
 export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
 export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
+%endif
 export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 %if %{with java}
 export JAVA_HOME=/usr/lib/jvm/java
@@ -577,16 +569,13 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
 %endif \
  -DVTK_WRAP_PYTHON:BOOL=ON \\\
  -DVTK_USE_EXTERNAL=ON \\\
-%if !%{with eigen3} \
- -DVTK_MODULE_USE_EXTERNAL_VTK_eigen:BOOL=OFF \\\
-%endif \
- -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\
 %if !%{with fmt} \
  -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \\\
 %endif \
 %if !%{with gl2ps} \
  -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF \\\
 %endif \
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\
  -DVTK_USE_TK=ON \\\
   %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS}
@@ -866,10 +855,13 @@ cat xorg.log
 
 
 %changelog
+* Tue Jun 09 2026 Than Ngo <than@redhat.com> - 9.1.0-21
+- Remove bundled eigen3 on ppc64le
+- Fix FTBFS caused by target specific option mismatch on ppc64le
+
 * Tue Nov 25 2025 Orion Poplawski <orion@nwra.com> - 9.1.0-20
 - Rebuild for gdal (rhbz#2416611)
 - Backport ppc64le inline patch
-- Use bundled eigen3 on ppc64le - https://issues.redhat.com/browse/RHEL-131497
 
 * Tue Jun 24 2025 Orion Poplawski <orion@nwra.com> - 9.1.0-19
 - Rebuild for proj 9