Skip to content

Commit 5cdbe41

Browse files
AkashiSNAkashiSN
committed
fix nv-codec-headers versions to 11.x
1 parent 6178cfc commit 5cdbe41

8 files changed

+46
-28
lines changed

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎.github/workflows/ffmpeg-library-build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616
strategy:
1717
matrix:
1818
os: [linux, windows]
19+
env:
20+
target_os:
1921
steps:
2022
- name: Checkout
21-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2224

2325
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@v2
26+
uses: docker/setup-buildx-action@v3
2527

2628
- name: Login to GHCR
27-
uses: docker/#-action@v2
29+
uses: docker/#-action@v3
2830
with:
2931
registry: ghcr.io
3032
username: akashisn
@@ -36,7 +38,7 @@ jobs:
3638
echo "target_os=Windows" >> $GITHUB_ENV
3739
3840
- name: Build ffmpeg-build-base
39-
uses: docker/build-push-action@v4
41+
uses: docker/build-push-action@v6
4042
with:
4143
context: ./
4244
file: ./Dockerfile

‎.github/workflows/ffmpeg-release.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ jobs:
1414
matrix:
1515
ffmpeg: ["7.0.2", "6.1.2", "5.1.6", "4.4.5"]
1616
flavor: [linux, windows]
17+
env:
18+
target_os:
19+
build_tag:
1720
steps:
1821
- name: Checkout
19-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2023

2124
- name: Set up Docker Buildx
22-
uses: docker/setup-buildx-action@v2
25+
uses: docker/setup-buildx-action@v3
2326

2427
- name: Set build target (linux)
2528
if: matrix.flavor == 'linux'
@@ -45,7 +48,7 @@ jobs:
4548
tar acvf /tmp/ffmpeg-${{ matrix.ffmpeg }}-${{ env.target_os }}.tar.xz -C /tmp ffmpeg-${{ matrix.ffmpeg }}-${{ env.target_os }}
4649
4750
- name: Upload artifact
48-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
4952
with:
5053
name: ffmpeg-${{ matrix.ffmpeg }}-${{ env.target_os }}
5154
path: /tmp/ffmpeg-${{ matrix.ffmpeg }}-${{ env.target_os }}.tar.xz
@@ -56,11 +59,11 @@ jobs:
5659
needs: [export]
5760
steps:
5861
- name: Download artifact
59-
uses: actions/download-artifact@v3
62+
uses: actions/download-artifact@v4
6063
with:
6164
path: /tmp/artifact
6265

6366
- name: Release
64-
uses: softprops/action-gh-release@v1
67+
uses: softprops/action-gh-release@v2
6568
with:
6669
files: /tmp/artifact/**/*.tar.xz

‎.github/workflows/ffmpeg.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,25 @@ jobs:
2222
matrix:
2323
ffmpeg: ["7.0.2", "6.1.2", "5.1.6", "4.4.5"]
2424
flavor: [linux, windows]
25+
env:
26+
target:
27+
image_name:
28+
image_tag:
2529
steps:
2630
- name: Checkout
27-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
2832

2933
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v2
34+
uses: docker/setup-buildx-action@v3
3135

3236
- name: Login to DockerHub
33-
uses: docker/#-action@v2
37+
uses: docker/#-action@v3
3438
with:
3539
username: akashisn
3640
password: ${{ secrets.DOCKERHUB_TOKEN }}
3741

3842
- name: Login to GHCR
39-
uses: docker/#-action@v2
43+
uses: docker/#-action@v3
4044
with:
4145
registry: ghcr.io
4246
username: akashisn
@@ -57,7 +61,7 @@ jobs:
5761
echo "image_tag=${{ matrix.ffmpeg }}" >> $GITHUB_ENV
5862
5963
- name: Build and push - ffmpeg
60-
uses: docker/build-push-action@v4
64+
uses: docker/build-push-action@v6
6165
with:
6266
context: ./
6367
file: ./Dockerfile

‎.github/workflows/vainfo.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
if: startsWith(github.ref, 'refs/tags/') == false
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@v2
24+
uses: docker/setup-buildx-action@v3
2525

2626
- name: Login to DockerHub
27-
uses: docker/#-action@v2
27+
uses: docker/#-action@v3
2828
with:
2929
username: akashisn
3030
password: ${{ secrets.DOCKERHUB_TOKEN }}
3131

3232
- name: Build vainfo
33-
uses: docker/build-push-action@v4
33+
uses: docker/build-push-action@v6
3434
with:
3535
context: ./
3636
file: ./Dockerfile

‎README.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
## Available release
88

99
- Linux docker image (`akashisn/ffmpeg`) & binary release
10-
- `6.0`
11-
- `5.1.3`
12-
- `4.4.4`
10+
- `7.0.2`
11+
- `6.1.2`
12+
- `5.1.6`
13+
- `4.4.5`
1314
- Windows binary release
14-
- `6.0`
15-
- `5.1.3`
16-
- `4.4.4`
15+
- `7.0.2`
16+
- `6.1.2`
17+
- `5.1.6`
18+
- `4.4.5`
1719

1820
## Supported architecture
1921

@@ -364,4 +366,4 @@ In Proxmox, if you are using systemd-boot instead of GRUB, kernel parameters can
364366
365367
## Dynamic Library
366368
367-
Using [https://github.com/yugr/Implib.so](https://github.com/yugr/Implib.so), the dynamic library related to QSV is delay-loaded, so when you run `ldd` to check, it appears to have no dependencies. However, please note that it becomes necessary when using QSV. This resolves the inconvenience where FFmpeg wouldn't even start without the dynamic library even when QSV is not needed, achieving a pseudo-static link. Therefore, we have consolidated the tags which were previously separated based on whether QSV was available or not.
369+
Using [https://github.com/yugr/Implib.so](https://github.com/yugr/Implib.so), the dynamic library related to QSV is delay-loaded, so when you run `ldd` to check, it appears to have no dependencies. However, please note that it becomes necessary when using QSV. This resolves the inconvenience where FFmpeg wouldn't even start without the dynamic library even when QSV is not needed, achieving a pseudo-static link. Therefore, we have consolidated the tags which were previously separated based on whether QSV was available or not.

‎scripts/base.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,5 +278,5 @@ do_strip () {
278278
local target_dir="$1"
279279
local file_pattern="$2"
280280

281-
find ${target_dir} -type f -name ${file_pattern} -executable -exec strip --strip-debug {} \;
281+
find ${target_dir} -type f -name "${file_pattern}" -executable -exec strip --strip-debug {} \;
282282
}

‎scripts/build-library.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,9 @@ FFMPEG_CONFIGURE_OPTIONS+=("--enable-sdl2")
407407

408408
# Build NVcodec
409409
NVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
410-
NVCODEC_TAG_PREFIX="n"
411-
NVCODEC_VERSION="12.2.72.0" # get_latest_tag ${NVCODEC_REPO} ${NVCODEC_TAG_PREFIX}
410+
NVCODEC_TAG_PREFIX="n11."
411+
# https://github.com/m-ab-s/media-autobuild_suite/issues/2522#issuecomment-1891625706
412+
NVCODEC_VERSION="1.5.3" # get_latest_tag ${NVCODEC_REPO} ${NVCODEC_TAG_PREFIX}
412413
git_clone ${NVCODEC_REPO} ${NVCODEC_TAG_PREFIX}${NVCODEC_VERSION}
413414
make install "PREFIX=${PREFIX}"
414415
FFMPEG_CONFIGURE_OPTIONS+=("--enable-cuda-llvm" "--enable-ffnvcodec" "--enable-cuvid" "--enable-nvdec" "--enable-nvenc")

0 commit comments

Comments
 (0)