small fixes for macos rpath

This commit is contained in:
2025-12-23 09:20:44 -06:00
parent 7ce42985e2
commit ff656d477f
2 changed files with 16 additions and 5 deletions

View File

@@ -608,10 +608,21 @@ sanitize_sysroot_libs() {
for lib in "${libs[@]}"; do for lib in "${libs[@]}"; do
local libPath="${LIBDIR}/${lib}" local libPath="${LIBDIR}/${lib}"
local useLib="${libPath}.${USE_LIB_SUFF}" local foundLib=false
if [[ ! -f ${useLib} ]]; then for useLib in "${libPath}"*"${USE_LIB_SUFF}"; do
echo_fail "could not find ${useLib}, something is wrong" test -f "${useLib}" || continue
foundLib=true
# darwin sometimes fails to set rpath correctly
if is_darwin && [[ ${STATIC} == 'OFF' ]]; then
install_name_tool \
-id "${useLib}" \
"${useLib}" || return 1
fi
done
if [[ ${foundLib} == false ]]; then
echo_fail "could not find ${libPath}*${USE_LIB_SUFF}, something is wrong"
return 1 return 1
fi fi
@@ -957,7 +968,7 @@ build_libvpx() {
--enable-vp8 \ --enable-vp8 \
--enable-vp9 \ --enable-vp9 \
--enable-vp9-highbitdepth \ --enable-vp9-highbitdepth \
--enable-better-hw-compatability \ --enable-better-hw-compatibility \
--enable-webm-io \ --enable-webm-io \
--enable-libyuv || return 1 --enable-libyuv || return 1
sanitize_sysroot_libs libvpx || return 1 sanitize_sysroot_libs libvpx || return 1

View File

@@ -447,7 +447,7 @@ gen_encode_script() {
echo 'ffmpeg "${ffmpegParams[@]}" -dolbyvision 0 "${OUTPUT}" || exit 1' echo 'ffmpeg "${ffmpegParams[@]}" -dolbyvision 0 "${OUTPUT}" || exit 1'
# track-stats and clear title # track-stats and clear title
if [[ ${FILE_EXT} == 'mkv' ]]; then if [[ ${FILE_EXT} == 'mkv' ]] && has_cmd mkvpropedit; then
{ {
echo echo
echo 'mkvpropedit "${OUTPUT}" --add-track-statistics-tags' echo 'mkvpropedit "${OUTPUT}" --add-track-statistics-tags'