commit 50b3b389327d1aa6130b79b22ecae346ecdcae7d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 13 12:35:34 2022 +0100
Fix the ffmpeg version mixup
tg_owt.spec | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 6ccb377..93db685 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -34,9 +34,17 @@ Source2:
https://github.com/google/crc32c/archive/%{commit2}/crc32c-%{shortcommi
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(gbm)
+# 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
+%if 0%{?fedora} && 0%{?fedora} >= 36
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
+%endif
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3)
@@ -61,15 +69,6 @@ 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
-%if 0%{?fedora} && 0%{?fedora} >= 36
-BuildRequires: compat-ffmpeg4-devel
-BuildConflicts: ffmpeg-devel
-BuildConflicts: ffmpeg-free-devel
-%endif
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64