Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c59cf6d

Browse filesBrowse files
committed
MacOs fixes
1 parent b1140e8 commit c59cf6d
Copy full SHA for c59cf6d

File tree

Expand file treeCollapse file tree

2 files changed

+24
-8
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+24
-8
lines changed

‎.github/workflows/build.yml

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
build-macos:
3939
name: build in native macOS
40-
runs-on: macos-latest
40+
runs-on: macos-14
4141
steps:
4242
- name: Checkout code
4343
uses: actions/checkout@v4

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+23-7Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,14 +470,30 @@ fi
470470
if command_exists "python3"; then
471471
# dav1d needs meson and ninja along with nasm to be built
472472
if command_exists "pip3"; then
473-
# meson and ninja can be installed via pip3
474-
execute pip3 install pip setuptools --quiet --upgrade --no-cache-dir --disable-pip-version-check
475-
for r in meson ninja; do
476-
if ! command_exists ${r}; then
477-
execute pip3 install ${r} --quiet --upgrade --no-cache-dir --disable-pip-version-check
473+
474+
#set variable meson and ninja installed to false
475+
MESON_INSTALLED=false
476+
477+
#check if macOs and brew is available
478+
if [[ "$OSTYPE" == "darwin"* ]]; then
479+
if ! command_exists "brew"; then
480+
brew install python-setuptools meson ninja
481+
MESON_INSTALLED=true
478482
fi
479-
export PATH=$PATH:~/Library/Python/3.9/bin
480-
done
483+
fi
484+
485+
#check if meson and ninja are installed MESON_INSTALLED
486+
if ! $MESON_INSTALLED; then
487+
# meson and ninja can be installed via pip3
488+
execute pip3 install pip setuptools --quiet --upgrade --no-cache-dir --disable-pip-version-check
489+
for r in meson ninja; do
490+
if ! command_exists ${r}; then
491+
execute pip3 install ${r} --quiet --upgrade --no-cache-dir --disable-pip-version-check
492+
fi
493+
export PATH=$PATH:~/Library/Python/3.9/bin
494+
done
495+
fi
496+
481497
fi
482498
if command_exists "meson"; then
483499
if build "dav1d" "1.4.2"; then

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.