[tg_owt/f36] Reverted all previous ffmpeg4 related commits.

commit 30682cc9f39bd5929c1fed08a652d9ae008a0129 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sat Aug 13 14:03:52 2022 +0200 Reverted all previous ffmpeg4 related commits. tg_owt.spec | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) --- diff --git a/tg_owt.spec b/tg_owt.spec index b122e6c..25dcca6 100644 --- a/tg_owt.spec +++ b/tg_owt.spec @@ -34,6 +34,9 @@ Source2: https://github.com/google/crc32c/archive/%{commit2}/crc32c-%{shortcommi BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpipewire-0.3) @@ -58,16 +61,9 @@ BuildRequires: gcc-c++ BuildRequires: ninja-build BuildRequires: yasm -# Telegram Desktop has major issues when built against ffmpeg 5.x: -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6273 -# Upstream refuses to fix this issue: -# https://github.com/telegramdesktop/tdesktop/issues/24855 +# Fedora now has a stripped ffmpeg. Make sure we're using the full version. %if 0%{?fedora} && 0%{?fedora} >= 36 -BuildRequires: compat-ffmpeg4-devel -%else -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) +BuildRequires: ffmpeg-devel %endif # Disabling all low-memory architectures. @@ -97,6 +93,9 @@ Provides: bundled(spl_sqrt_floor) = 0~git Requires: pkgconfig(alsa) Requires: pkgconfig(epoxy) Requires: pkgconfig(gbm) +Requires: pkgconfig(libavcodec) +Requires: pkgconfig(libavformat) +Requires: pkgconfig(libavutil) Requires: pkgconfig(libdrm) Requires: pkgconfig(libjpeg) Requires: pkgconfig(libpipewire-0.3) @@ -115,14 +114,6 @@ Requires: pkgconfig(xrandr) Requires: pkgconfig(xrender) Requires: pkgconfig(xtst) -%if 0%{?fedora} && 0%{?fedora} >= 36 -Requires: compat-ffmpeg4-devel -%else -Requires: pkgconfig(libavcodec) -Requires: pkgconfig(libavformat) -Requires: pkgconfig(libavutil) -%endif - %description devel %{summary}. @@ -187,7 +178,7 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot %changelog * Sat Aug 13 2022 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-23.20220508git10d5f4b -- Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273. +- Rebuilt. * Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0-22.20220508git10d5f4b - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg