pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
telegram-desktop: added some patches
Module Name: pkgsrc-wip
Committed By: AcidBear <jake.slazenger%yandex.com@localhost>
Pushed By: jakeSlaz
Date: Tue Mar 2 03:46:09 2021 +0300
Changeset: 6c541ae41eae05283c9a563f965824452fa372e3
Modified Files:
telegram-desktop/Makefile
telegram-desktop/distinfo
telegram-desktop/patches/patch-Telegram_cmake_lib_tgvoip.cmake
telegram-desktop/patches/patch-libtgvoip-audio-AudioInput.cpp
Log Message:
telegram-desktop: added some patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6c541ae41eae05283c9a563f965824452fa372e3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
telegram-desktop/Makefile | 10 +-
telegram-desktop/distinfo | 4 +-
.../patches/patch-Telegram_cmake_lib_tgvoip.cmake | 103 ++++++++++++++++++++-
.../patches/patch-libtgvoip-audio-AudioInput.cpp | 4 +-
4 files changed, 111 insertions(+), 10 deletions(-)
diffs:
diff --git a/telegram-desktop/Makefile b/telegram-desktop/Makefile
index d6b6c2d4cd..1f432fbd1b 100644
--- a/telegram-desktop/Makefile
+++ b/telegram-desktop/Makefile
@@ -14,16 +14,18 @@ HOMEPAGE= https://desktop.telegram.org/
COMMENT= Telegram Desktop messaging app
LICENSE= gnu-gpl-v3
-PKGSRC_COMPILER= clang
-ONLY_FOR_COMPILER= clang
+#PKGSRC_COMPILER= clang
+#ONLY_FOR_COMPILER= clang
USE_LANGUAGES= c c++ gnu++14
USE_CMAKE= yes
-#ONLY_FOR_COMPILER= gcc
-#GCC_REQD= 10
+ONLY_FOR_COMPILER= gcc
+GCC_REQD= 10
CMAKE_ARGS+= -Ddisable_autoupdate=1
+CMAKE_ARGS+= -DWITHOUT_PULSE=ON
+CMAKE_ARGS+= -DWITHOUT_ALSA=ON
CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/usr/pkg
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DTDESKTOP_API_TEST=ON
diff --git a/telegram-desktop/distinfo b/telegram-desktop/distinfo
index a59b1beab2..392833e181 100644
--- a/telegram-desktop/distinfo
+++ b/telegram-desktop/distinfo
@@ -26,7 +26,7 @@ SHA1 (patch-Telegram-lib_ui-ui-widgets-call_button.h) = 885811e3bfa551e25aa14cc4
SHA1 (patch-Telegram-lib_ui-ui-widgets-labels.h) = 64d20ac23eb632f9b641a78c382f4c475ff813ec
SHA1 (patch-Telegram-lib_ui-ui-widgets-menu-menu_common.h) = 39ebf0c85fd7c6920f30dd34ba2619dddf26f4a9
SHA1 (patch-Telegram-lib_ui-ui-wrap-wrap.h) = 2db81380dc2bd2cca563f72e980480f4c67db7b5
-SHA1 (patch-Telegram_cmake_lib_tgvoip.cmake) = 212743e2da586d50e5ab95378893aad1585ec983
+SHA1 (patch-Telegram_cmake_lib_tgvoip.cmake) = a5d7800e140ccad879ae082f1fd7e0360b3c4054
SHA1 (patch-Telegram_lib_base_CMakeLists.txt) = 978beafa6367440761544352f287e5db38a0029b
SHA1 (patch-Telegram_lib_base_base_global_shortcuts.h) = ac9b5d6e5e109d447264f3dbf8a20c628a0b696b
SHA1 (patch-Telegram_lib_base_base_global_shortcuts_generic.h) = ddea899ce9702881b8ebac9b6053b0c13e76f105
@@ -51,7 +51,7 @@ SHA1 (patch-lib_base-openssl_help.h) = 145e29381d9b7b6f3095db0cfc0d380fd3603f8e
SHA1 (patch-lib_storage-CMakeLists.txt) = ef770e3f50f075d251262fc511ef21313f5edab1
SHA1 (patch-lib_ui-CMakeLists.txt) = 337297cf3bfe7b67b503dbf29b8c9c267ad4fc5d
SHA1 (patch-libtgvoip-audio-AudioIO.cpp) = 96b482354b3ad6321b3ea95767d0d55ba63dab38
-SHA1 (patch-libtgvoip-audio-AudioInput.cpp) = 1624ba5ec9c4625fdf26ba898aded05f37fcdf82
+SHA1 (patch-libtgvoip-audio-AudioInput.cpp) = 7f6bd97e6d453d95f9317394bf8e4e47cabfbccb
SHA1 (patch-libtgvoip-audio-AudioOutput.cpp) = ec83d33d1158c0e3e8ada0e0458c84347a38e112
SHA1 (patch-libtgvoip-threading.h) = 929bd84af9515d15eff00866237df5044912f5e3
SHA1 (patch-libtgvoip-webrtc_dsp-platform_thread_types.cc) = 0c2d20a9ba95acae349519507dc9515fdb7a6cec
diff --git a/telegram-desktop/patches/patch-Telegram_cmake_lib_tgvoip.cmake b/telegram-desktop/patches/patch-Telegram_cmake_lib_tgvoip.cmake
index eb7cbce5d6..0a7e0a239b 100644
--- a/telegram-desktop/patches/patch-Telegram_cmake_lib_tgvoip.cmake
+++ b/telegram-desktop/patches/patch-Telegram_cmake_lib_tgvoip.cmake
@@ -1,8 +1,107 @@
$NetBSD$
---- Telegram/cmake/lib_tgvoip.cmake.orig 2021-02-27 21:54:57.279016770 +0000
+--- Telegram/cmake/lib_tgvoip.cmake.orig 2021-02-17 15:20:05.000000000 +0000
+++ Telegram/cmake/lib_tgvoip.cmake
-@@ -179,7 +179,7 @@ if (NOT TGVOIP_FOUND)
+@@ -79,46 +79,6 @@ if (NOT TGVOIP_FOUND)
+ json11.cpp
+ json11.hpp
+
+- # Windows
+- os/windows/NetworkSocketWinsock.cpp
+- os/windows/NetworkSocketWinsock.h
+- os/windows/AudioInputWave.cpp
+- os/windows/AudioInputWave.h
+- os/windows/AudioOutputWave.cpp
+- os/windows/AudioOutputWave.h
+- os/windows/AudioOutputWASAPI.cpp
+- os/windows/AudioOutputWASAPI.h
+- os/windows/AudioInputWASAPI.cpp
+- os/windows/AudioInputWASAPI.h
+- os/windows/MinGWSupport.h
+- os/windows/WindowsSpecific.cpp
+- os/windows/WindowsSpecific.h
+-
+- # macOS
+- os/darwin/AudioInputAudioUnit.cpp
+- os/darwin/AudioInputAudioUnit.h
+- os/darwin/AudioOutputAudioUnit.cpp
+- os/darwin/AudioOutputAudioUnit.h
+- os/darwin/AudioInputAudioUnitOSX.cpp
+- os/darwin/AudioInputAudioUnitOSX.h
+- os/darwin/AudioOutputAudioUnitOSX.cpp
+- os/darwin/AudioOutputAudioUnitOSX.h
+- os/darwin/AudioUnitIO.cpp
+- os/darwin/AudioUnitIO.h
+- os/darwin/DarwinSpecific.mm
+- os/darwin/DarwinSpecific.h
+-
+- # Linux
+- os/linux/AudioInputALSA.cpp
+- os/linux/AudioInputALSA.h
+- os/linux/AudioOutputALSA.cpp
+- os/linux/AudioOutputALSA.h
+- os/linux/AudioOutputPulse.cpp
+- os/linux/AudioOutputPulse.h
+- os/linux/AudioInputPulse.cpp
+- os/linux/AudioInputPulse.h
+- os/linux/AudioPulse.cpp
+- os/linux/AudioPulse.h
+
+ # POSIX
+ os/posix/NetworkSocketPosix.cpp
+@@ -169,6 +129,51 @@ if (NOT TGVOIP_FOUND)
+ endif()
+ endif()
+
++ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly")
++ remove_target_sources(Telegram ${src_loc}
++ # Windows
++ os/windows/NetworkSocketWinsock.cpp
++ os/windows/NetworkSocketWinsock.h
++ os/windows/AudioInputWave.cpp
++ os/windows/AudioInputWave.h
++ os/windows/AudioOutputWave.cpp
++ os/windows/AudioOutputWave.h
++ os/windows/AudioOutputWASAPI.cpp
++ os/windows/AudioOutputWASAPI.h
++ os/windows/AudioInputWASAPI.cpp
++ os/windows/AudioInputWASAPI.h
++ os/windows/MinGWSupport.h
++ os/windows/WindowsSpecific.cpp
++ os/windows/WindowsSpecific.h
++
++ # macOS
++ os/darwin/AudioInputAudioUnit.cpp
++ os/darwin/AudioInputAudioUnit.h
++ os/darwin/AudioOutputAudioUnit.cpp
++ os/darwin/AudioOutputAudioUnit.h
++ os/darwin/AudioInputAudioUnitOSX.cpp
++ os/darwin/AudioInputAudioUnitOSX.h
++ os/darwin/AudioOutputAudioUnitOSX.cpp
++ os/darwin/AudioOutputAudioUnitOSX.h
++ os/darwin/AudioUnitIO.cpp
++ os/darwin/AudioUnitIO.h
++ os/darwin/DarwinSpecific.mm
++ os/darwin/DarwinSpecific.h
++
++ # Linux
++ os/linux/AudioInputALSA.cpp
++ os/linux/AudioInputALSA.h
++ os/linux/AudioOutputALSA.cpp
++ os/linux/AudioOutputALSA.h
++ os/linux/AudioOutputPulse.cpp
++ os/linux/AudioOutputPulse.h
++ os/linux/AudioInputPulse.cpp
++ os/linux/AudioInputPulse.h
++ os/linux/AudioPulse.cpp
++ os/linux/AudioPulse.h
++ )
++ endif()
++
+ target_include_directories(lib_tgvoip_bundled
+ PUBLIC
+ ${tgvoip_loc}
+@@ -179,7 +184,7 @@ if (NOT TGVOIP_FOUND)
desktop-app::external_opus
)
diff --git a/telegram-desktop/patches/patch-libtgvoip-audio-AudioInput.cpp b/telegram-desktop/patches/patch-libtgvoip-audio-AudioInput.cpp
index 87642ba33a..6b993f9c28 100644
--- a/telegram-desktop/patches/patch-libtgvoip-audio-AudioInput.cpp
+++ b/telegram-desktop/patches/patch-libtgvoip-audio-AudioInput.cpp
@@ -1,13 +1,13 @@
$NetBSD$
---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2020-02-18 16:28:57.048374114 +0000
+--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2021-01-01 14:29:15.000000000 +0000
+++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp
@@ -26,7 +26,7 @@
#include "../os/windows/AudioInputWave.h"
#endif
#include "../os/windows/AudioInputWASAPI.h"
-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) || defined(__NetBSD__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) || !defined(__NetBSD__)
#ifndef WITHOUT_ALSA
#include "../os/linux/AudioInputALSA.h"
#endif
Home |
Main Index |
Thread Index |
Old Index