Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

build: fix bundling mac x86 libraries

Browse source 
Retains the cachable separate build dirs while overhauling the way the
MacPorts install prefix is assembled.
This commit is contained in:
Eike Hein 2024-04-09 23:13:41 +02:00 • committed by Marcin Kurczewski
parent e10c85b652
commit 5276f28a58
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
.github/workflows/build_macos.yml vendored
View file

@ -10,9 +10,9 @@ on:
default: false default: false
env: env:
FFMPEG_INSTALL_FUSED: /opt/local FFMPEG_INSTALL_FINAL: /opt/local
FFMPEG_INSTALL_TMP_FUSED: /tmp/fused
FFMPEG_INSTALL_TMP_UNIVERSAL: /tmp/install_universal FFMPEG_INSTALL_TMP_UNIVERSAL: /tmp/install_universal
FFMPEG_INSTALL_TMP_ARM64: /tmp/install_arm64
FFMPEG_INSTALL_TMP_X86_64: /tmp/install_x86_64 FFMPEG_INSTALL_TMP_X86_64: /tmp/install_x86_64
jobs: jobs:
@ -87,7 +87,7 @@ jobs:
with: with:
key: ${{ runner.os }}-build-ffmpeg-${{ hashFiles('.github/workflows/build_macos.yml') }} key: ${{ runner.os }}-build-ffmpeg-${{ hashFiles('.github/workflows/build_macos.yml') }}
path: | path: |
${{ env.FFMPEG_INSTALL_TMP_UNIVERSAL }} ${{ env.FFMPEG_INSTALL_TMP_ARM64 }}
${{ env.FFMPEG_INSTALL_TMP_X86_64 }} ${{ env.FFMPEG_INSTALL_TMP_X86_64 }}
- name: "Build dependency: ffmpeg (universal)" - name: "Build dependency: ffmpeg (universal)"
@ -108,7 +108,7 @@ jobs:
# Configure for arm64. # Configure for arm64.
./configure \ ./configure \
--arch=arm64 \ --arch=arm64 \
--prefix=$FFMPEG_INSTALL_TMP_UNIVERSAL \ --prefix=$FFMPEG_INSTALL_TMP_ARM64 \
--cc='clang' \ --cc='clang' \
$FFMPEG_CONFIG_OPTIONS $FFMPEG_CONFIG_OPTIONS
@ -138,15 +138,11 @@ jobs:
with: with:
key: ${{ runner.os }}-build-ffmpeg-${{ hashFiles('.github/workflows/build_macos.yml') }} key: ${{ runner.os }}-build-ffmpeg-${{ hashFiles('.github/workflows/build_macos.yml') }}
path: | path: |
${{ env.FFMPEG_INSTALL_TMP_UNIVERSAL }} ${{ env.FFMPEG_INSTALL_TMP_ARM64 }}
${{ env.FFMPEG_INSTALL_TMP_X86_64 }} ${{ env.FFMPEG_INSTALL_TMP_X86_64 }}
- name: "Build dependency: ffmpeg (fuse universal libraries)" - name: "Build dependency: ffmpeg (fuse universal libraries)"
run: | run: |
# Copy universal artefacts to the MacPorts install prefix.
sudo rsync -arv "$FFMPEG_INSTALL_TMP_UNIVERSAL/" "$FFMPEG_INSTALL_FUSED/"
grep "$FFMPEG_INSTALL_TMP_UNIVERSAL" -rIl "$FFMPEG_INSTALL_FUSED" | xargs -I '{}' sudo sed -i -- "s|$FFMPEG_INSTALL_TMP_UNIVERSAL|$FFMPEG_INSTALL_FUSED|g" '{}'
# Libs # Libs
FFMPEG_LIBS=( FFMPEG_LIBS=(
"libavcodec" "libavcodec"
@ -159,27 +155,37 @@ jobs:
"libswscale" "libswscale"
) )
# Recreate library symlinks in MacPorts install prefix.
sudo find $FFMPEG_INSTALL_TMP_ARM64/lib -type l -exec cp -P '{}' $FFMPEG_INSTALL_FINAL/LIB ';'
# `lipo` cannot overwrite binaries in place, so we stage the # `lipo` cannot overwrite binaries in place, so we stage the
# fused binaries in a temporary directory. # fused binaries in a temporary directory.
mkdir -p $FFMPEG_INSTALL_TMP_FUSED mkdir -p $FFMPEG_INSTALL_TMP_UNIVERSAL
for LIB in ${FFMPEG_LIBS[@]}; do for LIB in ${FFMPEG_LIBS[@]}; do
RESOLVED_LIB=$(ls -l $FFMPEG_INSTALL_FUSED/lib/${LIB}* \ RESOLVED_LIB=$(ls -l $FFMPEG_INSTALL_TMP_ARM64/lib/${LIB}* \
| grep -v '^l' \ | grep -v '^l' \
| awk -F'/' '{print $NF}') | awk -F'/' '{print $NF}')
lipo -create \ lipo -create \
$FFMPEG_INSTALL_FUSED/lib/$RESOLVED_LIB \ $FFMPEG_INSTALL_TMP_ARM64/lib/$RESOLVED_LIB \
$FFMPEG_INSTALL_TMP_X86_64/lib/$RESOLVED_LIB \ $FFMPEG_INSTALL_TMP_X86_64/lib/$RESOLVED_LIB \
-output $FFMPEG_INSTALL_TMP_FUSED/$RESOLVED_LIB -output $FFMPEG_INSTALL_TMP_UNIVERSAL/$RESOLVED_LIB
# Replace the x86_64 library with a link to the universal # Replace the arch-specific libraries with links to the universal
# binary, so `bundle_dylibs` will always gather a universal # binary, so `bundle_dylibs` will always gather a universal build.
# build. sudo ln -s -f $FFMPEG_INSTALL_TMP_UNIVERSAL/$RESOLVED_LIB $FFMPEG_INSTALL_TMP_ARM64/lib/$RESOLVED_LIB
sudo ln -s -f $FFMPEG_INSTALL_TMP_FUSED/lib/$RESOLVED_LIB $FFMPEG_INSTALL_TMP_X86_64/lib/$RESOLVED_LIB sudo ln -s -f $FFMPEG_INSTALL_TMP_UNIVERSAL/$RESOLVED_LIB $FFMPEG_INSTALL_TMP_X86_64/lib/$RESOLVED_LIB
done done
# Move the fused binaries to the MacPorts install prefix. # Copy the fused binaries to the MacPorts install prefix.
sudo mv $FFMPEG_INSTALL_TMP_FUSED/*.dylib $FFMPEG_INSTALL_FUSED/lib/ sudo cp $FFMPEG_INSTALL_TMP_UNIVERSAL/*.dylib $FFMPEG_INSTALL_FINAL/lib/
# Update and install pkgconfig files.
for file in "$FFMPEG_INSTALL_TMP_ARM64/lib/pkgconfig"/*.pc; do
sudo sed -i '' "s|^prefix=.*|prefix=$FFMPEG_INSTALL_FINAL|" "$file"
sudo sed -i '' "s|^libdir=.*|libdir=$FFMPEG_INSTALL_FINAL/lib|" "$file"
done
sudo mv $FFMPEG_INSTALL_TMP_ARM64/lib/pkgconfig/* $FFMPEG_INSTALL_FINAL/lib/pkgconfig/
- name: Build arm64 and create app bundle - name: Build arm64 and create app bundle
run: | run: |

1
CHANGELOG.md
View file

@ -1,4 +1,5 @@
## [Unreleased](https://github.com/LostArtefacts/TR1X/compare/stable...develop) - ××××-××-×× ## [Unreleased](https://github.com/LostArtefacts/TR1X/compare/stable...develop) - ××××-××-××
- fixed Mac binaries not working on x86-64 (eg not Apple Silicon)
## [4.0.1](https://github.com/LostArtefacts/TR1X/compare/4.0...4.0.1) - 2024-04-10 ## [4.0.1](https://github.com/LostArtefacts/TR1X/compare/4.0...4.0.1) - 2024-04-10
- fixed trying to pick up a lead bar crashing the game (#1293, regression from 4.0) - fixed trying to pick up a lead bar crashing the game (#1293, regression from 4.0)