Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/build-ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,33 @@ jobs:

- name: Build
run: osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh
env:
arch: x64

- name: Upload
uses: actions/upload-artifact@v4
with:
name: linux-x64
path: linux-x64

build-linux-arm64:
name: Build Linux (arm64)
runs-on: ubuntu-22.04-arm
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build
run: osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh
env:
arch: arm64

- name: Upload
uses: actions/upload-artifact@v4
with:
name: linux-arm64
path: linux-arm64

build-android:
name: Build Android
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -244,6 +264,10 @@ jobs:
with:
name: linux-x64
path: osu.Framework.NativeLibs/runtimes/linux-x64/native
- uses: actions/download-artifact@v4
with:
name: linux-arm64
path: osu.Framework.NativeLibs/runtimes/linux-arm64/native
- uses: actions/download-artifact@v4
with:
name: win-arm64
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
31 changes: 28 additions & 3 deletions osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,43 @@ SCRIPT_PATH=$(pwd)
popd > /dev/null
source "$SCRIPT_PATH/common.sh"

if [ -z "${arch-}" ]; then
PS3='Build for which arch? '
select arch in "x64" "arm64"; do
if [ -z "$arch" ]; then
echo "invalid option"
else
break
fi
done
fi

case $arch in
x64)
FFMPEG_FLAGS+=(
--arch=x86_64
)
;;

arm64)
FFMPEG_FLAGS+=(
--arch=aarch64
)
;;
esac

FFMPEG_FLAGS+=(
--target-os=linux
)

pushd . > /dev/null
prep_ffmpeg linux-x64
prep_ffmpeg "linux-$arch"
build_ffmpeg
popd > /dev/null

# gcc creates multiple symlinks per .so file for versioning.
# We delete the symlinks and rename the real files to include the major library version
rm linux-x64/*.so
for f in linux-x64/*.so.*.*.*; do
rm linux-$arch/*.so
for f in linux-$arch/*.so.*.*.*; do
mv -vf "$f" "${f%.*.*}"
done
3 changes: 3 additions & 0 deletions osu.Framework.NativeLibs/update-bass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ curl -Lso bass24-arm64.zip https://www.un4seen.com/files/bass24-arm64.zip
unzip -qjo bass24-arm64.zip arm64/bass.dll -d runtimes/win-arm64/native/

curl -Lso bass-linux.zip https://www.un4seen.com/stuff/bass-linux.zip
unzip -qjo bass-linux.zip aarch64/libbass.so -d runtimes/linux-arm64/native/
unzip -qjo bass-linux.zip x86/libbass.so -d runtimes/linux-x86/native/
unzip -qjo bass-linux.zip x86_64/libbass.so -d runtimes/linux-x64/native/

Expand All @@ -32,6 +33,7 @@ curl -Lso bass_fx-arm64.zip https://www.un4seen.com/stuff/bass_fx-arm64.zip
unzip -qjo bass_fx-arm64.zip bass_fx.dll -d runtimes/win-arm64/native/

curl -Lso bass_fx-linux.zip https://www.un4seen.com/stuff/bass_fx-linux.zip
unzip -qjo bass_fx-linux.zip aarch64/libbass_fx.so -d runtimes/linux-arm64/native/
unzip -qjo bass_fx-linux.zip x86/libbass_fx.so -d runtimes/linux-x86/native/
unzip -qjo bass_fx-linux.zip x86_64/libbass_fx.so -d runtimes/linux-x64/native/

Expand All @@ -55,6 +57,7 @@ unzip -qjo bassmix24.zip bassmix.dll -d runtimes/win-x86/native/
unzip -qjo bass24-arm64.zip arm64/bassmix.dll -d runtimes/win-arm64/native/

curl -Lso bassmix24-linux.zip https://www.un4seen.com/stuff/bassmix-linux.zip
unzip -qjo bassmix24-linux.zip aarch64/libbassmix.so -d runtimes/linux-arm64/native/
unzip -qjo bassmix24-linux.zip x86/libbassmix.so -d runtimes/linux-x86/native/
unzip -qjo bassmix24-linux.zip x86_64/libbassmix.so -d runtimes/linux-x64/native/

Expand Down
2 changes: 1 addition & 1 deletion osu.Framework/osu.Framework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
<PackageReference Include="ppy.ManagedBass.Wasapi" Version="2022.1216.0" />
<PackageReference Include="ppy.Veldrid" Version="4.9.62-gca0239da6b" />
<PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-gfbb03d21c2" />
<PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-g4bdd5c372e" />
<PackageReference Include="SharpFNT" Version="2.0.0" />
<!-- Preview version of ImageSharp causes NU5104. -->
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
Expand Down
Loading