From d5589614f4d77f66f5939b86a5715e9ce23ae6ac Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Jun 2022 14:37:30 +0200
Subject: [PATCH] DOC: adjust requirements with information for paraview ffmpeg
 support

- adjust info about min cmake
---
 BUILD.md             |  4 +++-
 Requirements.md      | 17 +++++++++++++++--
 makeParaView.example |  4 ++++
 minCmake             |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index ddae736..2bd558f 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -452,14 +452,16 @@ The minimum CMake requirements for building various components.
 2.8         llvm-3.4.2
 2.8.11      CGAL-4.9
 2.8.11      CGAL-4.11
+3.1         CGAL-4.12 -> CGAL-4.14.3
 2.8.12.2    llvm-3.7.0
 2.8.12.2    llvm-3.8.0
 2.8.4       cmake-3.6.0
 3.3         ParaView-5.6.3
 3.10        ParaView-5.7.0 - ParaView-5.8.0
+3.12 - 3.16 ParaView-5.9.0 - ParaView-5.10.1
 3.4.3       llvm-3.9.1
 3.4.3       llvm-4.0.0 - llvm-6.0.0
-3.6         ADIOS2
+3.12        ADIOS2
 ```
 
 ### GCC Minimum Requirements <a name="min-gcc"></a>
diff --git a/Requirements.md b/Requirements.md
index c719ded..efd97e7 100644
--- a/Requirements.md
+++ b/Requirements.md
@@ -32,7 +32,7 @@ sudo apt install cmake qtbase5-dev qttools5-dev qttools5-dev-tools libqt5opengl5
 ```
 
 
-### openSUSE (eg, Leap-15.2)
+### openSUSE (eg, Leap-15.3)
 
 The full dependency list for building ParaView can be found from the
 corresponding [rpm spec][suse spec] file.
@@ -50,6 +50,19 @@ sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel
 sudo zypper install libxcb-devel libXt-devel
 ```
 
+For building paraview with ffmpeg support (components: avformat
+avcodec avutil swscale), the packman repository may be required, with a
+variety of additional packages:
+```
+sudo zypper install ffmpeg-3
+sudo zypper install ffmpeg-3-libavcodec-devel
+sudo zypper install ffmpeg-3-libavformat-devel
+sudo zypper install ffmpeg-3-libavresample-devel
+sudo zypper install ffmpeg-3-libavutil-devel
+sudo zypper install ffmpeg-3-libswresample-devel
+sudo zypper install ffmpeg-3-libswscale-devel
+```
+
 
 <!-- Quick links -->
 
@@ -70,4 +83,4 @@ sudo zypper install libxcb-devel libXt-devel
 [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
 
 ---
-Copyright 2019-2021 OpenCFD Ltd
+Copyright 2019-2022 OpenCFD Ltd
diff --git a/makeParaView.example b/makeParaView.example
index 48e7e9c..755a4fc 100755
--- a/makeParaView.example
+++ b/makeParaView.example
@@ -3,6 +3,8 @@
 # - mpi (0 = no upper-limit on processes)
 # - mesa
 # - python (required for Catalyst)
+# - has VTK_PYTHON_OPTIONAL_LINK=OFF to avoid
+#       undefined symbol: PyExc_ValueError
 #
 # NOTE: must modify etc/config.*/paraview to use this particular version
 # and combination, or use chaining as per etc/config.*/example/paraview
@@ -18,6 +20,8 @@ set -x
     -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
     -python \
     -suffix mesa-mpi-py \
+    -DPARAVIEW_ENABLE_FFMPEG=ON \
+    -DVTK_PYTHON_OPTIONAL_LINK=OFF \
     "$@"
 
 #------------------------------------------------------------------------------
diff --git a/minCmake b/minCmake
index 7e48843..251fb50 100755
--- a/minCmake
+++ b/minCmake
@@ -68,7 +68,7 @@ $(
     for dir in sources/*
     do
         [ -d "$dir" ] || continue
-        ## echo "search <$dir>" 1>&2
+        echo "search <$dir>" 1>&2
         depth=1
         # Is sources/pkg/pkg-version ?
         if [ "$(echo "$dir" | sed -e 's#.*/[a-z][a-z]*##' | wc -w)" = 0 ]
-- 
GitLab