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.

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

Sync from upstream #8

Merged
merged 133 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
ff3b84a
typo indentation
abrar71 Jan 9, 2022
e19c739
Merge pull request #123 from abrar71/patch-1
markus-perl Jan 25, 2022
e7c88f5
Ffmpeg 5.0 update
markus-perl Jan 25, 2022
33ef403
cmake update
markus-perl Jan 25, 2022
899bb30
Path fix
markus-perl Jan 25, 2022
a1e4c8c
Adds required libraries
TheSp1der Jan 25, 2022
8b96c81
cuda update
markus-perl Jan 25, 2022
ec1bf47
giflib update
markus-perl Jan 25, 2022
dfa8aef
Merge pull request #126 from TheSp1der/master
markus-perl Jan 25, 2022
a2605fb
Merge branch 'master' of https://github.com/markus-perl/ffmpeg-build-…
markus-perl Jan 25, 2022
9ce1eaf
Script Version 1.34 -> FFmpeg 5.0
markus-perl Jan 26, 2022
e5c0083
Debian Version removed from readme
markus-perl Jan 26, 2022
00e963c
Fixes #122
markus-perl Jan 26, 2022
735ba7c
Fixes #115. Unfortunately, I don't have an M1, so i can't test
markus-perl Jan 26, 2022
470f591
Updating config.guess file. Which allowed me to compile on aarch64 (A…
DanielRobertAppel Mar 14, 2022
a9aa9cc
zlib V 1.2.12
markus-perl Mar 30, 2022
21c3401
Update cuda-centos.dockerfile
markus-perl Mar 31, 2022
d814db4
removed CentOS 8
markus-perl Mar 31, 2022
8d99df0
Delete cuda-centos.dockerfile
markus-perl Mar 31, 2022
937c7b2
Pass through CXXFLAGS from parent environment
barberio Apr 12, 2022
dcf6a63
Merge pull request #132 from DanielRobertAppel/patch-1
markus-perl Apr 13, 2022
4f671e8
Merge pull request #139 from barberio/patch-1
markus-perl Apr 13, 2022
4d1de44
wget to curl
markus-perl Apr 13, 2022
2679152
updated packages, added python3 to waf, fixed typo
Apr 14, 2022
404a0c3
Merge pull request #140 from SmoochySix4/master
markus-perl Apr 18, 2022
b160d25
Version string update to 1.35
markus-perl Apr 18, 2022
322ef8f
Version string update to 1.36
markus-perl Apr 18, 2022
c27872f
Update build-ffmpeg
markus-perl Apr 18, 2022
4318402
Add Rocky linux 8 support
mliradelc Apr 14, 2022
de3053d
GH actions runs-on rockylinux change
mliradelc Apr 19, 2022
c52fef3
Merge pull request #141 from mliradelc/rockylinux-8
markus-perl Apr 21, 2022
d7f9078
Add GnuTLS support for LGPL builds
jjherman Jun 13, 2022
f9161e8
Package updates
markus-perl Jul 10, 2022
8a0022e
Package updates
markus-perl Jul 10, 2022
def2057
openssl downgrade due to building failures
markus-perl Jul 10, 2022
680b398
Cuda Rocky fix
markus-perl Jul 10, 2022
c6d40f7
Merge branch 'gnutls' of https://github.com/jjherman/ffmpeg-build-scr…
markus-perl Jul 10, 2022
33ec9b6
Update build-ffmpeg
matyo91 Aug 3, 2022
725ea3b
Merge pull request #153 from matyo91/patch-1
markus-perl Aug 4, 2022
15ef520
Update build-ffmpeg
markus-perl Aug 4, 2022
d98a8d6
Bump ffmpeg version 5.1
markus-perl Aug 17, 2022
4cdaf14
Merge pull request #159 from markus-perl/ffmpeg-5.1
markus-perl Aug 18, 2022
c71379c
ffmpeg 5.1
markus-perl Aug 18, 2022
87479d9
Mac M1 build fix
markus-perl Sep 12, 2022
88d4983
Bump Version to 1.40
markus-perl Sep 12, 2022
a90a233
changed version and link of Zlib to 1.2.13
scgreenhalgh Oct 14, 2022
fe2613f
Merge pull request #165 from scgreenhalgh/zlib-version-update
markus-perl Oct 19, 2022
2a1b537
Bump Script Version To 1.41
markus-perl Oct 19, 2022
2f934b1
Zlib Download Link Update
markus-perl Oct 31, 2022
aea1ed7
update
Nov 30, 2022
3f61d36
ubuntu update
Nov 30, 2022
81886b9
Github Workflow update
Nov 30, 2022
bb9ad6e
ubuntu update
Nov 30, 2022
623470e
if fix
Nov 30, 2022
8aff9b9
Workflow update
Nov 30, 2022
85c3a84
cuda update
Nov 30, 2022
3bef680
Merge pull request #169 from markus-perl/mac-m1
markus-perl Nov 30, 2022
9b2def9
Bump Version to 1.42
markus-perl Nov 30, 2022
08666c2
Updated libsvtav1 version to 1.4.1 from 0.9.0
s4njee Dec 18, 2022
b4ab9fa
Merge pull request #172 from s4njee/update-svtav1-1.4.1
markus-perl Jan 2, 2023
f6abc11
Update build-ffmpeg
markus-perl Jan 2, 2023
1741d89
Update build-ffmpeg
markus-perl Jan 2, 2023
baca709
Update build-ffmpeg
markus-perl Jan 2, 2023
71b5319
Update build-ffmpeg
markus-perl Jan 2, 2023
7ca03f4
Update build-ffmpeg
markus-perl Jan 2, 2023
617e73b
Update build-ffmpeg
markus-perl Jan 2, 2023
132a021
Update build-ffmpeg
markus-perl Jan 3, 2023
589a94d
Update build-ffmpeg
markus-perl Jan 4, 2023
1c4f569
Update build-ffmpeg
markus-perl Jan 4, 2023
4f4b572
Update build-ffmpeg
markus-perl Jan 4, 2023
0328348
Bump version to 1.43
markus-perl Jan 4, 2023
c82c5e6
FFMpeg 6.0
markus-perl Mar 1, 2023
0b42a53
Update build-ffmpeg
markus-perl Mar 1, 2023
8186488
Update build-ffmpeg
markus-perl Mar 1, 2023
eb72497
Update build-ffmpeg
markus-perl Mar 1, 2023
9aee19c
Update build-ffmpeg
markus-perl Mar 1, 2023
eb1d233
Cuda fixes
Mar 1, 2023
866e843
multiple libraries updated
Mar 1, 2023
4a45b48
webp update
Mar 1, 2023
a234cf8
FFMpeg V6.0
Mar 1, 2023
7b141c6
FFMpeg V6.0
Mar 1, 2023
cf918b1
FFMpeg V6.0
Mar 1, 2023
edd5efd
FFMpeg V6.0
Mar 1, 2023
9ef607e
Update build-ffmpeg
markus-perl Mar 1, 2023
1df7e94
Merge pull request #181 from markus-perl/ffmpeg-v6
markus-perl Mar 2, 2023
4063dc5
Readme Update FFmpeg V6.0
markus-perl Mar 2, 2023
2921fb8
Readme Update FFmpeg V6.0
markus-perl Mar 2, 2023
26020e0
Linux Build update
markus-perl Mar 2, 2023
e1ee4d1
Update build.yml
markus-perl Mar 2, 2023
330f08b
dav1d 1.1.0
markus-perl Mar 2, 2023
5ee28a2
Update Docker command
markus-perl Mar 5, 2023
e9f4425
Formatted with `foxundermoon/vs-shell-format`
mrienstra Apr 2, 2023
0a7f3a2
Fix build-ffmpeg, 'sratom' build fails on Debian 11
nabe-abk Apr 5, 2023
ca73294
Merge pull request #188 from mrienstra/patch-1
markus-perl Apr 27, 2023
fcc013a
Merge pull request #189 from nabe-abk/master
markus-perl Apr 27, 2023
6d40ffa
Version 1.45
markus-perl May 1, 2023
7d0268c
Fixes to build nvidia filters and decoders
jtbr Jun 13, 2023
0d114a0
Make small (rather than fast) build an option
jtbr Jun 13, 2023
c700436
Consolidate ffmpeg install code, fix install prompt,
jtbr Jun 13, 2023
be86dc9
Update manpage db after adding
jtbr Jun 13, 2023
e929e88
Consolidates install further
jtbr Jun 15, 2023
e1a73d9
Reorganize readme for readability and add detail for clarity.
jtbr Jun 21, 2023
0f531da
Merge pull request #200 from jtbr/nvidia-fixes
markus-perl Jun 27, 2023
2b4a0b6
Update build.yml
markus-perl Jun 27, 2023
373ab32
cargo update
Jul 3, 2023
1908fd8
mac test
Jul 3, 2023
5294452
Packages updated
Jul 4, 2023
9146a7b
Version 1.46
Jul 4, 2023
9e08b35
Set Ubuntu version to 22.04 LTS version
ryfow Oct 2, 2023
3e0af56
Update build-ffmpeg to include freetype 2.11.1
useafterfree Oct 11, 2023
f8460e0
Fix opencore URL
useafterfree Oct 11, 2023
06dc7c9
Merge pull request #207 from ryfow/backrev-ubuntu
markus-perl Oct 12, 2023
d4e6272
OpenCore update
markus-perl Oct 12, 2023
2c8ed00
Merge branch 'master' into patch-1
markus-perl Oct 12, 2023
051a010
Update Version
markus-perl Oct 12, 2023
743e86c
Update cuda-ubuntu.dockerfile
markus-perl Oct 13, 2023
9a689c2
Update cuda-ubuntu.dockerfile
markus-perl Oct 13, 2023
9dc62ea
Merge branch 'markus-perl:master' into patch-1
useafterfree Oct 18, 2023
ded9796
Merge pull request #208 from useafterfree/patch-1
markus-perl Nov 5, 2023
326e6ec
AMF Update
Nov 5, 2023
666a715
Merge branch 'master' of https://github.com/markus-perl/ffmpeg-build-…
Nov 5, 2023
a14f041
fix build warning
Nov 5, 2023
b04ad75
Many libraries updated
Nov 5, 2023
62a7526
ADD: CUDA improvements and libzmq
Xosrov Nov 6, 2023
2ae201d
FIX: undercase instructions in dockerfile
Xosrov Nov 6, 2023
6b35caa
FIX: build failure on non-CUDA builds and update build script
Xosrov Nov 13, 2023
9e7388f
CHANGE: move cuda compute checks elsewhere
Xosrov Nov 13, 2023
2c27558
FIX: library name mismatch
Xosrov Nov 13, 2023
cfd6921
CHANGE: zmq version to avoid errors in OS X
Xosrov Nov 18, 2023
ef800fe
CHANGE: libnpp names to fix docker build issue
Xosrov Nov 19, 2023
487c905
FIX: library paths to reflect changes in cuda dockerfile
Xosrov Nov 19, 2023
d94fc2f
Merge pull request #209 from Xosrov/master
markus-perl Nov 21, 2023
fec153d
Update build-ffmpeg
markus-perl Nov 25, 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
64 changes: 20 additions & 44 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -37,15 +37,15 @@ jobs:

build-macos:
name: build in native macOS
runs-on: macos-10.15
runs-on: macos-latest
srikanth-descript marked this conversation as resolved.
Show resolved Hide resolved
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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SKIPRAV1E is what?

kill %1
- name: check shared library
run: |
Expand All @@ -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 .
Expand All @@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ workspace
.idea
linux
.artifacts
build
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 AS build
FROM ubuntu:22.04 AS build

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -13,7 +13,7 @@ COPY ./build-ffmpeg /app/build-ffmpeg

RUN SKIPINSTALL=yes /app/build-ffmpeg --build

FROM ubuntu:20.04
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND noninteractive

Expand Down
Loading