Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.4 build fix #99

Merged
merged 3 commits into from
Nov 16, 2023
Merged

2.4 build fix #99

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b099bf5
Setup Python 3.11 for fontconfig
daschuer Nov 15, 2023
efc4202
automake and pkg-config is already installed
daschuer Nov 15, 2023
71ea2cd
Comment the nasm requirement
daschuer Nov 16, 2023
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
9 changes: 8 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,21 @@ jobs:
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
working-directory: ${{ matrix.vcpkg_path }}

# python3-distutils is required for fontconfig but it has been removed in Python 3.12
- name: Setup Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Bootstrap vcpkg
run: ${{ matrix.vcpkg_bootstrap }}
working-directory: ${{ matrix.vcpkg_path }}

# FFmpeg requires nasm
- name: "[macOS] Bootstrap vcpkg"
if: runner.os == 'macOS'
run: |
brew update && brew install nasm automake pkg-config
brew update && brew install nasm
JoergAtGithub marked this conversation as resolved.
Show resolved Hide resolved
/bin/bash -c "sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer"
xcrun --show-sdk-version
- name: Set up cache
Expand Down
Loading