Skip to content

Commit 55b4857

Browse files
garbeargarbear
authored
Merge pull request #342 from howie-f/Piers-FFMPEG8
[depends] bump ffmpeg to version 8
2 parents 3274af3 + f118e57 commit 55b4857

14 files changed

+9824
-34
lines changed

‎depends/common/ffmpeg/0001-ffmpeg-all-libpostproc-plugin.patch‎

Lines changed: 9759 additions & 0 deletions
Large diffs are not rendered by default.

depends/common/ffmpeg/0001-ffmpeg-windows-configure-detect-openssl.patch renamed to depends/common/ffmpeg/0002-ffmpeg-windows-configure-detect-openssl.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
From 6b0296b657b281cf326b96ab6cf3b8e1e6e620d2 Mon Sep 17 00:00:00 2001
1+
From e2577429a6cfcce7554ce9072365308688787598 Mon Sep 17 00:00:00 2001
22
From: Lukas Rusak <lorusak@gmail.com>
33
Date: Sat, 10 Apr 2021 08:16:11 -0700
4-
Subject: [PATCH 1/3] ffmpeg: windows: configure: detect openssl
4+
Subject: [PATCH 1/4] ffmpeg: windows: configure: detect openssl
55

66
---
77
configure | 2 ++
88
1 file changed, 2 insertions(+)
99

1010
diff --git a/configure b/configure
11-
index 8642513..84d0fa4 100755
11+
index ffa407d53d..c4fe14568a 100755
1212
--- a/configure
1313
+++ b/configure
14-
@@ -7060,6 +7060,8 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" ope
15-
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
16-
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
17-
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
14+
@@ -7264,6 +7264,8 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" ope
15+
check_pkg_config openssl "openssl >= 1.1.0" openssl/ssl.h OPENSSL_init_ssl ||
16+
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
17+
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
1818
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
1919
+ check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
20-
die "ERROR: openssl not found"; }
20+
die "ERROR: openssl (>= 1.1.0) not found"; }
2121
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
2222
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
2323
--
24-
2.39.2
24+
2.46.1
2525

depends/common/ffmpeg/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch renamed to depends/common/ffmpeg/0003-ffmpeg-windows-configure-fix-zlib-conflict.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 500820158d64749311c243e7af599077ad68085e Mon Sep 17 00:00:00 2001
1+
From 8d59051446b38b9c73a7eae7359341483c6951f7 Mon Sep 17 00:00:00 2001
22
From: Lukas Rusak <lorusak@gmail.com>
33
Date: Sat, 10 Apr 2021 08:16:48 -0700
4-
Subject: [PATCH 2/3] ffmpeg: windows: configure: fix zlib conflict
4+
Subject: [PATCH 2/4] ffmpeg: windows: configure: fix zlib conflict
55

66
---
77
configure | 3 +++
88
1 file changed, 3 insertions(+)
99

1010
diff --git a/configure b/configure
11-
index 84d0fa4..2fcde55 100755
11+
index c4fe14568a..9bebb75093 100755
1212
--- a/configure
1313
+++ b/configure
14-
@@ -8188,6 +8188,9 @@ print_config HAVE_ "$config_files" $HAVE_LIST
14+
@@ -8432,6 +8434,9 @@ print_config HAVE_ "$config_files" $HAVE_LIST
1515
print_config CONFIG_ "$config_files" $CONFIG_LIST \
1616
$CONFIG_EXTRA \
1717

@@ -22,5 +22,5 @@ index 84d0fa4..2fcde55 100755
2222

2323
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
2424
--
25-
2.39.2
25+
2.46.1
2626

depends/common/ffmpeg/0003-ffmpeg-windows-configure-allow-building-static.patch renamed to depends/common/ffmpeg/0004-ffmpeg-windows-configure-allow-building-static.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 3563feddaf8a3f473999fca61e12624def63eba4 Mon Sep 17 00:00:00 2001
1+
From 5dff0aeffe43dc71448d7a0b0c1e51d236e87d17 Mon Sep 17 00:00:00 2001
22
From: Lukas Rusak <lorusak@gmail.com>
33
Date: Sat, 10 Apr 2021 08:17:11 -0700
4-
Subject: [PATCH 3/3] ffmpeg: windows: configure: allow building static
4+
Subject: [PATCH 3/4] ffmpeg: windows: configure: allow building static
55

66
---
77
configure | 4 ++++
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/configure b/configure
11-
index 2fcde55..598439a 100755
11+
index 9bebb75093..28dcf462dd 100755
1212
--- a/configure
1313
+++ b/configure
14-
@@ -5784,6 +5784,8 @@ case $target_os in
14+
@@ -5951,6 +5951,8 @@ case $target_os in
1515
enabled x86_32 && check_ldflags -Wl,--large-address-aware
1616
add_cppflags -DWIN32_LEAN_AND_MEAN
1717
shlibdir_default="$bindir_default"
@@ -20,7 +20,7 @@ index 2fcde55..598439a 100755
2020
SLIBPREF=""
2121
SLIBSUF=".dll"
2222
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
23-
@@ -5835,6 +5837,8 @@ case $target_os in
23+
@@ -6002,6 +6004,8 @@ case $target_os in
2424
enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
2525
add_cppflags -DWIN32_LEAN_AND_MEAN
2626
shlibdir_default="$bindir_default"
@@ -30,5 +30,5 @@ index 2fcde55..598439a 100755
3030
SLIBSUF=".dll"
3131
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
3232
--
33-
2.39.2
33+
2.46.1
3434

‎depends/common/ffmpeg/0005-ffmpeg-windows-configure-detect-libdav1d.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From dbb8b7c79ea51029e9c8404323acfe954df1ddec Mon Sep 17 00:00:00 2001
2+
From: Lukas Rusak <lorusak@gmail.com>
3+
Date: Sat, 10 Apr 2021 08:19:27 -0700
4+
Subject: [PATCH 4/4] ffmpeg: windows: configure: detect libdav1d
5+
6+
---
7+
configure | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/configure b/configure
11+
index 28dcf462dd..ffa96e283d 100755
12+
--- a/configure
13+
+++ b/configure
14+
@@ -7037,7 +7041,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 &&
15+
die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
16+
enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas
17+
enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2
18+
-enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version
19+
+enabled libdav1d && require libdav1d dav1d/dav1d.h dav1d_version -llibdav1d
20+
enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
21+
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
22+
enabled libdrm && check_pkg_config libdrm libdrm xf86drm.h drmGetVersion
23+
--
24+
2.46.1
25+

depends/common/ffmpeg/0004-ffmpeg-windows-dxva2-check-nullptr-surface.patch renamed to depends/common/ffmpeg/0006-ffmpeg-windows-dxva2-check-nullptr-surface.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
2-
index 5902563..33dceec 100644
32
--- a/libavcodec/dxva2.c
43
+++ b/libavcodec/dxva2.c
5-
@@ -782,7 +782,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
4+
@@ -783,7 +783,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
65
#if CONFIG_D3D11VA
76
if (avctx->pix_fmt == AV_PIX_FMT_D3D11)
87
return (intptr_t)frame->data[1];

‎depends/common/ffmpeg/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ list(APPEND STANDARD_CONF --extra-version=kodi-${FFMPEG_VER}
2020
--disable-ffplay
2121
--disable-ffmpeg
2222
--disable-ffprobe
23+
--disable-muxer=whip
2324
--enable-gpl
2425
--enable-runtime-cpudetect
25-
--enable-postproc
2626
--enable-muxer=spdif
2727
--enable-muxer=adts
2828
--enable-muxer=asf

‎depends/common/ffmpeg/ffmpeg.sha256‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a
1+
dd4030dbfdc34d9ff255a116bdd1caade42500ac2981efa27f8b151cc54c7b9e

‎depends/common/ffmpeg/ffmpeg.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.1.tar.gz
1+
ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n8.0.tar.gz

‎depends/common/ffmpeg/readme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ All patches are required for windows and allow both static building
22
and openssl. Note there is no impact to applying these to other platforms
33
as openssl is not used (gnutls is used for non-windows).
44

5-
Last update and patches refreshed for FFmpeg-n7.1
5+
Last update and patches refreshed for FFmpeg-n8.0

0 commit comments

Comments
 (0)
⚡