ref:49abb1606a91fa047a6711a9f38be7bfe6f6a284

fix(build): ensure libopus is statically linked (#4819)

SHA: 49abb1606a91fa047a6711a9f38be7bfe6f6a284
Author: Andy Grundman <andy@hybridized.org>
Date: 2026-03-06 01:08
Parents: a97ed29
4 files changed +34 -5
Type
.github/workflows/ci-macos.yml +2 −1
@@ -130,7 +130,8 @@
--apple-id "${APPLE_ID}" \
--team-id "${APPLE_TEAM_ID}" \
--password "${APPLE_NOTARYTOOL_PASSWORD}" \
--wait
--wait \
--timeout 15m
xcrun stapler staple -v build/cpack_artifacts/Sunshine.dmg
fi
fi
cmake/dependencies/common.cmake +1 −0
@@ -33,6 +33,7 @@
include("${CMAKE_MODULE_PATH}/dependencies/ffmpeg.cmake")
# Opus
set(OPUS_USE_STATIC ON CACHE BOOL "Static linking for libopus")
include("${CMAKE_MODULE_PATH}/dependencies/FindOpus.cmake")
# platform specific dependencies
cmake/dependencies/FindOpus.cmake +21 −2
@@ -36,6 +36,8 @@
"${Opus_ROOT_DIR}"
CACHE PATH "Root to search for opus")
option(OPUS_USE_STATIC "Prefer linking against a static Opus library" OFF)
# Todo: handle in-tree/fetch-content builds?
if(NOT OPUS_FOUND)
@@ -62,6 +64,17 @@
endif()
endif()
set(_opus_library_names opus)
if(OPUS_USE_STATIC)
set(_opus_library_names libopus opus)
endif()
# Temporarily prefer static suffixes when requested.
set(_old_find_suffixes "${CMAKE_FIND_LIBRARY_SUFFIXES}")
if(OPUS_USE_STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib" ${_old_find_suffixes})
endif()
find_path(
Opus_INCLUDE_DIR
NAMES opus/opus.h
@@ -70,11 +83,13 @@
PATH_SUFFIXES include)
find_library(
Opus_LIBRARY
NAMES ${_opus_library_names}
NAMES opus
PATHS ${Opus_ROOT_DIR}
HINTS ${PC_opus_LIBRARY_DIRS}
PATH_SUFFIXES lib)
set(CMAKE_FIND_LIBRARY_SUFFIXES "${_old_find_suffixes}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Opus REQUIRED_VARS Opus_LIBRARY
Opus_INCLUDE_DIR)
@@ -85,7 +100,11 @@
add_library(Opus::opus ALIAS ${Opus_LIBRARY})
else()
# we want an imported target
if(OPUS_USE_STATIC)
add_library(Opus::opus UNKNOWN IMPORTED)
add_library(Opus::opus STATIC IMPORTED)
else()
add_library(Opus::opus UNKNOWN IMPORTED)
endif()
set_target_properties(
Opus::opus
scripts/macos_build.sh +10 −2
@@ -13,6 +13,7 @@
build_tests="ON"
build_type="Release"
sign_app="true"
notarize="true"
# environment variables
# BUILD_VERSION should be empty or cmake will assume a CI build
@@ -66,6 +67,7 @@
--build-docs Build docs.
--skip-tests Don't build the test suite.
--skip-codesign Don't sign/notarize the bundle.
--skip-notarize Don't notarize the dmg.
Steps:
deps Install dependencies only
@@ -147,8 +149,11 @@
cpack -G DragNDrop --config "${build_dir}/CPackConfig.cmake" --verbose
if [[ -n "${sign_app}" ]]; then
xcrun notarytool submit "${build_dir}/cpack_artifacts/Sunshine.dmg" --keychain-profile "notarytool-password" --wait
if [[ -n "${sign_app}" && -n "${notarize}" ]]; then
time xcrun notarytool submit "${build_dir}/cpack_artifacts/Sunshine.dmg" \
--keychain-profile "notarytool-password" \
--wait \
--timeout 15m
xcrun stapler staple -v "${build_dir}/cpack_artifacts/Sunshine.dmg"
fi
return 0
@@ -215,6 +220,9 @@
;;
skip-codesign)
sign_app=""
;;
skip-notarize)
notarize=""
;;
*)
echo "Invalid option: --${OPTARG}" 1>&2