1 files changed, 28 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake
index 5d08d045f..e8f2a6a3b 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -3,6 +3,8 @@ if(QT_CONFIGURE_RUNNING)
     endfunction()
     function(add_check_for_support)
     endfunction()
+    function(check_for_ulimit)
+    endfunction()
 else()
     find_package(Ninja 1.7.2)
     find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)
@@ -44,7 +46,7 @@ if(PkgConfig_FOUND)
     pkg_check_modules(LCMS2 lcms2)
     pkg_check_modules(FREETYPE freetype2 IMPORTED_TARGET)
     pkg_check_modules(LIBXML2 libxml-2.0 libxslt IMPORTED_TARGET)
-    pkg_check_modules(FFMPEG libavcodec libavformat libavutil)
+    pkg_check_modules(FFMPEG libavcodec libavformat libavutil IMPORTED_TARGET)
     pkg_check_modules(OPUS opus>=1.3.1)
     pkg_check_modules(VPX vpx>=1.10.0 IMPORTED_TARGET)
     pkg_check_modules(LIBPCI libpci)
@@ -97,6 +99,7 @@ int main() {
     pkt.data.frame.height[0] = 0u;
     auto a = CONSTRAINED_FROM_ABOVE_DROP;
     auto b = VPX_IMG_FMT_NV12;
+    auto v9 = vpx_codec_vp9_cx();
 }"
 )
 
@@ -200,6 +203,25 @@ int main(void){
 }"
 )
 
+qt_config_compile_test(libavformat
+    LABEL "libavformat"
+    LIBRARIES
+        PkgConfig::FFMPEG
+    CODE
+"
+#include \"libavformat/version.h\"
+extern \"C\" {
+#include \"libavformat/avformat.h\"
+}
+int main(void) {
+#if LIBAVFORMAT_VERSION_MAJOR >= 59
+    AVStream stream;
+    auto first_dts = av_stream_get_first_dts(&stream);
+#endif
+    return 0;
+}"
+)
+
 #### Features
 
 qt_feature("qtwebengine-build" PUBLIC
@@ -342,7 +364,6 @@ qt_feature("webengine-system-minizip" PRIVATE
 )
 qt_feature("webengine-system-libevent" PRIVATE
     LABEL "libevent"
-    AUTODETECT FALSE # coin bug 711
     CONDITION UNIX AND LIBEVENT_FOUND
 )
 qt_feature("webengine-system-libxml" PRIVATE
@@ -522,6 +543,11 @@ add_check_for_support(
    CONDITION NOT LINUX OR DBUS_FOUND
    MESSAGE "Build requires dbus."
 )
+add_check_for_support(
+    MODULES QtWebEngine
+    CONDITION NOT LINUX OR NOT QT_FEATURE_webengine_system_ffmpeg OR TEST_libavformat
+    MESSAGE "Unmodified ffmpeg >= 5.0 is not supported."
+)
 # FIXME: This prevents non XCB Linux builds from building:
 set(xcbSupport X11 LIBDRM XCOMPOSITE XCURSOR XRANDR XI XPROTO XSHMFENCE XTST)
 foreach(xs ${xcbSupport})