small macos fixes

This commit is contained in:
2025-04-26 12:12:43 -05:00
parent 02e622951b
commit 9da2d4d7a9
2 changed files with 6 additions and 9 deletions

View File

@@ -261,9 +261,7 @@ build_hdr10plus_tool() {
# build libhdr10plus # build libhdr10plus
cd hdr10plus || return 1 cd hdr10plus || return 1
ccache cargo cbuild --release ccache cargo cbuild --release
rm -rf build.user ${SUDO} bash -lc "cargo cinstall --prefix=${PREFIX} --release" || return 1
cargo cinstall --prefix=build.user --release || return 1
${SUDO} cp -r build.user/* "${PREFIX}/"
} }
build_dovi_tool() { build_dovi_tool() {
@@ -275,9 +273,7 @@ build_dovi_tool() {
# build libdovi # build libdovi
cd dolby_vision || return 1 cd dolby_vision || return 1
ccache cargo cbuild --release ccache cargo cbuild --release
rm -rf build.user ${SUDO} bash -lc "cargo cinstall --prefix=${PREFIX} --release" || return 1
cargo cinstall --prefix=build.user --release || return 1
${SUDO} cp -r build.user/* "${PREFIX}/"
} }
build_libsvtav1_psy() { build_libsvtav1_psy() {

View File

@@ -13,7 +13,7 @@ determine_darwin_pkg_mgr() {
fi fi
PKG_MGR=brew PKG_MGR=brew
check_pkg_exists() { check_pkg_exists() {
"${PKG_MGR}" list "${1}" "${PKG_MGR}" list --formula "${1}" >/dev/null
} }
PKG_MGR_UPD="${PKG_MGR} update" PKG_MGR_UPD="${PKG_MGR} update"
PKG_MGR_INST="${PKG_MGR} install" PKG_MGR_INST="${PKG_MGR} install"
@@ -106,7 +106,8 @@ check_for_req_pkgs() {
) )
# shellcheck disable=SC2034 # shellcheck disable=SC2034
local brew_pkgs=( local brew_pkgs=(
"${common_pkgs[@]}" pkgconf mkvtoolnix "${common_pkgs[@]}" pkgconf
mkvtoolnix pipx
) )
local common_linux_pkgs=( local common_linux_pkgs=(
"${common_pkgs[@]}" clang valgrind "${common_pkgs[@]}" clang valgrind
@@ -134,7 +135,7 @@ check_for_req_pkgs() {
pipx ninja-build pipx ninja-build
) )
if test "${TARGET_WINDOWS}" -eq 1; then if [[ "${TARGET_WINDOWS}" -eq 1 ]]; then
apt_get_pkgs+=(gcc-mingw-w64 g++-mingw-w64) apt_get_pkgs+=(gcc-mingw-w64 g++-mingw-w64)
fi fi