[tg_owt/f36: 2/2] Apply more strict ffmpeg 4 requirement.
by Vitaly Zaitsev
commit c345ab051cc0984f6f5642c1354c5357fcce488a
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Aug 13 13:42:21 2022 +0200
Apply more strict ffmpeg 4 requirement.
tg_owt.spec | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 93db685..b122e6c 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -34,17 +34,6 @@ 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)
@@ -69,6 +58,17 @@ 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
+%else
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+%endif
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64
@@ -97,9 +97,6 @@ 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)
@@ -118,6 +115,14 @@ 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}.
2 years, 3 months
[tg_owt] Fix the ffmpeg version mixup
by Leigh Scott
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
2 years, 3 months
[tg_owt/f36: 2/2] Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273.
by Vitaly Zaitsev
commit a8a8b4ab1374948dfa262fe2111a2bfcb66ef681
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Aug 13 13:16:05 2022 +0200
Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273.
tg_owt.spec | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 4d7180e..6ccb377 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -14,7 +14,7 @@
Name: tg_owt
Version: 0
-Release: 22.%{date}git%{shortcommit0}%{?dist}
+Release: 23.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
# abseil-cpp - ASL 2.0
@@ -61,9 +61,14 @@ BuildRequires: gcc-c++
BuildRequires: ninja-build
BuildRequires: yasm
-# Fedora now has a stripped ffmpeg. Make sure we're using the full version.
+# 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: ffmpeg-devel
+BuildRequires: compat-ffmpeg4-devel
+BuildConflicts: ffmpeg-devel
+BuildConflicts: ffmpeg-free-devel
%endif
# Disabling all low-memory architectures.
@@ -177,15 +182,12 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%{_libdir}/lib%{name}.a
%changelog
+* Sat Aug 13 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-23.20220508git10d5f4b
+- Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273.
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0-22.20220508git10d5f4b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
* Sat Jun 25 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-21.20220508git10d5f4b
- Updated to latest Git snapshot.
-
-* Mon Apr 18 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-19.20220413git63a934d
-- Updated to latest Git snapshot.
-
-* Fri Mar 11 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-18.20220225gita264028
-- Updated to latest Git snapshot.
2 years, 3 months
[xorg-x11-drv-nvidia] Add support for nvidia-open-kmod
by Nicolas Chauvet
commit a9d0540d1f217f6cf1acb437fe1544a012849400
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Aug 12 17:30:14 2022 +0200
Add support for nvidia-open-kmod
xorg-x11-drv-nvidia.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4d87c48..14bd8de 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -26,7 +26,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 515.65.01
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -80,6 +80,8 @@ Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
+# Support nvidia-open-kmod
+Provides: %{_nvidia_serie}-open-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia-340xx
Conflicts: xorg-x11-drv-nvidia-390xx
@@ -587,6 +589,9 @@ fi ||:
%endif
%changelog
+* Fri Aug 12 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.65.01-2
+- Add support for nvidia-open-kmod
+
* Thu Aug 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:515.65.01-1
- Update to 515.65.01
2 years, 3 months