Skip to content

Commit 1908fd8

Browse files
author
Markus Perl
committed
mac test
1 parent 373ab32 commit 1908fd8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: build ffmpeg
4646
run: |
4747
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
48-
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
48+
SKIPINSTALL=yes VERBOSE=yes SKIPRAV1E=yes ./build-ffmpeg --build --enable-gpl-and-non-free
4949
kill %1
5050
- name: check shared library
5151
run: |

build-ffmpeg

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,15 @@ if ! $MACOS_M1; then
499499
fi
500500

501501
if command_exists "cargo"; then
502-
if build "rav1e" "0.6.3"; then
503-
execute cargo install --version "0.9.20+cargo-0.71" cargo-c
504-
download "https://github.com/xiph/rav1e/archive/refs/tags/v0.6.3.tar.gz"
505-
execute cargo cinstall --prefix="${WORKSPACE}" --library-type=staticlib --crt-static --release
506-
build_done "rav1e" "0.6.3"
502+
if [[ ! "$SKIPRAV1E" == "yes" ]]; then
503+
if build "rav1e" "0.6.3"; then
504+
execute cargo install --version "0.9.20+cargo-0.71" cargo-c
505+
download "https://github.com/xiph/rav1e/archive/refs/tags/v0.6.3.tar.gz"
506+
execute cargo cinstall --prefix="${WORKSPACE}" --library-type=staticlib --crt-static --release
507+
build_done "rav1e" "0.6.3"
508+
fi
509+
CONFIGURE_OPTIONS+=("--enable-librav1e")
507510
fi
508-
CONFIGURE_OPTIONS+=("--enable-librav1e")
509511
fi
510512

511513
if $NONFREE_AND_GPL; then

0 commit comments

Comments
 (0)