[telegram-desktop/f32] Updated to version 2.4.6.
by Vitaly Zaitsev
commit f5306582543e3d035940b4ecb5a8ba8b00dd3d2e
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Nov 2 17:07:32 2020 +0100
Updated to version 2.4.6.
.gitignore | 1 +
sources | 3 +-
telegram-desktop.spec | 93 +++++----------------------------------------------
3 files changed, 11 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cecec05..5c85e2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,4 @@
/tdesktop-2.4.3-full.tar.gz
/owt-c73a471.tar.gz
/tdesktop-2.4.4-full.tar.gz
+/tdesktop-2.4.6-full.tar.gz
diff --git a/sources b/sources
index 9ae8583..ff435ad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (owt-c73a471.tar.gz) = b022e77bc3ebce0a42bd40f781b5ff2b8222f44c9ebacb8f6d5581fe04fa7bbb6faf29ee9a090da3aee322bc581feeab375b2ab6dd9aab084627327b191c1d7a
-SHA512 (tdesktop-2.4.4-full.tar.gz) = db212cc9aef7de21e4e4fa30fdabb88224cda5ab164935de118cab507af730f5773602f8cd7acd83a53daa5bf35fe28fdb18fb192c01e2e484069a9ac69c7c57
+SHA512 (tdesktop-2.4.6-full.tar.gz) = 922b9d00a90866899c2817aaa24273b2ac8525bb18543598c8f203846d2e2e3849485cfcbce081d4dfbd45ebafe40dd57434f08849781a4f1d011b3518d03a6b
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 51d927a..e6d4fbe 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -3,25 +3,13 @@
# Build conditionals (with - OFF, without - ON)...
%bcond_with rlottie
-%bcond_without webrtc
%bcond_with gtk3
%bcond_with clang
-# F33+ has some issues with LTO: https://bugzilla.redhat.com/show_bug.cgi?id=1880290
-%if 0%{?fedora} && 0%{?fedora} >= 33
-%bcond_with ipo
-%else
-%bcond_without ipo
-%endif
-
# Telegram Desktop's constants...
%global appname tdesktop
%global launcher telegramdesktop
-# Git revision of WebRTC...
-%global commit1 c73a4718cbff7048373a63db32068482e5fd11ef
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-
# Applying workaround to RHBZ#1559007...
%if %{with clang}
%if 0%{?fedora} && 0%{?fedora} >= 33
@@ -39,20 +27,17 @@
%endif
Name: telegram-desktop
-Version: 2.4.4
+Version: 2.4.6
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
-# * tg_owt - BSD -- static dependency;
# * rlottie - LGPLv2+ -- static dependency;
# * qt_functions.cpp - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv2+ and LGPLv3
URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
-
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
-Source1: https://github.com/desktop-app/tg_owt/archive/%{commit1}/owt-%{shortcommi...
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
@@ -103,6 +88,7 @@ BuildRequires: openssl-devel
BuildRequires: wayland-devel
BuildRequires: xxhash-devel
BuildRequires: json11-devel
+BuildRequires: tg_owt-devel
BuildRequires: ninja-build
BuildRequires: glib2-devel
BuildRequires: opus-devel
@@ -111,23 +97,6 @@ BuildRequires: lz4-devel
BuildRequires: xz-devel
BuildRequires: python3
-%if %{with webrtc}
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libjpeg-turbo-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: yasm
-
-Provides: bundled(tg_owt) = 0~git%{shortcommit1}
-Provides: bundled(openh264) = 0~git
-Provides: bundled(abseil-cpp) = 0~git
-Provides: bundled(libsrtp) = 0~git
-Provides: bundled(libvpx) = 0~git
-Provides: bundled(libyuv) = 0~git
-Provides: bundled(pffft) = 0~git
-Provides: bundled(rnnoise) = 0~git
-Provides: bundled(usrsctp) = 0~git
-%endif
-
%if %{with clang}
BuildRequires: compiler-rt
BuildRequires: clang
@@ -156,12 +125,6 @@ business messaging needs.
# Unpacking Telegram Desktop source archive...
%autosetup -n %{appname}-%{version}-full -p1
-# Unpacking WebRTC...
-%if %{with webrtc}
-tar -xf %{SOURCE1}
-mv tg_owt-%{commit1} tg_owt
-%endif
-
# Unbundling libraries...
rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,libtgvoip,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
@@ -171,51 +134,12 @@ rm -rf Telegram/ThirdParty/rlottie
%endif
%build
-# Building WebRTC using cmake...
-%if %{with webrtc}
-pushd tg_owt
-%cmake -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
-%ifarch x86_64
-%if %{with ipo} && %{without clang}
- -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON \
-%endif
-%endif
-%if %{with clang}
- -DCMAKE_C_COMPILER=%{_bindir}/clang \
- -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \
- -DCMAKE_AR=%{_bindir}/llvm-ar \
- -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \
- -DCMAKE_LINKER=%{_bindir}/llvm-ld \
- -DCMAKE_OBJDUMP=%{_bindir}/llvm-objdump \
- -DCMAKE_NM=%{_bindir}/llvm-nm \
-%else
- -DCMAKE_AR=%{_bindir}/gcc-ar \
- -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \
- -DCMAKE_NM=%{_bindir}/gcc-nm \
-%endif
- -DTG_OWT_PACKAGED_BUILD:BOOL=ON
-%cmake_build
-popd
-%endif
-
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-%ifarch x86_64
-%if %{with ipo} && %{without clang}
- -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON \
-%endif
-%endif
%if %{with rlottie}
-DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \
%endif
-%if %{with webrtc}
- -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=OFF \
- -Dtg_owt_DIR:PATH=%{_builddir}/%{appname}-%{version}-full/tg_owt/%_vpath_builddir \
-%else
- -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=ON \
-%endif
%if %{with clang}
-DCMAKE_C_COMPILER=%{_bindir}/clang \
-DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \
@@ -235,6 +159,7 @@ popd
-DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
-DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
+ -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=OFF \
%if %{with gtk3}
-DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=OFF \
%else
@@ -259,11 +184,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
-* Sat Oct 24 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.4-1
-- Updated to version 2.4.4.
+* Mon Nov 02 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.6-1
+- Updated to version 2.4.6.
-* Wed Oct 07 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.3-1
-- Updated to version 2.4.3.
+* Sun Nov 01 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.5-1
+- Updated to version 2.4.5.
-* Fri Oct 02 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.2-1
-- Updated to version 2.4.2.
+* Sat Oct 24 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.4-1
+- Updated to version 2.4.4.
4 years
[shotcut/f31] (4 commits) ...Update to 20.10.31
by Martin Gansser
Summary of changes:
1db59fe... Is required mlt 6.22.1 to successful build (*)
72db606... Force X (rfbz#5822) (*)
9a2b408... Fix patch (*)
b8a3bcc... Update to 20.10.31 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[tg_owt/f32] Removed separate IPO build flag.
by Vitaly Zaitsev
commit 02d7831e2defe92513560010223ad3f89c4277d2
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Nov 2 15:42:41 2020 +0100
Removed separate IPO build flag.
tg_owt.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 80237ea..08a250b 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -130,7 +130,6 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
- -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=OFF \
-DTG_OWT_USE_PROTOBUF:BOOL=ON \
-DTG_OWT_PACKAGED_BUILD:BOOL=ON
%cmake_build
4 years
[shotcut/f32] (4 commits) ...Update to 20.10.31
by Martin Gansser
Summary of changes:
1db59fe... Is required mlt 6.22.1 to successful build (*)
72db606... Force X (rfbz#5822) (*)
9a2b408... Fix patch (*)
b8a3bcc... Update to 20.10.31 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[shotcut/f33] Update to 20.10.31
by Martin Gansser
Summary of changes:
b8a3bcc... Update to 20.10.31 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[shotcut] Update to 20.10.31
by Martin Gansser
commit b8a3bccc9fdfec0da6dade7243eea0882c7e9b3b
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon Nov 2 15:40:03 2020 +0100
Update to 20.10.31
.gitignore | 1 +
mlt_path.patch | 16 ++++++++--------
shotcut.spec | 7 +++++--
sources | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d65243..ffa2c9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
/shotcut-20.07.11.tar.gz
/shotcut-20.09.13.tar.gz
/shotcut-20.09.27.tar.gz
+/shotcut-20.10.31.tar.gz
diff --git a/mlt_path.patch b/mlt_path.patch
index 6007da8..b3be6bf 100644
--- a/mlt_path.patch
+++ b/mlt_path.patch
@@ -1,11 +1,11 @@
---- src/jobs/meltjob.cpp 2016-06-30 21:45:33.000000000 -0600
-+++ meltjob-2.cpp 2016-07-12 22:54:00.360113879 -0600
-@@ -54,7 +54,7 @@
- #ifdef Q_OS_WIN
- QFileInfo meltPath(shotcutPath, "qmelt.exe");
- #else
-- QFileInfo meltPath(shotcutPath, "qmelt");
+--- src/jobs/meltjob.cpp.orig 2020-11-02 15:30:43.463144678 +0100
++++ src/jobs/meltjob.cpp 2020-11-02 15:30:59.196142990 +0100
+@@ -95,7 +95,7 @@
+ return;
+ }
+ QString shotcutPath = qApp->applicationDirPath();
+- QFileInfo meltPath(shotcutPath, "melt");
+ QFileInfo meltPath(shotcutPath, "mlt-melt");
- #endif
setReadChannel(QProcess::StandardError);
QStringList args;
+ args << "-verbose";
diff --git a/shotcut.spec b/shotcut.spec
index 0f0cb3b..1ca7f3c 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,8 +3,8 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 20.09.27
-Release: 2%{dist}
+Version: 20.10.31
+Release: 1%{dist}
#Release: 0.1.beta1%%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
@@ -186,6 +186,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Mon Nov 02 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 20.10.31-1
+- Update to 20.10.31
+
* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 20.09.27-2
- Force X (rfbz#5822)
diff --git a/sources b/sources
index 1c27300..ea9cd8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shotcut-20.09.27.tar.gz) = 751a8a040566cf4969d68bcc3521f79e981238c558f6a8a03794491ef87bce962cf6a6e6cb912e941e6ec482bc190fd118aaacb41bd5c9efa80fb14f9a3a86d4
+SHA512 (shotcut-20.10.31.tar.gz) = 4d0109e87c86e3b7bb20aeb4b9a38fac175f90f00b8b13b605af9f5959578a2329da5a91d96891c814a84e7f23501ee5d3be9d2ca7a4bdd1a70af9894f0f7348
4 years
