rebuilt with qt 6.8.1 [release 5.9.0-2mamba;Mon Dec 09 2024]

This commit is contained in:
Silvan Calarco 2024-12-13 10:26:30 +01:00
parent 21594c7b5f
commit 6110a2dcce
2 changed files with 14 additions and 45 deletions

View File

@ -1,37 +0,0 @@
From 8979066878cc8cd74d66fde68a173c5b35b26282 Mon Sep 17 00:00:00 2001
From: xiota <github@mentalfossa.com>
Date: Mon, 4 Nov 2024 20:40:37 +0000
Subject: [PATCH] Fix some ffmpeg 7.x related errors
---
Telegram/SourceFiles/ui/controls/round_video_recorder.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index f01df2165be3fd..4ba0e7768bd129 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -107,9 +107,15 @@ class RoundVideoRecorder::Private final {
std::array<int64, kMaxStreams> lastDts = { 0 };
};
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+ static int Write(void *opaque, const uint8_t *_buf, int buf_size) {
+ uint8_t *buf = const_cast<uint8_t *>(_buf);
+#else
static int Write(void *opaque, uint8_t *buf, int buf_size) {
+#endif
return static_cast<Private*>(opaque)->write(buf, buf_size);
}
+
static int64_t Seek(void *opaque, int64_t offset, int whence) {
return static_cast<Private*>(opaque)->seek(offset, whence);
}
@@ -388,7 +394,6 @@ bool RoundVideoRecorder::Private::initAudio() {
_audioCodec->sample_rate = kAudioFrequency;
#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
_audioCodec->ch_layout = AV_CHANNEL_LAYOUT_MONO;
- _audioCodec->channels = _audioCodec->ch_layout.nb_channels;
#else
_audioCodec->channel_layout = AV_CH_LAYOUT_MONO;
_audioCodec->channels = _audioChannels;

View File

@ -1,7 +1,7 @@
Name: telegram Name: telegram
Epoch: 1 Epoch: 1
Version: 5.8.5 Version: 5.9.0
Release: 1mamba Release: 2mamba
Summary: The official desktop client for the Telegram messenger Summary: The official desktop client for the Telegram messenger
Group: Graphical Desktop/Applications/Internet Group: Graphical Desktop/Applications/Internet
Vendor: openmamba Vendor: openmamba
@ -11,7 +11,6 @@ URL: https://telegram.org/
Source: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz Source: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz
Source1: telegramdesktop.desktop Source1: telegramdesktop.desktop
Source2: tg.protocol Source2: tg.protocol
Patch0: telegram-5.7.1-ffmpeg-7.1.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -60,7 +59,7 @@ BuildRequires: qt6-qtdeclarative-devel
BuildRequires: qt6-qtsvg-devel BuildRequires: qt6-qtsvg-devel
BuildRequires: qt6-qtwayland-devel BuildRequires: qt6-qtwayland-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: qt6-qtbase-devel >= 0:6.8.0-1mamba BuildRequires: qt6-qtbase-devel >= 0:6.8.1-1mamba
BuildRequires: libada-devel BuildRequires: libada-devel
BuildRequires: libtg_owt-devel >= 0.1.20230105git BuildRequires: libtg_owt-devel >= 0.1.20230105git
BuildRequires: libabseil-cpp-devel >= 20230125.0 BuildRequires: libabseil-cpp-devel >= 20230125.0
@ -81,13 +80,14 @@ The official desktop client for the Telegram messenger.
%ifnarch aarch64 %{ix86} %ifnarch aarch64 %{ix86}
%debug_package %debug_package
%else
%define _lto_cflags %{nil}
%endif %endif
%prep %prep
%setup -q -n tdesktop-%{version}-full %setup -q -n tdesktop-%{version}-full -D -T
#-D -T
#:<< _EOF #:<< _EOF
#%patch 0 -p1 -b .ffmpeg-7.1
rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl
@ -101,7 +101,7 @@ rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl
-DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
-DDESKTOP_APP_SPECIAL_TARGET="" \ -DDESKTOP_APP_SPECIAL_TARGET="" \
%ifarch aarch64 %{ix86} %ifarch aarch64 %{ix86}
-DCMAKE_CXX_FLAGS="%{optflags} -Os -s -Wl,--gc-sections -Wl,--no-keep-memory -fPIC" -DCMAKE_CXX_FLAGS="-Os -s -Wl,--gc-sections -Wl,--no-keep-memory -fPIC"
%endif %endif
%ifarch x86_64 %ifarch x86_64
@ -147,6 +147,12 @@ fi
%doc LICENSE LEGAL %doc LICENSE LEGAL
%changelog %changelog
* Mon Dec 09 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 5.9.0-2mamba
- rebuilt with qt 6.8.1
* Thu Dec 05 2024 Automatic Build System <autodist@openmamba.org> 5.9.0-1mamba
- automatic version update by autodist
* Sun Dec 01 2024 Automatic Build System <autodist@openmamba.org> 5.8.5-1mamba * Sun Dec 01 2024 Automatic Build System <autodist@openmamba.org> 5.8.5-1mamba
- automatic version update by autodist - automatic version update by autodist