diff --git a/.ci/build/configure.sh b/.ci/build/configure.sh index 52e7be31..39e23fe8 100755 --- a/.ci/build/configure.sh +++ b/.ci/build/configure.sh @@ -107,6 +107,11 @@ COMMON_FLAGS=( -DNIGHTLY_BUILD="${NIGHTLY:-OFF}" ) +# force static opus +if [ "$OPUS" = "true" ]; then + COMMON_FLAGS+=(-DOpus_FORCE_BUNDLED=ON) +fi + # cmd line stuff EXTRA_ARGS=("$@") diff --git a/.ci/build/platform.sh b/.ci/build/platform.sh index 25b219cb..91211007 100755 --- a/.ci/build/platform.sh +++ b/.ci/build/platform.sh @@ -8,6 +8,9 @@ QT=OFF STATIC=OFF +# set to ON to force a static opus +OPUS=OFF + uname -s # special case for Windows (FU microsoft) @@ -31,6 +34,7 @@ else OPENSSL=ON SIRIT=ON SUPPORTS_TARGETS=ON + OPUS=ON ;; Darwin*) PLATFORM=macos @@ -81,5 +85,6 @@ export SUPPORTS_TARGETS export SIRIT export STATIC export QT +export OPUS # TODO(crueter): document outputs n such diff --git a/.ci/deps/arch.sh b/.ci/deps/arch.sh index 0c8214f0..9ecf4510 100755 --- a/.ci/deps/arch.sh +++ b/.ci/deps/arch.sh @@ -69,7 +69,7 @@ echo "Installing debloated packages..." echo "---------------------------------------------------------------" wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" chmod +x get-debloated-pkgs.sh -./get-debloated-pkgs.sh --add-mesa qt6-base-mini libxml2-mini opus-nano intel-media-driver +./get-debloated-pkgs.sh --add-mesa qt6-base-mini libxml2-mini intel-media-driver echo "All done!" echo "---------------------------------------------------------------"