Merge branch 'develop' into 'master'

merge develop into master See merge request Scientific-IT-Systems/gr!1316
sciapp · Jul 22, 2024 · a8f4f0b · a8f4f0b
2 parents 3b7a729 + 10d226d
commit a8f4f0b
Show file tree

Hide file tree

Showing 66 changed files with 9,514 additions and 2,503 deletions.
diff --git a/.gitlab-ci/build-darwin.yml b/.gitlab-ci/build-darwin.yml
@@ -176,12 +176,12 @@ darwin-self-contained:
     CAIRO_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--arch=x86_64 --cc=\"cc -arch x86_64\" --cxx=\"c++ -arch x86_64\" --enable-cross-compile"
     GLFW_EXTRA_CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=x86_64"
-    LIBXML2_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
     OGG_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
     OPENH264_EXTRA_MAKE_FLAGS="ARCH=x86_64"
     PIXMAN_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin --disable-asm"
     TIFF_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
+    XERCES_C_EXTRA_CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=x86_64"
     ZEROMQ_EXTRA_CONFIGURE_FLAGS="--host=x86_64-apple-darwin"
   - make self
     ARCH="x86_64"

diff --git a/.gitlab-ci/build-debian.yml b/.gitlab-ci/build-debian.yml
@@ -58,15 +58,15 @@ debian-self-contained-armhf:
     STRIP=arm-linux-gnueabihf-strip \
     PNG_EXTRA_CFLAGS="-DPNG_ARM_NEON_OPT=0" \
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/armhf-linux-gnu.cmake \
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/armhf-linux-gnu.cmake \
     OGG_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=arm-linux --disable-asm" \
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=arm-linux-gnueabihf- --arch=armhf --target-os=linux --pkg-config=pkg-config" \
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihfnu \
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     OPENH264_EXTRA_MAKE_FLAGS="OS=linux ARCH=armhf" \
-    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf
+    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf
   - make self \
     CC=arm-linux-gnueabihf-gcc \
     LD=arm-linux-gnueabihf-ld \
@@ -109,15 +109,15 @@ debian-self-contained-aarch64:
     STRIP=aarch64-linux-gnu-strip \
     PNG_EXTRA_CFLAGS="-DPNG_ARM_NEON_OPT=0" \
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/aarch64-linux-gnu.cmake \
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/aarch64-linux-gnu.cmake \
     OGG_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=arm-linux --disable-asm" \
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=aarch64-linux-gnu- --arch=aarch64 --target-os=linux --pkg-config=pkg-config" \
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     OPENH264_EXTRA_MAKE_FLAGS="OS=linux ARCH=aarch64" \
-    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu
+    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu
   - make self \
     CC=aarch64-linux-gnu-gcc \
     LD=aarch64-linux-gnu-ld \
@@ -159,15 +159,15 @@ debian-cmake-self-contained-aarch64:
     STRIP=aarch64-linux-gnu-strip \
     PNG_EXTRA_CFLAGS="-DPNG_ARM_NEON_OPT=0" \
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/aarch64-linux-gnu.cmake \
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/aarch64-linux-gnu.cmake \
     OGG_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=arm-linux --disable-asm" \
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=aarch64-linux-gnu- --arch=aarch64 --target-os=linux --pkg-config=pkg-config" \
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
     OPENH264_EXTRA_MAKE_FLAGS="OS=linux ARCH=aarch64" \
-    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu \
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu
+    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=aarch64-linux-gnu
   - wget https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
@@ -180,7 +180,7 @@ debian-cmake-self-contained-aarch64:
   artifacts:
     expire_in: 1 week
     paths:
-    - artifacts-debian10-cmake-aarch64/
+      - artifacts-debian10-cmake-aarch64/
 
 debian-cmake-self-contained-armhf:
   stage: build
@@ -196,15 +196,15 @@ debian-cmake-self-contained-armhf:
     STRIP=arm-linux-gnueabihf-strip \
     PNG_EXTRA_CFLAGS="-DPNG_ARM_NEON_OPT=0" \
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/armhf-linux-gnu.cmake \
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/armhf-linux-gnu.cmake \
     OGG_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=arm-linux --disable-asm" \
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=arm-linux-gnueabihf- --arch=armhf --target-os=linux --pkg-config=pkg-config" \
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
     OPENH264_EXTRA_MAKE_FLAGS="OS=linux ARCH=armhf" \
-    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf \
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf
+    ZEROMQ_EXTRA_CONFIGURE_FLAGS=--host=arm-linux-gnueabihf
   - wget https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake

diff --git a/.gitlab-ci/build-windows.yml b/.gitlab-ci/build-windows.yml
@@ -6,21 +6,21 @@ windows-32bit-cross:
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
   - make -C 3rdparty default extras
-    EXTRAS="tiff ogg theora vpx ffmpeg pixman cairo agg libxml2"
+    EXTRAS="tiff ogg theora vpx ffmpeg pixman cairo agg xerces-c"
     HOST=i686-w64-mingw32
     ARCHITECTURE=i686
     OS=w64_x86-cross-mingw32
     CC=i686-w64-mingw32-gcc
     CXX=i686-w64-mingw32-g++
     AR=i686-w64-mingw32-ar
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/i686-w64-mingw32.cmake
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/i686-w64-mingw32.cmake
     OGG_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=i686-w64-mingw32 --disable-asm"
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=i686-w64-mingw32- --arch=i686 --target-os=mingw32 --pkg-config=pkg-config"
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     OPENH264_EXTRA_MAKE_FLAGS="OS=mingw_nt ARCH=i386 CFLAGS=-fno-exceptions CXXFLAGS=-fno-exceptions LDFLAGS=-fno-exceptions"
   - MAKE="make -f makefile.mingw" make -f makefile.mingw
     GRDIR=./
@@ -73,7 +73,7 @@ windows-32bit-cmake-cross:
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
   - make -C 3rdparty default extras
-    EXTRAS="tiff ogg theora vpx ffmpeg pixman cairo agg libxml2"
+    EXTRAS="tiff ogg theora vpx ffmpeg pixman cairo agg xerces-c"
     HOST=i686-w64-mingw32
     ARCHITECTURE=i686
     OS=w64_x86-cross-mingw32
@@ -82,30 +82,14 @@ windows-32bit-cmake-cross:
     AR=i686-w64-mingw32-ar
     OPENJP2_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/i686-w64-mingw32.cmake
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/i686-w64-mingw32.cmake
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/i686-w64-mingw32.cmake
     OGG_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     THEORA_EXTRA_CONFIGURE_FLAGS="--host=i686-w64-mingw32 --disable-asm"
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=i686-w64-mingw32- --arch=i686 --target-os=mingw32 --pkg-config=pkg-config"
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=i686-w64-mingw32
     OPENH264_EXTRA_MAKE_FLAGS="OS=mingw_nt ARCH=i386 CFLAGS=-fno-exceptions CXXFLAGS=-fno-exceptions LDFLAGS=-fno-exceptions"
-  - cd 3rdparty/build/lib/cmake/libxml2
-  - |-
-    patch -N <<'EOF'
-    --- libxml2-config.cmake        2023-05-24 10:50:21.099243441 +0000
-    +++ libxml2-config.cmake.patched        2023-05-24 10:50:42.289604090 +0000
-    @@ -29,7 +29,7 @@
-     set(LIBXML2_VERSION_MINOR  10)
-     set(LIBXML2_VERSION_MICRO  4)
-     set(LIBXML2_VERSION_STRING "2.10.4")
-    -set(LIBXML2_DEFINITIONS    " -DLIBXML_STATIC")
-    +set(LIBXML2_DEFINITIONS    -DLIBXML_STATIC)
-     set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
-     set(LIBXML2_INCLUDE_DIR    ${_libxml2_rootdir}/include/libxml2)
-     set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)
-    EOF
-  - cd -
   - mkdir build
   - cd build
   - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_TOOLCHAIN_FILE=`pwd`/../cmake/i686-w64-mingw32.cmake -DCMAKE_MODULE_PATH=${CI_PROJECT_DIR}/qt5-runtime-Windows-i686/cmake -DGR_MANUAL_MOC_AND_RCC=ON -DGR_USE_BUNDLED_LIBRARIES=ON
@@ -129,21 +113,21 @@ windows-64bit-cross:
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
   - make -C 3rdparty default extras
-    EXTRAS="tiff ogg theora vpx openh264 ffmpeg pixman cairo agg libxml2"
+    EXTRAS="tiff ogg theora vpx openh264 ffmpeg pixman cairo agg xerces-c"
     HOST=x86_64-w64-mingw32
     ARCHITECTURE=x86_64
     OS=w64_amd64-cross-mingw32
     CC=x86_64-w64-mingw32-gcc
     CXX=x86_64-w64-mingw32-g++
     AR=x86_64-w64-mingw32-ar
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/x86_64-w64-mingw32.cmake
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/x86_64-w64-mingw32.cmake
     OGG_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     THEORA_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32 --pkg-config=pkg-config"
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     OPENH264_EXTRA_MAKE_FLAGS=OS=mingw_nt
   - MAKE="make -f makefile.mingw" make -f makefile.mingw
     GRDIR=./
@@ -196,7 +180,7 @@ windows-64bit-cmake-cross:
   - tar xf cmake-3.23.0-linux-x86_64.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
   - make -C 3rdparty default extras
-    EXTRAS="tiff ogg theora vpx openh264 ffmpeg pixman cairo agg libxml2"
+    EXTRAS="tiff ogg theora vpx openh264 ffmpeg pixman cairo agg xerces-c"
     HOST=x86_64-w64-mingw32
     ARCHITECTURE=x86_64
     OS=w64_amd64-cross-mingw32
@@ -205,30 +189,14 @@ windows-64bit-cmake-cross:
     AR=x86_64-w64-mingw32-ar
     OPENJP2_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/x86_64-w64-mingw32.cmake
     GLFW_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/x86_64-w64-mingw32.cmake
+    XERCES_C_EXTRA_CMAKE_FLAGS=-DCMAKE_TOOLCHAIN_FILE=`pwd`/cmake/x86_64-w64-mingw32.cmake
     OGG_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     THEORA_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     FFMPEG_EXTRA_CONFIGURE_FLAGS="--cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32 --pkg-config=pkg-config"
     PIXMAN_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     CAIRO_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     TIFF_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
-    LIBXML2_EXTRA_CONFIGURE_FLAGS=--host=x86_64-w64-mingw32
     OPENH264_EXTRA_MAKE_FLAGS=OS=mingw_nt
-  - cd 3rdparty/build/lib/cmake/libxml2
-  - |-
-    patch -N <<'EOF'
-    --- libxml2-config.cmake        2023-05-24 10:50:21.099243441 +0000
-    +++ libxml2-config.cmake.patched        2023-05-24 10:50:42.289604090 +0000
-    @@ -29,7 +29,7 @@
-     set(LIBXML2_VERSION_MINOR  10)
-     set(LIBXML2_VERSION_MICRO  4)
-     set(LIBXML2_VERSION_STRING "2.10.4")
-    -set(LIBXML2_DEFINITIONS    " -DLIBXML_STATIC")
-    +set(LIBXML2_DEFINITIONS    -DLIBXML_STATIC)
-     set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
-     set(LIBXML2_INCLUDE_DIR    ${_libxml2_rootdir}/include/libxml2)
-     set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)
-    EOF
-  - cd -
   - mkdir build
   - cd build
   - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_TOOLCHAIN_FILE=`pwd`/../cmake/x86_64-w64-mingw32.cmake -DCMAKE_MODULE_PATH=${CI_PROJECT_DIR}/qt5-runtime-Windows-x86_64/cmake -DGR_MANUAL_MOC_AND_RCC=ON  -DGR_USE_BUNDLED_LIBRARIES=ON
@@ -242,7 +210,7 @@ windows-64bit-cmake-cross:
   artifacts:
     expire_in: 1 week
     paths:
-      - artifacts-windows-64bit-cmake/
+    - artifacts-windows-64bit-cmake/
 
 windows-64bit-cmake-msvc:
   stage: build
@@ -261,7 +229,7 @@ windows-64bit-cmake-msvc:
   - cp -v /c/Qt/5.15.2/msvc2019_64/plugins/platforms/qwindows.dll platforms/
   - cd -
   - cd /c/local/bin
-  - cp -v cairo.dll freetype.dll jpeg62.dll libpng16.dll libxml2.dll pixman-1-0.dll qhull_r.dll tiff.dll tiffxx.dll turbojpeg.dll zlib.dll /c/gr/bin/
+  - cp -v cairo.dll freetype.dll jpeg62.dll libpng16.dll pixman-1-0.dll qhull_r.dll tiff.dll tiffxx.dll turbojpeg.dll xerces-c_3_2.dll zlib.dll /c/gr/bin/
   - cd -
   - cp -v "/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/vcruntime140.dll" /c/gr/bin/
   - cp -v "/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/vcruntime140_1.dll" /c/gr/bin/
@@ -272,3 +240,4 @@ windows-64bit-cmake-msvc:
     expire_in: 1 week
     paths:
     - artifacts-windows-64bit-cmake-msvc/
+
diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml
@@ -71,7 +71,7 @@ code-style-check:
       [[ "${file}" != 3rdparty* ]] && [[ "${file}" != apps* ]] || continue;
       [[ "${file}" =~ \.(c|cpp|cxx|m|h|hpp|hxx)$ ]] || continue;
       grep -vr $'\r' "${file}" >/dev/null || { echo "${file} must not contain carriage return as line endings."; exit 1; };
-      file --mime "${file}" | grep "charset=us-ascii" >/dev/null || { echo "${file} must be encoded as ASCII text."; exit 1; };
+      file --mime "${file}" | grep -E "charset=(us-ascii|utf-8)" >/dev/null || { echo "${file} must be either encoded in ASCII or UTF-8."; exit 1; };
       clang-format -verbose -style=file "${file}" > "${file}.formatted";
       if ! diff -q "${file}" "${file}.formatted"; then
         diff "${file}" "${file}.formatted";
@@ -84,7 +84,7 @@ code-style-check:
       [[ "${file}" != 3rdparty* ]] && [[ "${file}" != apps* ]] || continue;
       [[ "${file}" =~ (^|/)CMakeLists.txt$ || "${file}" =~ \.cmake$ ]] || continue;
       grep -vr $'\r' "${file}" >/dev/null || { echo "${file} must not contain carriage return as line endings."; exit 1; };
-      file --mime "${file}" | grep "charset=us-ascii" >/dev/null || { echo "${file} must be encoded as ASCII text."; exit 1; };
+      file --mime "${file}" | grep -E "charset=(us-ascii|utf-8)" >/dev/null || { echo "${file} must be either encoded in ASCII or UTF-8."; exit 1; };
       echo "Formatting ${file}";
       cmake-format "${file}" > "${file}.formatted";
       if ! diff -q "${file}" "${file}.formatted"; then

diff --git a/3rdparty/Makefile b/3rdparty/Makefile
@@ -4,7 +4,7 @@ UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
  TARGETS += zeromq
 endif
-  EXTRAS = agg tiff ogg theora vpx openh264 ffmpeg glfw zeromq pixman cairo libxml2
+  EXTRAS = agg tiff ogg theora vpx openh264 ffmpeg glfw zeromq pixman cairo icu xerces-c
      DIR =
 
 default:

diff --git a/3rdparty/expat/Makefile b/3rdparty/expat/Makefile
diff --git a/3rdparty/ffmpeg/Makefile b/3rdparty/ffmpeg/Makefile
@@ -2,7 +2,7 @@ ifeq ($(strip $(PREFIX)),)
 override PREFIX = $(abspath $(CURDIR)/../build)
 endif
 
-VERSION = 4.2.1
+VERSION = 5.1.4
 FFMPEG_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
 FFMPEG_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.15