From cf678a3891e4aec9d16d56b9a933683db986b4f99e746644c6267a40988f760c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 8 Aug 2022 07:17:41 +0000 Subject: [PATCH] Accepting request 993674 from home:cgiboudeaux:branches:KDE:Qt:5.15 - Stop using 'pkgconfig(xxx)' BuildRequires for FFmpeg dependencies. They will point to FFmpeg-5 soon. OBS-URL: https://build.opensuse.org/request/show/993674 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=43 --- libqt5-qtwebengine.changes | 6 ++++++ libqt5-qtwebengine.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 9dd661a..75190f5 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 06:45:29 UTC 2022 - Christophe Giboudeaux + +- Stop using 'pkgconfig(xxx)' BuildRequires for FFmpeg + dependencies. They will point to FFmpeg-5 soon. + ------------------------------------------------------------------- Wed Jun 8 14:36:14 UTC 2022 - Christophe Giboudeaux diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index e68a7ac..b6ec2f3 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -56,6 +56,11 @@ ExcludeArch: ppc ppc64 ppc64le s390 s390x #!BuildIgnore: rpmlint BuildRequires: bison BuildRequires: fdupes +%if %{with system_ffmpeg} +BuildRequires: ffmpeg-4-libavcodec-devel +BuildRequires: ffmpeg-4-libavformat-devel +BuildRequires: ffmpeg-4-libavutil-devel +%endif BuildRequires: flac-devel BuildRequires: flex BuildRequires: gperf @@ -122,11 +127,6 @@ BuildRequires: pkgconfig(icu-uc) >= 65.0 BuildRequires: pkgconfig(icu-i18n) >= 65.0 BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(lcms2) -%if %{with system_ffmpeg} -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevent)