diff --git a/telegram-5.7.1-ffmpeg-7.1.patch b/telegram-5.7.1-ffmpeg-7.1.patch new file mode 100644 index 0000000..f518a5c --- /dev/null +++ b/telegram-5.7.1-ffmpeg-7.1.patch @@ -0,0 +1,37 @@ +From 8979066878cc8cd74d66fde68a173c5b35b26282 Mon Sep 17 00:00:00 2001 +From: xiota +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 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(_buf); ++#else + static int Write(void *opaque, uint8_t *buf, int buf_size) { ++#endif + return static_cast(opaque)->write(buf, buf_size); + } ++ + static int64_t Seek(void *opaque, int64_t offset, int whence) { + return static_cast(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; diff --git a/telegram.spec b/telegram.spec index 571eeb4..72dec77 100644 --- a/telegram.spec +++ b/telegram.spec @@ -1,7 +1,7 @@ Name: telegram Epoch: 1 -Version: 5.6.3 -Release: 2mamba +Version: 5.7.1 +Release: 1mamba Summary: The official desktop client for the Telegram messenger Group: Graphical Desktop/Applications/Internet Vendor: openmamba @@ -11,6 +11,7 @@ URL: https://telegram.org/ Source: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz Source1: telegramdesktop.desktop Source2: tg.protocol +Patch0: telegram-5.7.1-ffmpeg-7.1.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -86,6 +87,8 @@ The official desktop client for the Telegram messenger. %setup -q -n tdesktop-%{version}-full #-D -T #:<< _EOF +%patch 0 -p1 -b .ffmpeg-7.1 + rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl %build @@ -144,6 +147,9 @@ fi %doc LICENSE LEGAL %changelog +* Tue Nov 05 2024 Automatic Build System 5.7.1-1mamba +- automatic version update by autodist + * Mon Oct 21 2024 Automatic Build System 5.6.3-2mamba - rebuilt by autoport with build requirements: qt6-qtbase-devel>=0:6.8.0-1mamba