mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-09 16:01:54 -09:00
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 <thomas.petazzoni@bootlin.com>
This commit is contained 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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user