From efea97a026a7cc57e7e3c20c9d6e00d1336686f8 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Thu, 21 Nov 2024 22:44:12 +0100
Subject: [PATCH] Store dependencies configure args in bash arrays

This will make it possible to easily add items conditionally.
---
 app/deps/ffmpeg.sh | 81 ++++++++++++++++++++++++----------------------
 app/deps/libusb.sh | 13 +++++---
 app/deps/sdl.sh    | 11 ++++---
 3 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/app/deps/ffmpeg.sh b/app/deps/ffmpeg.sh
index c676664e..94fb06d2 100755
--- a/app/deps/ffmpeg.sh
+++ b/app/deps/ffmpeg.sh
@@ -47,45 +47,48 @@ else
     mkdir "$HOST"
     cd "$HOST"
 
-    "$SOURCES_DIR/$PROJECT_DIR"/configure \
-        --prefix="$INSTALL_DIR/$HOST" \
-        --enable-cross-compile \
-        --target-os=mingw32 \
-        --arch="$ARCH" \
-        --cross-prefix="${HOST_TRIPLET}-" \
-        --cc="${HOST_TRIPLET}-gcc" \
-        --extra-cflags="-O2 -fPIC" \
-        --enable-shared \
-        --disable-static \
-        --disable-programs \
-        --disable-doc \
-        --disable-swscale \
-        --disable-postproc \
-        --disable-avfilter \
-        --disable-avdevice \
-        --disable-network \
-        --disable-everything \
-        --disable-vulkan \
-        --disable-vaapi \
-        --disable-vdpau \
-        --enable-swresample \
-        --enable-decoder=h264 \
-        --enable-decoder=hevc \
-        --enable-decoder=av1 \
-        --enable-decoder=pcm_s16le \
-        --enable-decoder=opus \
-        --enable-decoder=aac \
-        --enable-decoder=flac \
-        --enable-decoder=png \
-        --enable-protocol=file \
-        --enable-demuxer=image2 \
-        --enable-parser=png \
-        --enable-zlib \
-        --enable-muxer=matroska \
-        --enable-muxer=mp4 \
-        --enable-muxer=opus \
-        --enable-muxer=flac \
-        --enable-muxer=wav \
+    conf=(
+        --prefix="$INSTALL_DIR/$HOST"
+        --enable-cross-compile
+        --target-os=mingw32
+        --arch="$ARCH"
+        --cross-prefix="${HOST_TRIPLET}-"
+        --cc="${HOST_TRIPLET}-gcc"
+        --extra-cflags="-O2 -fPIC"
+        --enable-shared
+        --disable-static
+        --disable-programs
+        --disable-doc
+        --disable-swscale
+        --disable-postproc
+        --disable-avfilter
+        --disable-avdevice
+        --disable-network
+        --disable-everything
+        --disable-vulkan
+        --disable-vaapi
+        --disable-vdpau
+        --enable-swresample
+        --enable-decoder=h264
+        --enable-decoder=hevc
+        --enable-decoder=av1
+        --enable-decoder=pcm_s16le
+        --enable-decoder=opus
+        --enable-decoder=aac
+        --enable-decoder=flac
+        --enable-decoder=png
+        --enable-protocol=file
+        --enable-demuxer=image2
+        --enable-parser=png
+        --enable-zlib
+        --enable-muxer=matroska
+        --enable-muxer=mp4
+        --enable-muxer=opus
+        --enable-muxer=flac
+        --enable-muxer=wav
+    )
+
+    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 fi
 
 make -j
diff --git a/app/deps/libusb.sh b/app/deps/libusb.sh
index 26f0140b..77a904b2 100755
--- a/app/deps/libusb.sh
+++ b/app/deps/libusb.sh
@@ -33,12 +33,15 @@ else
     mkdir "$HOST"
     cd "$HOST"
 
-    "$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
-    "$SOURCES_DIR/$PROJECT_DIR"/configure \
-        --prefix="$INSTALL_DIR/$HOST" \
-        --host="$HOST_TRIPLET" \
-        --enable-shared \
+    conf=(
+        --prefix="$INSTALL_DIR/$HOST"
+        --host="$HOST_TRIPLET"
+        --enable-shared
         --disable-static
+    )
+
+    "$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
+    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 fi
 
 make -j
diff --git a/app/deps/sdl.sh b/app/deps/sdl.sh
index 55866ccd..1bdd9a4b 100755
--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@@ -33,11 +33,14 @@ else
     mkdir "$HOST"
     cd "$HOST"
 
-    "$SOURCES_DIR/$PROJECT_DIR"/configure \
-        --prefix="$INSTALL_DIR/$HOST" \
-        --host="$HOST_TRIPLET" \
-        --enable-shared \
+    conf=(
+        --prefix="$INSTALL_DIR/$HOST"
+        --host="$HOST_TRIPLET"
+        --enable-shared
         --disable-static
+    )
+
+    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 fi
 
 make -j