diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.0-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.7.2-libtgvoip.patchset similarity index 81% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.0-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.2-libtgvoip.patchset index 288be77d8..03368ba1e 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.7.0-libtgvoip.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.7.2-libtgvoip.patchset @@ -1,15 +1,15 @@ -From b0f43936fb71181882e42ec3cb43eb676a07eab8 Mon Sep 17 00:00:00 2001 +From ca06e74946e133a8620f0c7392a2bd57a908d774 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 15 Apr 2019 18:51:48 +1000 +Date: Sat, 1 Jun 2019 19:23:51 +1000 Subject: Add mediakit support -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp old mode 100755 new mode 100644 index 0ecd63e..61081f9 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp @@ -10,7 +10,7 @@ #include #include @@ -19,12 +19,12 @@ index 0ecd63e..61081f9 #include #else #include "opus.h" -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp old mode 100755 new mode 100644 index 8786bf5..ab5abc4 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp @@ -9,7 +9,7 @@ #include #include "logging.h" @@ -34,15 +34,15 @@ index 8786bf5..ab5abc4 #include #else #include "opus.h" -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.h old mode 100755 new mode 100644 -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp old mode 100755 new mode 100644 -index 66fb80e..bb65fb6 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp +index 618be86..672c038 +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp @@ -8,6 +8,9 @@ #include #include @@ -64,10 +64,10 @@ index 66fb80e..bb65fb6 #elif defined(__APPLE__) static pthread_once_t token = PTHREAD_ONCE_INIT; pthread_once(&token, &initMachTimestart); -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp index 2c16ca7..e00c731 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp @@ -39,6 +39,9 @@ #ifndef WITHOUT_PULSE #include "../os/linux/AudioPulse.h" @@ -87,10 +87,10 @@ index 2c16ca7..e00c731 100644 #elif defined(__linux__) #ifndef WITHOUT_ALSA #ifndef WITHOUT_PULSE -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp index dae647a..4bab98c 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp @@ -33,6 +33,8 @@ #ifndef WITHOUT_PULSE #include "../os/linux/AudioPulse.h" @@ -100,10 +100,10 @@ index dae647a..4bab98c 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp index 458e8a5..1890350 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp @@ -37,6 +37,8 @@ #include "../os/linux/AudioOutputPulse.h" #include "../os/linux/AudioPulse.h" @@ -113,10 +113,10 @@ index 458e8a5..1890350 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp -index a033147..108ccaa 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp +index d0db218..0c36280 100644 +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp @@ -115,6 +115,14 @@ '<(tgvoip_src_loc)/os/linux/AudioPulse.cpp', '<(tgvoip_src_loc)/os/linux/AudioPulse.h', @@ -144,7 +144,7 @@ index a033147..108ccaa 100644 [ '"<(OS)" != "mac"', { 'sources/': [['exclude', '<(tgvoip_src_loc)/os/darwin/']], -@@ -891,6 +904,22 @@ +@@ -895,6 +908,22 @@ }, ], [ @@ -167,11 +167,11 @@ index a033147..108ccaa 100644 '"<(OS)" == "linux"', { 'defines': [ 'WEBRTC_POSIX', -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp new file mode 100644 index 0000000..7cce3e3 --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp @@ -0,0 +1,276 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -449,11 +449,11 @@ index 0000000..7cce3e3 + snooze(100); + } +} -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h new file mode 100644 index 0000000..1c63afe --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h @@ -0,0 +1,66 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -521,11 +521,11 @@ index 0000000..1c63afe +} + +#endif //LIBTGVOIP_AUDIOINPUTHAIKU_H -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp new file mode 100644 index 0000000..2fca8a1 --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp @@ -0,0 +1,99 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -626,11 +626,11 @@ index 0000000..2fca8a1 +bool AudioOutputHaiku::IsPlaying(){ + return isPlaying; +} -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h new file mode 100644 index 0000000..91f2521 --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h @@ -0,0 +1,35 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -667,11 +667,11 @@ index 0000000..91f2521 +} + +#endif //LIBTGVOIP_AUDIOOUTPUTHAIKU_H -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp new file mode 100644 index 0000000..43236d3 --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp @@ -0,0 +1,130 @@ +#include +#include @@ -803,11 +803,11 @@ index 0000000..43236d3 +{ + return initialized?B_OK:B_ERROR; +} -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h new file mode 100644 index 0000000..4715632 --- /dev/null -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h @@ -0,0 +1,31 @@ +#ifndef __RING_BUFFER_H__ +#define __RING_BUFFER_H__ @@ -840,10 +840,10 @@ index 0000000..4715632 +}; + +#endif -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp index 52eef76..c480dfb 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp @@ -248,12 +248,13 @@ void NetworkSocketPosix::Open(){ } int flag=0; @@ -868,12 +868,12 @@ index 52eef76..c480dfb 100644 #else struct ifaddrs* interfaces; if(!getifaddrs(&interfaces)){ -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h old mode 100755 new mode 100644 index 9dc2554..fc68fd4 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h @@ -9,7 +9,7 @@ #include @@ -899,12 +899,12 @@ index 9dc2554..fc68fd4 } self->entry(); return NULL; -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc old mode 100755 new mode 100644 index a8d1522..991241b ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc @@ -28,6 +28,10 @@ static const int kMaxLogLineSize = 1024 - 60; #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID @@ -929,13 +929,13 @@ index a8d1522..991241b } if (file != nullptr) { -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_file.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_file.h old mode 100755 new mode 100644 -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc index 70cf237..e48948e 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc @@ -20,6 +20,8 @@ namespace rtc { PlatformThreadId CurrentThreadId() { #if defined(WEBRTC_WIN) @@ -945,10 +945,10 @@ index 70cf237..e48948e 100644 #elif defined(WEBRTC_POSIX) #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) return pthread_mach_thread_np(pthread_self()); -diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h +diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h index 0bc42eb..c87cde9 100644 ---- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h -+++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h +--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h ++++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h @@ -35,6 +35,9 @@ typedef DWORD PlatformThreadRef; #elif defined(WEBRTC_FUCHSIA) typedef zx_handle_t PlatformThreadId; diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.0-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.7.2-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.0-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.2-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.0.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.7.2.patchset similarity index 95% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.0.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.2.patchset index cc1fc84d3..ce53f55f1 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.7.0.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.7.2.patchset @@ -132,28 +132,6 @@ index fbdcb56..0eb0e4f 100644 #include int (*TestForkedMethod)()/* = nullptr*/; -diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp -index a7a150d..d95a157 100644 ---- a/Telegram/SourceFiles/boxes/add_contact_box.cpp -+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp -@@ -88,7 +88,7 @@ void ShowAddParticipantsError( - const auto makeAdmin = [=] { - const auto user = users.front(); - const auto weak = std::make_shared>(); -- const auto close = [=](auto&&...) { -+ const auto close = [=] { - if (*weak) { - (*weak)->closeBox(); - } -@@ -96,7 +96,7 @@ void ShowAddParticipantsError( - const auto saveCallback = SaveAdminCallback( - channel, - user, -- close, -+ [=](auto&&...) { close(); }, - close); - auto box = Box( - channel, diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index 1b63208..41a1017 100644 --- a/Telegram/SourceFiles/core/launcher.cpp @@ -250,77 +228,6 @@ index 4626702..2ef702b 100644 }; enum DBIPeerReportSpamStatus { -diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index 65caf6a..e20356e 100644 ---- a/Telegram/SourceFiles/export/data/export_data_types.cpp -+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -226,7 +226,8 @@ Image ParseMaxImage( - photo.vaccess_hash, - photo.vfile_reference, - data.vtype) }; -- if constexpr (MTPDphotoCachedSize::Is()) { -+ constexpr bool is = MTPDphotoCachedSize::Is(); -+ if constexpr (is) { - result.file.content = data.vbytes.v; - result.file.size = result.file.content.size(); - } else { -@@ -422,7 +423,8 @@ Image ParseDocumentThumb( - document.vaccess_hash, - document.vfile_reference, - data.vtype) }; -- if constexpr (MTPDphotoCachedSize::Is()) { -+ constexpr bool is = MTPDphotoCachedSize::Is(); -+ if constexpr (is) { - result.file.content = data.vbytes.v; - result.file.size = result.file.content.size(); - } else { -@@ -1114,7 +1116,8 @@ Message ParseMessage( - auto result = Message(); - data.match([&](const auto &data) { - result.id = data.vid.v; -- if constexpr (!MTPDmessageEmpty::Is()) { -+ constexpr bool is = (!MTPDmessageEmpty::Is()); -+ if constexpr (is) { - result.toId = ParsePeerId(data.vto_id); - const auto peerId = (!data.is_out() - && data.has_from_id() -diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index d7b3bbd..a6c8ec3 100644 ---- a/Telegram/SourceFiles/export/export_api_wrap.cpp -+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp -@@ -742,7 +742,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { - Expects(_userpicsProcess != nullptr); - - result.match([&](const auto &data) { -- if constexpr (MTPDphotos_photos::Is()) { -+ constexpr bool is = (MTPDphotos_photos::Is()); -+ if constexpr (is) { - _userpicsProcess->lastSlice = true; - } - loadUserpicsFiles(Data::ParseUserpicsSlice( -@@ -1280,7 +1281,8 @@ void ApiWrap::requestMessagesSlice() { - result.match([&](const MTPDmessages_messagesNotModified &data) { - error("Unexpected messagesNotModified received."); - }, [&](const auto &data) { -- if constexpr (MTPDmessages_messages::Is()) { -+ constexpr bool is = (MTPDmessages_messages::Is()); -+ if constexpr (is) { - _chatProcess->lastSlice = true; - } - loadMessagesFiles(Data::ParseMessagesSlice( -diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp -index 3778e69..98e7ecc 100644 ---- a/Telegram/SourceFiles/logs.cpp -+++ b/Telegram/SourceFiles/logs.cpp -@@ -333,7 +333,7 @@ void start(not_null launcher) { - if (cAlphaVersion()) { - workingDirChosen = true; - --#if defined Q_OS_MAC || defined Q_OS_LINUX -+#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_HAIKU - } else { - if (!cWorkingDir().isEmpty()) { - // This value must come from TelegramForcePortable diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp index 0ac3579..14dbbc7 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -2664,3 +2571,26 @@ index 622462e..e3ba800 100644 -- 2.21.0 + +From 51d1bf639cd379e5aac864fd8f4f1f7be6071723 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 1 Jun 2019 21:36:20 +1000 +Subject: Fix range include path + + +diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp +index 6ca841f..f797144 100644 +--- a/Telegram/gyp/lib_lottie.gyp ++++ b/Telegram/gyp/lib_lottie.gyp +@@ -43,7 +43,7 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(libs_loc)/range-v3/include', ++ '<(submodules_loc)/range/include', + '<(libs_loc)/zlib', + '<(lottie_loc)', + '<(lottie_loc)/bodymovin', +-- +2.21.0 + diff --git a/net-im/telegram-desktop/telegram_desktop-1.7.0.recipe b/net-im/telegram-desktop/telegram_desktop-1.7.2.recipe similarity index 87% rename from net-im/telegram-desktop/telegram_desktop-1.7.0.recipe rename to net-im/telegram-desktop/telegram_desktop-1.7.2.recipe index 577fbc342..881de0f23 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.7.0.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.7.2.recipe @@ -5,12 +5,12 @@ COPYRIGHT="2013-2019 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="3be1f6979da9dd0061f27ad5082f96633a4dfde078b1406554b13d5e9674a8bb" +CHECKSUM_SHA256="e19a3ecd85f1ad1b1a925dd8b3df5b81a384ed530b3fcbca702a2ead8979f797" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" -srcGitRev_2="e7010506210fbb3a6704d7ac1276b3334f9ab6c9" +srcGitRev_2="a19a0aff644127d8089f6a4ac18119ec5247dbd0" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="9c250f24c0f1775daefb2967c2a25be1d10ea35e72928256aec3f469e576bac4" +CHECKSUM_SHA256_2="d839ab5a3358e171116b322e0053f441e023c9ced9aec3f0388969c2fce7ac43" SOURCE_FILENAME_2="libtgvoip-$srcGitRev_2.tar.gz" srcGitRev_3="550ac2f159ca883d360c196149b466955c77a573" SOURCE_URI_3="https://github.com/mapbox/variant/archive/$srcGitRev_3.tar.gz" @@ -24,9 +24,9 @@ srcGitRev_5="5ca44b68721833ae3731802ed99af67c6f38a53a" SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$srcGitRev_5.tar.gz" CHECKSUM_SHA256_5="d24e6d9df2b8aa5739d3b9077c6b0ff0ef4d5ef8acc52c3a57e32893854d8d18" SOURCE_FILENAME_5="Catch-$srcGitRev_5.tar.gz" -srcGitRev_6="84072fba75f14620935e5e91788ce603daeb1988" +srcGitRev_6="d259aebc11df52cb6ff8c738580dc4d8f245d681" SOURCE_URI_6="https://github.com/telegramdesktop/crl/archive/$srcGitRev_6.tar.gz" -CHECKSUM_SHA256_6="0f4143814b17d61d09c6a7fb6764ce74756ec14c0aab94cd65758f7b5a6d2928" +CHECKSUM_SHA256_6="f5ea3aeeda0290a44ac49b6300b033d171e67a5b27039fea2f8ae0cb3fc71253" SOURCE_FILENAME_6="crl-$srcGitRev_6.tar.gz" srcGitRev_7="4b10be9cbadd7d0880437f48f875185589fd86d3" SOURCE_URI_7="https://github.com/ericniebler/range-v3/archive/$srcGitRev_7.tar.gz" @@ -36,8 +36,12 @@ srcGitRev_8="7cc9639699f64b750c0b82333dced9ea77e8436e" SOURCE_URI_8="https://github.com/Cyan4973/xxHash/archive/$srcGitRev_8.tar.gz" CHECKSUM_SHA256_8="0d1e2b4ae15f98acc49084e23ba94853dba2b0f654865ecedb1072b3959421bf" SOURCE_FILENAME_8="xxHash-$srcGitRev_8.tar.gz" -SOURCE_URI_9="https://salsa.debian.org/debian/telegram-desktop/raw/debian/master/debian/rules#noarchive" -CHECKSUM_SHA256_9="7ec2c62ee047ee003b267013719b17aa757278b07623fb9337b54d6c0c10d144" +srcGitRev_9="ddccffed3c87ce6763dd73a6453b1edfb1389743" +SOURCE_URI_9="https://github.com/telegramdesktop/qtlottie/archive/$srcGitRev_9.tar.gz" +CHECKSUM_SHA256_9="a3efeebad3dafeb49aa76542c451eb79c997b127e17d6fdb61794b60afad0e91" +SOURCE_FILENAME_9="qtlottie-$srcGitRev_9.tar.gz" +SOURCE_URI_10="https://salsa.debian.org/debian/telegram-desktop/raw/debian/master/debian/rules#noarchive" +CHECKSUM_SHA256_10="86382a56ef7163eedbfae7e4daf491e9d3e7a8811ff2c769e6d7c143def7727f" PATCHES=" telegram_desktop-$portVersion-systemqt.patch @@ -96,6 +100,7 @@ BUILD_REQUIRES=" devel:libQt5Gui$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix + devel:librapidjson$secondaryArchSuffix devel:libswresample$secondaryArchSuffix devel:libswscale$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -121,7 +126,7 @@ PATCH() BUILD() { # link submodules - rm -rf Telegram/ThirdParty/{libtgvoip,variant,GSL,Catch,crl,range,xxHash} + rm -rf Telegram/ThirdParty/{libtgvoip,variant,GSL,Catch,crl,range,xxHash,qtlottie} ln -sfn $sourceDir2/libtgvoip-$srcGitRev_2 Telegram/ThirdParty/libtgvoip ln -sfn $sourceDir3/variant-$srcGitRev_3 Telegram/ThirdParty/variant ln -sfn $sourceDir4/GSL-$srcGitRev_4 Telegram/ThirdParty/GSL @@ -129,10 +134,11 @@ BUILD() ln -sfn $sourceDir6/crl-$srcGitRev_6 Telegram/ThirdParty/crl ln -sfn $sourceDir7/range-v3-$srcGitRev_7 Telegram/ThirdParty/range ln -sfn $sourceDir8/xxHash-$srcGitRev_8 Telegram/ThirdParty/xxHash + ln -sfn $sourceDir9/qtlottie-$srcGitRev_9 Telegram/ThirdParty/qtlottie # get API_ID and API_HASH from Debian - local TELEGRAM_API_ID=`sed -n 's/TELEGRAM_API_ID = \(.*\)/\1/p' < $sourceDir9/rules` - local TELEGRAM_API_HASH=`sed -n 's/TELEGRAM_API_HASH = \(.*\)/\1/p' < $sourceDir9/rules` + local TELEGRAM_API_ID=`sed -n 's/TELEGRAM_API_ID = \(.*\)/\1/p' < $sourceDir10/rules` + local TELEGRAM_API_HASH=`sed -n 's/TELEGRAM_API_HASH = \(.*\)/\1/p' < $sourceDir10/rules` if [ -z $TELEGRAM_API_ID ] || [ -z $TELEGRAM_API_HASH ]; then TELEGRAM_API_ID="17349"