forked from markus-perl/ffmpeg-build-script
-
Notifications
You must be signed in to change notification settings - Fork 2
Sync from upstream #8
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
133 commits
Select commit
Hold shift + click to select a range
ff3b84a
typo indentation
abrar71 e19c739
Merge pull request #123 from abrar71/patch-1
markus-perl e7c88f5
Ffmpeg 5.0 update
markus-perl 33ef403
cmake update
markus-perl 899bb30
Path fix
markus-perl a1e4c8c
Adds required libraries
TheSp1der 8b96c81
cuda update
markus-perl ec1bf47
giflib update
markus-perl dfa8aef
Merge pull request #126 from TheSp1der/master
markus-perl a2605fb
Merge branch 'master' of https://github.com/markus-perl/ffmpeg-build-…
markus-perl 9ce1eaf
Script Version 1.34 -> FFmpeg 5.0
markus-perl e5c0083
Debian Version removed from readme
markus-perl 00e963c
Fixes #122
markus-perl 735ba7c
Fixes #115. Unfortunately, I don't have an M1, so i can't test
markus-perl 470f591
Updating config.guess file. Which allowed me to compile on aarch64 (A…
DanielRobertAppel a9aa9cc
zlib V 1.2.12
markus-perl 21c3401
Update cuda-centos.dockerfile
markus-perl d814db4
removed CentOS 8
markus-perl 8d99df0
Delete cuda-centos.dockerfile
markus-perl 937c7b2
Pass through CXXFLAGS from parent environment
barberio dcf6a63
Merge pull request #132 from DanielRobertAppel/patch-1
markus-perl 4f671e8
Merge pull request #139 from barberio/patch-1
markus-perl 4d1de44
wget to curl
markus-perl 2679152
updated packages, added python3 to waf, fixed typo
SmoochySix4 404a0c3
Merge pull request #140 from SmoochySix4/master
markus-perl b160d25
Version string update to 1.35
markus-perl 322ef8f
Version string update to 1.36
markus-perl c27872f
Update build-ffmpeg
markus-perl 4318402
Add Rocky linux 8 support
mliradelc de3053d
GH actions runs-on rockylinux change
mliradelc c52fef3
Merge pull request #141 from mliradelc/rockylinux-8
markus-perl d7f9078
Add GnuTLS support for LGPL builds
jjherman f9161e8
Package updates
markus-perl 8a0022e
Package updates
markus-perl def2057
openssl downgrade due to building failures
markus-perl 680b398
Cuda Rocky fix
markus-perl c6d40f7
Merge branch 'gnutls' of https://github.com/jjherman/ffmpeg-build-scr…
markus-perl 33ec9b6
Update build-ffmpeg
matyo91 725ea3b
Merge pull request #153 from matyo91/patch-1
markus-perl 15ef520
Update build-ffmpeg
markus-perl d98a8d6
Bump ffmpeg version 5.1
markus-perl 4cdaf14
Merge pull request #159 from markus-perl/ffmpeg-5.1
markus-perl c71379c
ffmpeg 5.1
markus-perl 87479d9
Mac M1 build fix
markus-perl 88d4983
Bump Version to 1.40
markus-perl a90a233
changed version and link of Zlib to 1.2.13
scgreenhalgh fe2613f
Merge pull request #165 from scgreenhalgh/zlib-version-update
markus-perl 2a1b537
Bump Script Version To 1.41
markus-perl 2f934b1
Zlib Download Link Update
markus-perl aea1ed7
update
3f61d36
ubuntu update
81886b9
Github Workflow update
bb9ad6e
ubuntu update
623470e
if fix
8aff9b9
Workflow update
85c3a84
cuda update
3bef680
Merge pull request #169 from markus-perl/mac-m1
markus-perl 9b2def9
Bump Version to 1.42
markus-perl 08666c2
Updated libsvtav1 version to 1.4.1 from 0.9.0
s4njee b4ab9fa
Merge pull request #172 from s4njee/update-svtav1-1.4.1
markus-perl f6abc11
Update build-ffmpeg
markus-perl 1741d89
Update build-ffmpeg
markus-perl baca709
Update build-ffmpeg
markus-perl 71b5319
Update build-ffmpeg
markus-perl 7ca03f4
Update build-ffmpeg
markus-perl 617e73b
Update build-ffmpeg
markus-perl 132a021
Update build-ffmpeg
markus-perl 589a94d
Update build-ffmpeg
markus-perl 1c4f569
Update build-ffmpeg
markus-perl 4f4b572
Update build-ffmpeg
markus-perl 0328348
Bump version to 1.43
markus-perl c82c5e6
FFMpeg 6.0
markus-perl 0b42a53
Update build-ffmpeg
markus-perl 8186488
Update build-ffmpeg
markus-perl eb72497
Update build-ffmpeg
markus-perl 9aee19c
Update build-ffmpeg
markus-perl eb1d233
Cuda fixes
866e843
multiple libraries updated
4a45b48
webp update
a234cf8
FFMpeg V6.0
7b141c6
FFMpeg V6.0
cf918b1
FFMpeg V6.0
edd5efd
FFMpeg V6.0
9ef607e
Update build-ffmpeg
markus-perl 1df7e94
Merge pull request #181 from markus-perl/ffmpeg-v6
markus-perl 4063dc5
Readme Update FFmpeg V6.0
markus-perl 2921fb8
Readme Update FFmpeg V6.0
markus-perl 26020e0
Linux Build update
markus-perl e1ee4d1
Update build.yml
markus-perl 330f08b
dav1d 1.1.0
markus-perl 5ee28a2
Update Docker command
markus-perl e9f4425
Formatted with `foxundermoon/vs-shell-format`
mrienstra 0a7f3a2
Fix build-ffmpeg, 'sratom' build fails on Debian 11
nabe-abk ca73294
Merge pull request #188 from mrienstra/patch-1
markus-perl fcc013a
Merge pull request #189 from nabe-abk/master
markus-perl 6d40ffa
Version 1.45
markus-perl 7d0268c
Fixes to build nvidia filters and decoders
jtbr 0d114a0
Make small (rather than fast) build an option
jtbr c700436
Consolidate ffmpeg install code, fix install prompt,
jtbr be86dc9
Update manpage db after adding
jtbr e929e88
Consolidates install further
jtbr e1a73d9
Reorganize readme for readability and add detail for clarity.
jtbr 0f531da
Merge pull request #200 from jtbr/nvidia-fixes
markus-perl 2b4a0b6
Update build.yml
markus-perl 373ab32
cargo update
1908fd8
mac test
5294452
Packages updated
9146a7b
Version 1.46
9e08b35
Set Ubuntu version to 22.04 LTS version
ryfow 3e0af56
Update build-ffmpeg to include freetype 2.11.1
useafterfree f8460e0
Fix opencore URL
useafterfree 06dc7c9
Merge pull request #207 from ryfow/backrev-ubuntu
markus-perl d4e6272
OpenCore update
markus-perl 2c8ed00
Merge branch 'master' into patch-1
markus-perl 051a010
Update Version
markus-perl 743e86c
Update cuda-ubuntu.dockerfile
markus-perl 9a689c2
Update cuda-ubuntu.dockerfile
markus-perl 9dc62ea
Merge branch 'markus-perl:master' into patch-1
useafterfree ded9796
Merge pull request #208 from useafterfree/patch-1
markus-perl 326e6ec
AMF Update
666a715
Merge branch 'master' of https://github.com/markus-perl/ffmpeg-build-…
a14f041
fix build warning
b04ad75
Many libraries updated
62a7526
ADD: CUDA improvements and libzmq
Xosrov 2ae201d
FIX: undercase instructions in dockerfile
Xosrov 6b35caa
FIX: build failure on non-CUDA builds and update build script
Xosrov 9e7388f
CHANGE: move cuda compute checks elsewhere
Xosrov 2c27558
FIX: library name mismatch
Xosrov cfd6921
CHANGE: zmq version to avoid errors in OS X
Xosrov ef800fe
CHANGE: libnpp names to fix docker build issue
Xosrov 487c905
FIX: library paths to reflect changes in cuda dockerfile
Xosrov d94fc2f
Merge pull request #209 from Xosrov/master
markus-perl fec153d
Update build-ffmpeg
markus-perl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,10 +10,10 @@ on: | |
jobs: | ||
build-linux: | ||
name: build in native linux | ||
runs-on: ubuntu-20.04 | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
uses: actions/checkout@v4 | ||
|
||
- name: install libva-dev | ||
run: | | ||
|
@@ -37,15 +37,15 @@ jobs: | |
|
||
build-macos: | ||
name: build in native macOS | ||
runs-on: macos-10.15 | ||
runs-on: macos-latest | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
uses: actions/checkout@v4 | ||
|
||
- name: build ffmpeg | ||
run: | | ||
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done & | ||
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free | ||
SKIPINSTALL=yes VERBOSE=yes SKIPRAV1E=yes ./build-ffmpeg --build --enable-gpl-and-non-free | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
kill %1 | ||
- name: check shared library | ||
run: | | ||
|
@@ -59,19 +59,19 @@ jobs: | |
|
||
build-docker: | ||
name: build in docker | ||
runs-on: ubuntu-20.04 | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
uses: actions/checkout@v4 | ||
|
||
- name: pull base image | ||
id: ubuntu_pull | ||
run: | | ||
docker pull ubuntu:20.04 | ||
docker pull ubuntu:22.04 | ||
- name: run if ubuntu_pull failed | ||
if: failure() && steps.ubuntu_pull.outcome == 'failure' | ||
run: | | ||
docker pull ubuntu:20.04 | ||
docker pull ubuntu:22.04 | ||
- name: build ffmpeg | ||
run: | | ||
docker build -t ffmpeg:ubuntu -f Dockerfile . | ||
|
@@ -81,70 +81,46 @@ jobs: | |
|
||
build-cuda-ubuntu-docker: | ||
name: build in ubuntu docker with cuda | ||
runs-on: ubuntu-20.04 | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
uses: actions/checkout@v4 | ||
|
||
- name: pull base image | ||
id: cuda_ubuntu_pull | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 | ||
docker pull ubuntu:20.04 | ||
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 | ||
docker pull ubuntu:22.04 | ||
- name: run if cuda_ubuntu_pull failed | ||
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 | ||
docker pull ubuntu:20.04 | ||
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 | ||
docker pull ubuntu:22.04 | ||
- name: build ffmpeg | ||
run: | | ||
docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile . | ||
- name: test run ffmepg | ||
run: | | ||
docker run --rm ffmpeg:cuda-ubuntu -buildconf | ||
|
||
build-cuda-centos-docker: | ||
name: build in centos docker with cuda | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
|
||
- name: pull base image | ||
id: cuda_centos_pull | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-centos8 | ||
docker pull centos:8 | ||
- name: run if cuda_centos_pull failed | ||
if: failure() && steps.cuda_centos_pull.outcome == 'failure' | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-centos8 | ||
docker pull centos:8 | ||
- name: build ffmpeg | ||
run: | | ||
docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile . | ||
- name: test run ffmepg | ||
run: | | ||
docker run --rm ffmpeg:cuda-centos -buildconf | ||
|
||
build-full-static: | ||
name: full static build in docker | ||
runs-on: ubuntu-20.04 | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
uses: actions/checkout@v4 | ||
|
||
- name: pull base image | ||
id: cuda_ubuntu_pull | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 | ||
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 | ||
- name: run if cuda_ubuntu_pull failed | ||
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure' | ||
run: | | ||
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04 | ||
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04 | ||
- name: build ffmpeg | ||
run: | | ||
docker build -t ffmpeg:cuda-static -f full-static.dockerfile . | ||
- name: test run ffmepg | ||
run: | | ||
docker run --rm ffmpeg:cuda-static -buildconf | ||
docker run --rm ffmpeg:cuda-static -buildconf |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ workspace | |
.idea | ||
linux | ||
.artifacts | ||
build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.