[ffmpeg] Update to 7.0. #38011

Sibras · 2024-04-06T16:00:57Z

Update ffmpeg to 7.0
Fixes #37888

[*] Changes comply with the maintainer guide.
[*] SHA512s are updated for each updated download.
[*] The "supports" clause reflects platforms that may be fixed by this new version.
[*] Any fixed CI baseline entries are removed from that file.
[*] Any patches that are no longer applied are deleted from the port's directory.
[*] The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
[*] Only one version is added to each modified port's versions file.

Sibras · 2024-04-07T06:08:38Z

Most of the CI failures are due to avcpp or aubio failing with the latest ffmpeg. Unfortunately these projects currently dont support ffmpeg 7.0 and thus fail (which is a common theme with ffmpeg updates within vcpkg).

MonicaLiu0311 · 2024-05-28T07:42:42Z

Is there any new progress？

dg0yt · 2024-06-01T08:01:45Z

ports/ffmpeg/portfile.cmake

@@ -94,7 +95,7 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER)
    get_filename_component(CC_filename "${VCPKG_DETECTED_CMAKE_C_COMPILER}" NAME)
    set(ENV{CC} "${CC_filename}")
    string(APPEND OPTIONS " --cc=${CC_filename}")
-    #string(APPEND OPTIONS " --host_cc=${CC_filename}") ffmpeg not yet setup for cross builds?
+    string(APPEND OPTIONS " --host_cc=${CC_filename}")


There is no host_cc in vcpkg.

host_cc is a command line arg passed to ffmpeg configure script. Due to the way the portfile is calling ffmpegs configure (calld it as cross compile) it fails without this command option

It will also fail with this option except for "almost-native" cross builds.
vcpkg allows you to tell the compiler and flags for the target triplet (e.g. android, ios).
vcpkg allows you to know the host triplet and its install prefix.
vcpkg doesn't allow you to tell the compiler and flags for the host triplet.

FTR vcpkg_configure_make turns the host cc (CC_FOR_BUILD) into a no-op for VCPKG_CROSSCOMPILING.

Unfortunately someone set the cross compile flag for ffmpeg as always on in PR #23001 (see portfile line 459). I have no idea why or what they were trying to fix but I have no way of testing all the various triplets that this effects in order to work out how to disable it again.
Due to changes in ffmpegs internal configure script in 7.0 it now does additional checks on the host compiler when the cross compile flag is passed to it. This is why the line had to be uncommented as its required to pass those checks. The actual compilation though functions the same as previously.

FTR vcpkg_configure_make turns the host cc (CC_FOR_BUILD) into a no-op for VCPKG_CROSSCOMPILING.

Unfortunately the ffmpeg port doesnt use vcpkg_configure_make

It uses vcpkg_execute_required_process to run a custom bash script. The --host_cc command line option is for this bash script to pass through to ffmpegs internal configure script

dg0yt · 2024-06-01T08:05:36Z

ports/ffmpeg/0009-Fix-fdk-detection.patch

 enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
 -                               { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
 +                               { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac -lm -lstdc++ &&


(I know this is the existing patch, but...)
Can't we make check_pkg_config libfdk_aac ... do the right thing?
Encoding -lstdc++ is known to be wrong for a number of systems.

This line is only called when check_pkg_config fails (cant find a pkgconfig for instance). FFmpegs configure script will later strip -lstdc++ (and -lm) on systems that dont support it which is why it doesnt cause errors.

#39077:

Export actual c++ link libraries for fdk-aac via pkg-config. (Same pattern as lerc, geos.)

Setup pkg-config for ffmpeg.

dg0yt · 2024-06-01T08:10:28Z

ports/ffmpeg/0024-fix-osx-host-c11.patch

+-check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" ||
+-    check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L" || die "Host compiler lacks C11 support"
+check_host_cflags_cc -std=$stdc ctype.h "__STDC_VERSION__ >= 201112L" ||
+    check_host_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L"


I don't see a change in the first line.
I wonder about the second line: Is the check wrong for osx, or doesn't it get the required flags?
But we dont have a host_cc anyways, so probably the latter.

As mentioned previously the hostcc is passed via command line option (and is just set to regular cc).
Im not sure why git diff created the patch the way it did but the only change is the removal of the "die" line as it fails in the osx CI otherwise (I dont have osx to local debug why)

Sibras · 2024-06-01T17:11:04Z

Is there any new progress？

avcpp has been updated and now works with ffmepg 7 but aubio still fails as it hasnt been updated. This was also a blocker for the 6 update as it doesnt get updated (the last aubio release was over 5 years ago) so without a patch for aubio its still failing in the CI

Neumann-A · 2024-06-01T17:28:44Z

does ffmpeg have a migration guide somewhere? Maybe its easy to patch.

Neumann-A · 2024-06-01T18:00:29Z

Does this help:
https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/blob/main/ffmpeg7.patch?ref_type=heads

Neumann-A · 2024-06-01T18:01:37Z

https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/blob/main/.SRCINFO?ref_type=heads

also downloads some extra patches

Sibras · 2024-06-01T18:41:35Z

Does this help: https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/blob/main/ffmpeg7.patch?ref_type=heads

So it turns out aubio port wasnt using release versions anymore anyway so i bumbped to latest commit on master and then added that patch and it seems now to be good

…g-config (#39077) - Setup and use pkg-config for ffmpeg dependencies. #38011 (comment). - Export actual c++ link libraries for fdk-aac via pkg-config. (Same pattern as lerc, geos.) - Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265. - Burn-in dllimport for libsrt and x265. - Pass detected STRIP to ffmpeg. Fixes #36852.

julianxhokaxhiu · 2024-06-17T17:31:30Z

Is it possible to add support for D3D12VA as well as you're into this PR? I was trying to approach it on a different PR ( see #39322 ) but we figured out it's a 7.0+ feature. The diff looks like this basically:

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 72055b063..484ca01a5 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -48,9 +48,9 @@ if(VCPKG_TARGET_IS_MINGW)
 elseif(VCPKG_TARGET_IS_LINUX)
     string(APPEND OPTIONS " --target-os=linux --enable-pthreads")
 elseif(VCPKG_TARGET_IS_UWP)
-    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-mediafoundation")
+    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-d3d12va --enable-mediafoundation")
 elseif(VCPKG_TARGET_IS_WINDOWS)
-    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-dxva2 --enable-mediafoundation")
+    string(APPEND OPTIONS " --target-os=win32 --enable-w32threads --enable-d3d11va --enable-d3d12va --enable-dxva2 --enable-mediafoundation")
 elseif(VCPKG_TARGET_IS_OSX)
     string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox")
 elseif(VCPKG_TARGET_IS_IOS)

Thank you in advance 🙏

kadirlua · 2024-06-21T21:58:21Z

ffmpeg 7.0.1 has been released. It would be nice adding support for 7.0.1 while you already work on this. @Sibras

This reverts commit 672dc03.

Sibras · 2024-06-30T08:10:57Z

Is it possible to add support for D3D12VA as well as you're into this PR? I was trying to approach it on a different PR ( see #39322 ) but we figured out it's a 7.0+ feature. The diff looks like this basically:

Thank you in advance 🙏

Done

Sibras · 2024-06-30T08:11:37Z

ffmpeg 7.0.1 has been released. It would be nice adding support for 7.0.1 while you already work on this. @Sibras

7.0.1 should be an easy update. Just need to get ther CI clear with 7.0 first

dg0yt · 2024-07-07T17:03:39Z

ports/aubio/vcpkg.json

  "port-version": 1,
  "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.",
  "homepage": "https://github.com/aubio/aubio",
  "license": "GPL-3.0-or-later",
-  "supports": "!xbox",
+  "supports": "!xbox & !osx",


aubio is healthy on osx. ffmpeg and its dependencies are not. Until #39703.

Aubio was failing to link on osx (and I have no way to debug osx). It was the only one failing to link so I disabled it. If #39703 fixes it then ill revert the change

#39703 fixes it. ffmpeg and its vcpkg port hardcode assumptions about libstdc++ which break libc++ systems such as osx and android.

The actuall error for aubio with ffmepg 7 was missing a framework link option causing a link error (was missing opengl and one other that i cant remember) which wasnt related to libstc

Maybe this was an issue, too. libstdc++ wasn't the only problem with the current ffmpeg, and I wouldn't be surprised if 7.0 adds other challenges.

Sibras added 2 commits April 7, 2024 02:57

[ffmpeg] Update to 7.0.

eb63780

Update versions.

2f09d05

WangWeiLin-MV assigned MonicaLiu0311 Apr 7, 2024

MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 7, 2024

[ffmpeg] Fix x86 nasm compile.

994ee1e

Sibras added 2 commits April 7, 2024 16:12

[ffmpeg] Fix OSX cross compilation.

b806e24

[ffmpeg] Bump version.

ecd27c2

Sibras force-pushed the ffmpeg7 branch from 869bebf to ecd27c2 Compare April 7, 2024 06:12

Sibras added 2 commits April 7, 2024 17:10

fixup

71dfa2f

Update ffmpeg.json

f36fda9

ldm0 mentioned this pull request May 3, 2024

Compiliation error after upgrading to 0.15.0 larksuite/rsmpeg#180

Closed

MonicaLiu0311 marked this pull request as draft May 28, 2024 07:42

Sibras added 2 commits June 1, 2024 17:57

Merge branch 'master' into ffmpeg7

87a1340

Update ffmpeg.json

bbc4155

dg0yt reviewed Jun 1, 2024

View reviewed changes

Sibras added 2 commits June 1, 2024 18:58

[ffmpeg] fix chromium patch

d5a8237

Update ffmpeg.json

8cde7cb

dg0yt mentioned this pull request Jun 1, 2024

[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config #39077

Merged

Sibras added 2 commits June 2, 2024 04:39

[aubio] Update to latest.

8a79791

[aubio] update version.

b9da0f3

julianxhokaxhiu mentioned this pull request Jun 17, 2024

[ffmpeg] Enable D3D12VA on Windows #39322

Closed

7 tasks

Sibras added 10 commits June 29, 2024 20:50

Merge branch 'master' into ffmpeg7

2001289

Update ffmpeg.json

1a7fad7

[ffmpeg] Add d3d12va support.

0febba8

[ffpmpeg]: Fix patch.

1574421

Update ffmpeg.json

593e0c4

[ffmpeg] Attempt to fix osx link errors.

672dc03

Update ffmpeg.json

e93240a

Revert "[ffmpeg] Attempt to fix osx link errors."

1b69015

This reverts commit 672dc03.

[ffmpeg] disable opencl on osx.

7a64773

Update ffmpeg.json

7a37c8d

Sibras added 2 commits July 6, 2024 18:38

[aubio] disable on osx.

6d49154

Update aubio.json

d995406

Sibras marked this pull request as ready for review July 7, 2024 06:00

dg0yt reviewed Jul 7, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ffmpeg] Update to 7.0. #38011

[ffmpeg] Update to 7.0. #38011

Sibras commented Apr 6, 2024 •

edited

Loading

Sibras commented Apr 7, 2024

MonicaLiu0311 commented May 28, 2024

dg0yt Jun 1, 2024

Sibras Jun 1, 2024

dg0yt Jun 1, 2024

dg0yt Jun 1, 2024

Sibras Jun 1, 2024 •

edited

Loading

Sibras Jun 1, 2024 •

edited

Loading

dg0yt Jun 1, 2024

Sibras Jun 1, 2024

dg0yt Jun 1, 2024

dg0yt Jun 1, 2024

Sibras Jun 1, 2024

Sibras commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Sibras commented Jun 1, 2024

julianxhokaxhiu commented Jun 17, 2024

kadirlua commented Jun 21, 2024

Sibras commented Jun 30, 2024

Sibras commented Jun 30, 2024

dg0yt Jul 7, 2024

Sibras Jul 13, 2024

dg0yt Jul 13, 2024

Sibras Jul 13, 2024

dg0yt Jul 14, 2024

[ffmpeg] Update to 7.0. #38011

Are you sure you want to change the base?

[ffmpeg] Update to 7.0. #38011

Conversation

Sibras commented Apr 6, 2024 • edited Loading

Sibras commented Apr 7, 2024

MonicaLiu0311 commented May 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sibras Jun 1, 2024 • edited Loading

Choose a reason for hiding this comment

Sibras Jun 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sibras commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Neumann-A commented Jun 1, 2024

Sibras commented Jun 1, 2024

julianxhokaxhiu commented Jun 17, 2024

kadirlua commented Jun 21, 2024

Sibras commented Jun 30, 2024

Sibras commented Jun 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sibras commented Apr 6, 2024 •

edited

Loading

Sibras Jun 1, 2024 •

edited

Loading

Sibras Jun 1, 2024 •

edited

Loading