From 31d676229dff5134f3dda66d08a6ce409ab81e99 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:21:31 +0200 Subject: [PATCH] package/qt5/qt5webengine: use bundled ffmpeg Buildroot has moved to a modern ffmpeg, and the version of Chromium part of qtwebengine is not ready to work with this modern version of ffmpeg. While Chromium has been updated upstream to support a more recent ffmpeg, it requires the backport of too many patches, so let's use the bundled ffmpeg. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 3 +-- package/qt5/qt5webengine/qt5webengine.mk | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 67c843e5f6..57cbe301f0 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 - depends on BR2_TOOLCHAIN_HAS_THREADS # ffmpeg, libglib2, libvpx, qt5base-dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs @@ -40,7 +40,6 @@ config BR2_PACKAGE_QT5WEBENGINE # flag (for 64-bits, it adds the -m64 flag). # https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium - select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGLIB2 diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 56f951fdbe..bccd460aa7 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -70,7 +70,6 @@ QT5WEBENGINE_DEPENDENCIES += \ host-python3 \ host-webp \ host-zlib \ - ffmpeg \ freetype \ jpeg \ lcms2 \ @@ -85,7 +84,6 @@ QT5WEBENGINE_DEPENDENCIES += \ QT5WEBENGINE_CONF_OPTS += \ -webengine-embedded-build \ - -webengine-ffmpeg \ -webengine-opus \ -webengine-webchannel \ -webengine-webp \