[tg_owt] Added commentary.
by Vitaly Zaitsev
Summary of changes:
70d4a5f... Added commentary. (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 3 months
[tg_owt/f37] (2 commits) ...Added commentary.
by Vitaly Zaitsev
Summary of changes:
3f5b712... Try to build with ffmpeg 4 again. (*)
70d4a5f... Added commentary. (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 3 months
[tg_owt/f36: 2/2] Added commentary.
by Vitaly Zaitsev
commit 70d4a5f7fa522271a4e46a6a7813dfeef3e5ffd1
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Aug 14 10:38:02 2022 +0200
Added commentary.
tg_owt.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 053e9d1..5747b6e 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -166,6 +166,7 @@ cp -f -p src/rtc_base/third_party/sigslot/LICENSE legal/LICENSE.sigslot
cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%build
+# Setting pkgconfig path for compat-ffmpeg4...
%if 0%{?fedora} && 0%{?fedora} >= 36
export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
%endif
2 years, 3 months
[tg_owt/f36] (2 commits) ...Added commentary.
by Vitaly Zaitsev
Summary of changes:
3f5b712... Try to build with ffmpeg 4 again. (*)
70d4a5f... Added commentary.
(*) This commit already existed in another branch; no separate mail sent
2 years, 3 months
[tg_owt] Try to build with ffmpeg 4 again.
by Vitaly Zaitsev
commit 3f5b71277bce7c391551efea6435778193e376a4
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Aug 14 10:04:43 2022 +0200
Try to build with ffmpeg 4 again.
tg_owt.spec | 46 ++++++++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 25dcca6..053e9d1 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -14,7 +14,7 @@
Name: tg_owt
Version: 0
-Release: 23.%{date}git%{shortcommit0}%{?dist}
+Release: 24.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
# abseil-cpp - ASL 2.0
@@ -34,15 +34,10 @@ 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)
BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(libswresample)
-BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(vpx)
@@ -61,9 +56,19 @@ 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
+# https://github.com/telegramdesktop/tdesktop/issues/23899
%if 0%{?fedora} && 0%{?fedora} >= 36
-BuildRequires: ffmpeg-devel
+BuildRequires: compat-ffmpeg4-devel
+%else
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libswscale)
%endif
# Disabling all low-memory architectures.
@@ -93,15 +98,10 @@ 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)
Requires: pkgconfig(libpulse)
-Requires: pkgconfig(libswresample)
-Requires: pkgconfig(libswscale)
Requires: pkgconfig(openssl)
Requires: pkgconfig(opus)
Requires: pkgconfig(vpx)
@@ -114,6 +114,16 @@ 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)
+Requires: pkgconfig(libswresample)
+Requires: pkgconfig(libswscale)
+%endif
+
%description devel
%{summary}.
@@ -156,6 +166,10 @@ cp -f -p src/rtc_base/third_party/sigslot/LICENSE legal/LICENSE.sigslot
cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%build
+%if 0%{?fedora} && 0%{?fedora} >= 36
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
+%endif
+
# CMAKE_BUILD_TYPE should always be Release due to some hardcoded checks.
# Warning: Building as a shared library is not supported by upstream.
%cmake -G Ninja \
@@ -177,12 +191,12 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%{_libdir}/lib%{name}.a
%changelog
+* Sun Aug 14 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-24.20220508git10d5f4b
+- Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273.
+
* Sat Aug 13 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-23.20220508git10d5f4b
- Rebuilt.
* 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.
2 years, 3 months
[telegram-desktop] Added an option to build with bundled fonts.
by Vitaly Zaitsev
commit ebe700feb81d5fe9523e75f739c003b715bedaa9
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Aug 14 10:01:22 2022 +0200
Added an option to build with bundled fonts.
telegram-desktop.spec | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index d007302..0a9c417 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,4 +1,5 @@
# Build conditionals...
+%global bundled_fonts 1
%global enable_wayland 1
%global enable_x11 1
@@ -78,6 +79,14 @@ BuildRequires: ninja-build
BuildRequires: python3
BuildRequires: qt6-qtbase-private-devel
+%if %{bundled_fonts}
+Provides: bundled(open-sans-fonts) = 1.10
+Provides: bundled(vazirmatn-fonts) = 27.2.2
+%else
+Requires: open-sans-fonts
+Requires: vazirmatn-fonts
+%endif
+
%if %{enable_wayland}
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
@@ -103,7 +112,6 @@ Requires: ffmpeg-libs%{?_isa}
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
Requires: hicolor-icon-theme
-Requires: open-sans-fonts
Requires: qt6-qtimageformats%{?_isa}
Requires: webkit2gtk3%{?_isa}
@@ -151,9 +159,13 @@ rm -rf Telegram/ThirdParty/{GSL,QR,dispatch,expected,fcitx-qt5,fcitx5-qt,hime,hu
-DTDESKTOP_API_ID=611335 \
-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
-DDESKTOP_APP_USE_PACKAGED:BOOL=ON \
- -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
-DDESKTOP_APP_QT6:BOOL=ON \
+%if %{bundled_fonts}
+ -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=OFF \
+%else
+ -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
+%endif
%if %{enable_wayland}
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=OFF \
%else
2 years, 3 months
[tg_owt/f36] Reverted all previous ffmpeg4 related commits.
by Vitaly Zaitsev
commit 30682cc9f39bd5929c1fed08a652d9ae008a0129
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
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> - 0-23.20220508git10d5f4b
-- Rebuilt against compat-ffmpeg4 to mitigate RFBZ#6273.
+- Rebuilt.
* 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
2 years, 3 months