CI functions: if intended to run subsh, drop {}

MartinPulec · MartinPulec · commit e67bda26f3aa · 2026-04-13T10:33:57.000+02:00
The syntax `func() {(); }` is uneeded because the compaund command for
function body can be both `( compound-list )` and ` ( compound-list; )`
(i.a.).

Also changed some of install_ffmpeg.sh functions from {} to () if it
was not in subshell (because the most of the others are). Similarly in
install_glfw.sh and some others. Those are not expected to change the
main shell vars.
diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh
@@ -8,7 +8,7 @@ dir=$(dirname "$0")
 cache_dir=/var/tmp/ffmpeg
 
 # install the deps - runs always (regardless the cache)
-deps() {
+deps() (
         ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'libsdl')
         # shellcheck disable=SC2086 # intentional
         sudo apt install $ffmpeg_build_dep libde265-dev \
@@ -17,35 +17,35 @@ deps() {
 
         sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' \
                 libvpx-dev nginx
-}
+)
 
-install_aom() {(
+install_aom() (
         git clone --depth 1 https://aomedia.googlesource.com/aom
         mkdir -p aom/build
         cd aom/build
         cmake -DBUILD_SHARED_LIBS=1 ..
         cmake --build . --parallel "$(nproc)"
         sudo cmake --install .
-)}
+)
 
-install_dav1d() {(
+install_dav1d() (
         git clone --depth 1 https://code.videolan.org/videolan/dav1d.git
         mkdir -p dav1d/build && cd dav1d/build
         meson ..
         ninja
         sudo ninja install
-)}
+)
 
-install_libvpx() {(
+install_libvpx() (
         git clone --depth 1 https://github.com/webmproject/libvpx.git
         cd libvpx
         ./configure --enable-pic --disable-examples --disable-install-bins \
                         --disable-install-srcs --enable-vp9-highbitdepth
         make -j "$(nproc)"
         sudo make install
-)}
+)
 
-install_svt() {
+install_svt() (
         ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC &&
                 cd SVT-HEVC/Build/linux && ./build.sh release && cd Release &&
                 sudo cmake --install . || exit 1 )
@@ -59,33 +59,33 @@ install_svt() {
         # libsvtav1 in FFmpeg upstream, for SVT-HEVC now our custom patch in ffmpeg-patches
         # if patch apply fails, try increasing $FFMPEG_GIT_DEPTH
         git am -3 SVT-VP9/ffmpeg_plugin/master-*.patch
-}
+)
 
 # The NV Video Codec SDK headers version 12.0 implies driver v520.56.06 in Linux
-install_nv_codec_headers() {
+install_nv_codec_headers() (
         git clone --depth 1 -b sdk/12.0 https://github.com/FFmpeg/nv-codec-headers
         ( cd nv-codec-headers && make && sudo make install || exit 1 )
-}
+)
 
-install_oapv() {(
+install_oapv() (
         git clone --depth 1 https://github.com/AcademySoftwareFoundation/openapv.git
         export CFLAGS='-ffat-lto-objects'
         cmake -B openapv/build -S openapv \
                 -DCMAKE_BUILD_TYPE=Release
         cmake --build openapv/build --parallel "$(nproc)"
         sudo cmake --install openapv/build
-)}
+)
 
-install_onevpl() {(
+install_onevpl() (
         git clone --depth 1 https://github.com/oneapi-src/oneVPL
         mkdir oneVPL/build
         cd oneVPL/build
         cmake -DBUILD_TOOLS=OFF ..
         cmake --build . --config Release --parallel
         sudo cmake --build . --config Release --target install
-)}
+)
 
-install_rav1e() {(
+install_rav1e() (
         # TODO: use avx2 later
         if expr "${UG_ARCH-}" : '.*avx' >/dev/null; then
                 avx2=avx2
@@ -98,10 +98,10 @@ install_rav1e() {(
         sudo sed -i -e 's-prefix=dist-prefix=/usr/local-' \
                 -e 's/-lrav1e/-lrav1e -lm -pthread/' \
                 /usr/local/lib/pkgconfig/rav1e.pc
-)}
+)
 
 # build FFmpeg deps + FFmpeg itself
-build_install() {
+build_install() (
         rm -rf $cache_dir
         FFMPEG_GIT_DEPTH=5000 # greater depth is useful for 3-way merges
         git clone --depth $FFMPEG_GIT_DEPTH https://github.com/FFmpeg/FFmpeg.git \
@@ -143,10 +143,10 @@ build_install() {
         make -j "$(nproc)"
         sudo make install
         sudo ldconfig
-}
+)
 
 # if cache is successfully restored, just install the builds
-install_cached() {
+install_cached() (
         cd $cache_dir
         ( cd libvpx && sudo make install )
         ( cd nv-codec-headers && sudo make install )
@@ -161,7 +161,7 @@ install_cached() {
 
         sudo make install
         sudo ldconfig
-}
+)
 
 deps
 if [ -d $cache_dir ]; then
diff --git a/.github/scripts/Linux/install_glfw.sh b/.github/scripts/Linux/install_glfw.sh
@@ -13,7 +13,7 @@ deps() {
 }
 
 # build SDL, SDL_ttf and fluidsynth and also install them
-build_install() {
+build_install() (
         mkdir -p $cache_dir
         cd $cache_dir
 
@@ -22,13 +22,13 @@ build_install() {
                 -DGLFW_BUILD_WAYLAND=ON -DGLFW_BUILD_X11=ON
         cmake --build glfw/build -j "$(nproc)"
         sudo cmake --install glfw/build
-}
+)
 
 # if cache is successfully restored, just install the builds
-install_cached() {
+install_cached() (
         cd $cache_dir
         sudo cmake --install glfw/build
-}
+)
 
 deps
 if [ -d $cache_dir ]; then
diff --git a/.github/scripts/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh
@@ -6,24 +6,24 @@ if [ "$(id -u)" -eq 0 ]; then
         alias sudo=
 fi
 
-install_ximea() {
+install_ximea() (
         filename=XIMEA.tgz
         curl -L "$XIMEA_DOWNLOAD_URL" -o "$filename"
         tar xzf $filename
         cd package
         sudo ./install -noudev
-}
+)
 
-install_gpujpeg() {(
+install_gpujpeg() (
         curl -LO https://github.com/CESNET/GPUJPEG/releases/download/\
 continuous/GPUJPEG-Linux.tar.xz
         tar xaf GPUJPEG-Linux.tar.xz
         sudo cp -r GPUJPEG/* /usr/local/
         sudo ldconfig
-)}
+)
 
 # Install NDI
-install_ndi() {(
+install_ndi() (
         if [ ! -f Install_NDI_SDK_Linux.tar.gz ]; then
                 curl -Lf https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
 Install_NDI_SDK_v6_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz
@@ -33,20 +33,20 @@ Install_NDI_SDK_v6_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz
         installer=./Install*NDI*sh
         yes | PAGER="cat" $installer
         sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include/
-)}
+)
 
-install_svt_jpegxs() {(
+install_svt_jpegxs() (
         git clone --depth 1 https://github.com/OpenVisualCloud/SVT-JPEG-XS
         # when built in U22.04, the stack is set as executable for some reason,
         # not in Arch, eg.
         export LDFLAGS="-Wl,-z,noexecstack"
         cmake -B SVT-JPEG-XS/build SVT-JPEG-XS
         cmake --build SVT-JPEG-XS/build --parallel "$(nproc)"
         sudo cmake --install SVT-JPEG-XS/build
-)}
+)
 
 # FFmpeg master needs at least v1.3.277 as for 6th Mar '25
-install_vulkan() {(
+install_vulkan() (
         sudo apt build-dep libvulkan1
         git clone --depth 1 https://github.com/KhronosGroup/Vulkan-Headers
         mkdir Vulkan-Headers/build
@@ -60,9 +60,9 @@ install_vulkan() {(
         cmake ..
         cmake --build . --parallel "$(nproc)"
         sudo make install
-)}
+)
 
-install_omt() {(
+install_omt() (
         sudo apt install dotnet8
 
         mkdir omt_build
@@ -89,7 +89,7 @@ install_omt() {(
         sudo cp libvmx/build/libvmx.so /usr/local/lib/
         sudo cp libomt/bin/Release/net8.0/linux-x64/publish/libomt.so /usr/local/lib/
         sudo cp libomt/bin/Release/net8.0/linux-x64/publish/libomt.h /usr/local/include/
-)}
+)
 
 show_help=
 if [ $# -eq 1 ] && { [ "$1" = -h ] || [ "$1" = --help ] || [ "$1" = help ]; }; then
diff --git a/.github/scripts/Linux/install_sdl.sh b/.github/scripts/Linux/install_sdl.sh
@@ -13,16 +13,16 @@ features="-DSDL_KMSDRM=ON\
  -DSDL_X11=ON"
 
 # install the deps - runs always (regardless the cache)
-deps() {
+deps() (
         sudo apt build-dep libsdl2
         fluidsynth_build_dep=$(get_build_deps_excl libfluidsynth3 libsdl2-dev)
         sdl2_ttf_build_dep=$(get_build_deps_excl libsdl2-ttf libsdl2-dev)
         # shellcheck disable=SC2086 # intentional
         sudo apt install $fluidsynth_build_dep $sdl2_ttf_build_dep libxtst-dev
-}
+)
 
 # build SDL, SDL_ttf and fluidsynth and also install them
-build_install() {
+build_install() (
         mkdir -p $cache_dir
         cd $cache_dir
 
@@ -42,15 +42,15 @@ build_install() {
         cmake $features -S fluidsynth -B fluidsynth/build
         cmake --build fluidsynth/build -j "$(nproc)"
         sudo cmake --install fluidsynth/build
-}
+)
 
 # if cache is successfully restored, just install the builds
-install_cached() {
+install_cached() (
         cd $cache_dir
         sudo cmake --install SDL/build
         sudo cmake --install SDL_ttf/build
         sudo cmake --install fluidsynth/build
-}
+)
 
 deps
 if [ -d $cache_dir ]; then
diff --git a/.github/scripts/Windows/install_cineform.sh b/.github/scripts/Windows/install_cineform.sh
@@ -15,7 +15,7 @@
 #        sed -i "1s-\${prefix}-/usr/local-" lib/pkgconfig/libcineformsdk.pc
 #)}
 
-build() {(
+build() (
         cd /c
         rm -rf cineform-sdk
         git clone --depth 1 https://github.com/gopro/cineform-sdk
@@ -25,15 +25,15 @@ build() {(
         cmake -DBUILD_STATIC=false -DBUILD_TOOLS=false -A x64 .. # assume
                                                   # "-G 'Visual Studio 16 2019'"
         cmake --build . --config Release --parallel "$(nproc)"
-)}
+)
 
-install() {(
+install() (
         mkdir -p /usr/local/bin /usr/local/include /usr/local/lib
         cd /c/cineform-sdk/build
         cp Release/CFHDCodec.dll /usr/local/bin/
         cp Release/CFHDCodec.lib /usr/local/lib/
         cp ../Common/* /usr/local/include/
         # mkdir /usr/local/lib/pkgconfig; cp libcineformsdk.pc /usr/local/lib/pkgconfig/
-)}
+)
 
 $1
diff --git a/.github/scripts/Windows/install_spout.sh b/.github/scripts/Windows/install_spout.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -eux
 # Install SPOUT
 
-build() {(
+build() (
         cd /c
         rm -rf Spout2
         git clone --depth 1 https://github.com/leadedge/Spout2.git
@@ -15,13 +15,13 @@ build() {(
         /c/Program\ Files/CMake/bin/cmake.exe -Bbuild2 . # ./BUILD already exists
         /c/Program\ Files/CMake/bin/cmake.exe --build build2 --config Release \
          -j "$(nproc)"
-)}
+)
 
-install() {(
+install() (
         mkdir -p /usr/local/bin /usr/local/include /usr/local/lib
         cp /c/Spout2/build2/bin/Release/SpoutLibrary.dll /usr/local/bin/
         cp /c/Spout2/build2/lib/Release/SpoutLibrary.lib /usr/local/lib/
         cp /c/Spout2/SPOUTSDK/SpoutLibrary/SpoutLibrary.h /usr/local/include/
-)}
+)
 
 $1
diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
@@ -69,11 +69,11 @@ $PACMAN_INSTALL $m-imagemagick $m-opencv
 $PACMAN_INSTALL libtool # PCP
 pacman -Scc --noconfirm
 
-build_aja_wrapper() {(
+build_aja_wrapper() (
         data/scripts/build_aja_lib_win64.sh
-)}
+)
 
-install_deltacast() {(
+install_deltacast() (
         if [ -z "$SDK_URL" ]; then
                         return
         fi
@@ -90,15 +90,15 @@ install_deltacast() {(
         fi
         cd ..
         rm -rf VideoMaster
-)}
+)
 
-install_gpujpeg() {(
+install_gpujpeg() (
         fname=GPUJPEG-Windows.zip
         wget --no-verbose \
 https://github.com/CESNET/GPUJPEG/releases/download/continuous/"$fname"
         unzip "./$fname"
         cp -r GPUJPEG/* /usr/local/
-)}
+)
 
 # Install cross-platform deps
 "$GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh"
diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh
diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh
