Skip to content

[ffmpeg] Update to version 9.0 #53207

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

Open
Kadir (kadirlua) wants to merge 7 commits into
base: master
Choose a base branch
from
+183 −290
Open

[ffmpeg] Update to version 9.0 #53207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46e64ab
[ffmpeg] Update to version 9.0
kadirlua Aug 4, 2026
479198f
[opencv4] Add FFmpeg 9 compatibility
kadirlua Aug 4, 2026
efe2bd0
Add patch to fix MSVC undefined flags and update ffmpeg version to 9.0
kadirlua Aug 4, 2026
8192722
Add patch to disable unstable AArch64 swscale backend
kadirlua Aug 5, 2026
5465547
Fix Vulkan swscale configuration
kadirlua Aug 5, 2026
624cecf
[ffmpeg] Install complete license notices
BillyONeal Aug 6, 2026
a19d6e1
Merge pull request #4 from BillyONeal/pr-53207-ffmpeg
kadirlua Aug 7, 2026
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
42 changes: 21 additions & 21 deletions ports/ffmpeg-bin2c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
set(VCPKG_BUILD_TYPE release) # host tool for building ffmpeg
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ffmpeg/ffmpeg
REF "n${VERSION}"
SHA512 e858e92e5eb08d562302cde371af55917df6e1fe53994e18462a3c929a40ede1828c2bd53c2a7d65a2cfd791782ead3cd94efb2def904f49cb5dd8ab5cd4256f
HEAD_REF master
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/ffbuild")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/ffbuild"
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LGPLv2.1")
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
set(VCPKG_BUILD_TYPE release) # host tool for building ffmpeg

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ffmpeg/ffmpeg
REF "n${VERSION}"
SHA512 4327d259b2ed9cc35a6139606643bf9c9db5fb0372a9eb259fed61af50505a2b59f0c3d94c51fec89d2e0cd552a413c5f50514683931c94c429824198d56ec56
HEAD_REF master
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/ffbuild")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/ffbuild"
)

vcpkg_cmake_install()
vcpkg_copy_pdbs()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/ffbuild/bin2c.c")
4 changes: 2 additions & 2 deletions ports/ffmpeg-bin2c/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "ffmpeg-bin2c",
"version": "8.1.1",
"version": "9.0",
"description": "Host tool bin2c for FFmpeg build",
"license": "LGPL-2.1-or-later",
"license": "MIT",
"supports": "native",
"dependencies": [
{
Expand Down
11 changes: 0 additions & 11 deletions ports/ffmpeg/0002-fix-msvc-link.patch
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions ports/ffmpeg/0004-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ index 1759694..fcbae49 100644

enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
enabled libmpeghdec && require_pkg_config libmpeghdec "mpeghdec >= 3.0.0" mpeghdec/mpeghdecoder.h mpeghdecoder_init
enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
Expand Down Expand Up @@ -47,14 +47,12 @@ index 1759694..fcbae49 100644
enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel "-framework OpenCL" ||
check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
die "ERROR: opencl not found"; } &&
{ test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
@@ -7835,10 +7838,10 @@ enabled amf &&
"(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400240000"

@@ -7838,7 +7841,7 @@ enabled amf &&
# Funny iconv installations are not unusual, so check it after all flags have been set
-if enabled libc_iconv; then
+if enabled libc_iconv && disabled iconv; then
Expand Down
20 changes: 8 additions & 12 deletions ports/ffmpeg/0005-fix-nasm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm
index 65c9fad..5ad73f3 100644
--- a/libavcodec/x86/proresdsp.asm
+++ b/libavcodec/x86/proresdsp.asm
@@ -24,7 +24,10 @@
@@ -24,6 +24,9 @@

%include "libavutil/x86/x86util.asm"

Expand All @@ -44,12 +44,11 @@ index 65c9fad..5ad73f3 100644
+%else

SECTION_RODATA

diff --git a/libavcodec/x86/vp9itxfm_16bpp_avx512.asm b/libavcodec/x86/vp9itxfm_16bpp_avx512.asm
index 1924233..17a0ce4 100644
--- a/libavcodec/x86/vp9itxfm_16bpp_avx512.asm
+++ b/libavcodec/x86/vp9itxfm_16bpp_avx512.asm
@@ -22,7 +22,10 @@
@@ -22,6 +22,9 @@

%include "libavutil/x86/x86util.asm"

Expand All @@ -60,7 +59,6 @@ index 1924233..17a0ce4 100644
+%else

SECTION_RODATA 64

diff --git a/libavcodec/x86/vp9itxfm_avx2.asm b/libavcodec/x86/vp9itxfm_avx2.asm
index c5ee242..5fe077f 100644
--- a/libavcodec/x86/vp9itxfm_avx2.asm
Expand Down Expand Up @@ -109,26 +107,25 @@ index 4f078ea..5cf095b 100644
%if HAVE_AVX2_EXTERNAL

diff --git a/libavfilter/x86/vf_atadenoise.asm b/libavfilter/x86/vf_atadenoise.asm
index 4945ad3..748b65a 100644
index 059605d..4e47e89 100644
--- a/libavfilter/x86/vf_atadenoise.asm
+++ b/libavfilter/x86/vf_atadenoise.asm
@@ -20,7 +20,10 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
@@ -21,6 +21,9 @@
%include "libavutil/x86/x86util.asm"

-%if ARCH_X86_64
+%ifn ARCH_X86_64
+SECTION .rdata
+vf_atadenoise_placeholder: times 4 db 0
+%else

%include "libavutil/x86/x86util.asm"

SECTION_RODATA
pw_one: times 8 dw 1
diff --git a/libavfilter/x86/vf_nlmeans.asm b/libavfilter/x86/vf_nlmeans.asm
index 8f57801..9aef3a4 100644
--- a/libavfilter/x86/vf_nlmeans.asm
+++ b/libavfilter/x86/vf_nlmeans.asm
@@ -21,7 +21,10 @@
@@ -21,6 +21,9 @@

%include "libavutil/x86/x86util.asm"

Expand All @@ -139,4 +136,3 @@ index 8f57801..9aef3a4 100644
+%else

SECTION_RODATA 32

226 changes: 0 additions & 226 deletions ports/ffmpeg/0048-backport-23039.patch
View file
Open in desktop

This file was deleted.

Loading