Skip to content

Add rav1e to contribs #3199

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

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
+91 −2
Draft

Add rav1e to contribs #3199

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94cade7
build: make: add tool probe for cargo
ePirat Oct 25, 2020
4bae94e
contrib: add cargo-c
ePirat Oct 25, 2020
05c65a5
contrib: add rav1e
ePirat Oct 25, 2020
4974ee3
contrib: ffmpeg: use rav1e if enabled
ePirat Oct 25, 2020
d8eaab3
contrib: cargo-c: add patch fixing openssl fetching
ePirat Oct 26, 2020
da9586b
contrib: ffmpeg: do not overwrite env
ePirat Nov 1, 2020
2395f7e
contrib: ffmpeg: Print log on configure failure
ePirat Nov 21, 2020
0cc6109
Revert "contrib: cargo-c: add patch fixing openssl fetching"
ePirat Mar 10, 2021
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
Next Next commit
build: make: add tool probe for cargo
  • Loading branch information
@ePirat
ePirat committed Nov 21, 2020
commit 94cade78f646ecf19a2807a670aecc72faf2c209
5 changes: 5 additions & 0 deletions make/configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,6 +1591,7 @@ def infof( self, format, *args ):
arch_gcc = None
cross = None
xcode_opts = { 'disabled': False, 'config': None }
rav1e_enabled = False
for i in range(len(sys.argv)):
if re.compile( '^--arch=(.+)$' ).match( sys.argv[i] ):
arch_gcc = sys.argv[i][7:]
Expand Down Expand Up @@ -1619,6 +1620,9 @@ def infof( self, format, *args ):
elif re.compile( '^--disable-xcode$' ).match( sys.argv[i] ):
xcode_opts['disabled'] = True
continue
elif re.compile( '^--enable-rav1e$' ).match( sys.argv[i] ):
rav1e_enabled = True
continue

## create tools in a scope
class Tools:
Expand Down Expand Up @@ -1653,6 +1657,7 @@ class Tools:
meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,47,0] )
nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] )
ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True )
cargo = ToolProbe( 'CARGO.exe', 'cargo', 'cargo', abort=rav1e_enabled )

xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (not xcode_opts['disabled'] and (build_tuple.match('*-*-darwin*') and cross is None)) else False), versionopt='-version', minversion=[10,3,0] )

Expand Down