commit: 2eef895accd63b2bddb584239290271779a4d00b Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sun Apr 16 17:05:57 2023 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Sun Apr 16 17:05:57 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2eef895a
dev-qt/qtwebengine: drop system-ffmpeg Compiling with >=ffmpeg-5 requires a modified upstream ffmpeg. Bug: https://bugs.gentoo.org/831487 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 5 ++--- dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 5 ++--- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild index 70e89b3f..773b19a7 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild @@ -18,7 +18,7 @@ fi IUSE=" alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-ffmpeg +system-icu widgets + +system-icu widgets " REQUIRED_USE="designer? ( widgets )" @@ -77,7 +77,6 @@ RDEPEND=" kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) - system-ffmpeg? ( media-video/ffmpeg:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-${PV}*[widgets] @@ -226,7 +225,7 @@ src_configure() { -DQT_FEATURE_webengine_system_opus=on -DQT_FEATURE_webengine_system_libwebp=on -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg) + -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487 -DQT_FEATURE_webengine_system_icu=$(usex system-icu) -DQT_FEATURE_webengine_system_libevent=on -DQT_FEATURE_webengine_system_libpci=on diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild index 4671c7bc..ec7a8579 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild @@ -18,7 +18,7 @@ fi IUSE=" alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-ffmpeg +system-icu widgets + +system-icu widgets " REQUIRED_USE="designer? ( widgets )" @@ -77,7 +77,6 @@ RDEPEND=" kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) - system-ffmpeg? ( media-video/ffmpeg:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-${PV}*[widgets] @@ -226,7 +225,7 @@ src_configure() { -DQT_FEATURE_webengine_system_opus=on -DQT_FEATURE_webengine_system_libwebp=on -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg) + -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487 -DQT_FEATURE_webengine_system_icu=$(usex system-icu) -DQT_FEATURE_webengine_system_libevent=on -DQT_FEATURE_webengine_system_libpci=on diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 4671c7bc..ec7a8579 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -18,7 +18,7 @@ fi IUSE=" alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-ffmpeg +system-icu widgets + +system-icu widgets " REQUIRED_USE="designer? ( widgets )" @@ -77,7 +77,6 @@ RDEPEND=" kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) - system-ffmpeg? ( media-video/ffmpeg:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-${PV}*[widgets] @@ -226,7 +225,7 @@ src_configure() { -DQT_FEATURE_webengine_system_opus=on -DQT_FEATURE_webengine_system_libwebp=on -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg) + -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487 -DQT_FEATURE_webengine_system_icu=$(usex system-icu) -DQT_FEATURE_webengine_system_libevent=on -DQT_FEATURE_webengine_system_libpci=on
