mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-07-24 14:33:02 +02:00
Get rid of libtgvoip leftovers
This commit is contained in:
Ilya Fedin
John Preston
parent
fd24f7045e
commit
f1d3a946d5
6 changed files with 0 additions and 255 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,6 +1,3 @@
|
|||
[submodule "Telegram/ThirdParty/libtgvoip"]
|
||||
path = Telegram/ThirdParty/libtgvoip
|
||||
url = https://github.com/telegramdesktop/libtgvoip
|
||||
[submodule "Telegram/ThirdParty/GSL"]
|
||||
path = Telegram/ThirdParty/GSL
|
||||
url = https://github.com/Microsoft/GSL.git
|
||||
|
|
|
|||
|
|
@ -53,9 +53,7 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON)
|
|||
|
||||
target_link_libraries(Telegram
|
||||
PRIVATE
|
||||
# tdesktop::lib_tgcalls_legacy
|
||||
tdesktop::lib_tgcalls
|
||||
# tdesktop::lib_tgvoip
|
||||
|
||||
# Order in this list defines the order of include paths in command line.
|
||||
# We need to place desktop-app::external_minizip this early to have its
|
||||
|
|
|
|||
1
Telegram/ThirdParty/libtgvoip
vendored
1
Telegram/ThirdParty/libtgvoip
vendored
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 2d2592860478e60d972b96e67ee034b8a71bb57a
|
||||
|
|
@ -280,26 +280,3 @@ PUBLIC
|
|||
PRIVATE
|
||||
${tgcalls_loc}
|
||||
)
|
||||
|
||||
# add_library(lib_tgcalls_legacy STATIC)
|
||||
# init_target(lib_tgcalls_legacy)
|
||||
|
||||
# add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy)
|
||||
|
||||
# nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc}
|
||||
# PRIVATE
|
||||
# legacy/InstanceImplLegacy.cpp
|
||||
# legacy/InstanceImplLegacy.h
|
||||
# )
|
||||
|
||||
# target_include_directories(lib_tgcalls_legacy
|
||||
# PRIVATE
|
||||
# ${tgcalls_loc}
|
||||
# )
|
||||
|
||||
# target_link_libraries(lib_tgcalls_legacy
|
||||
# PRIVATE
|
||||
# tdesktop::lib_tgcalls
|
||||
# tdesktop::lib_tgvoip
|
||||
# desktop-app::external_openssl
|
||||
# )
|
||||
|
|
|
|||
|
|
@ -1,220 +0,0 @@
|
|||
# This file is part of Telegram Desktop,
|
||||
# the official desktop application for the Telegram messaging service.
|
||||
#
|
||||
# For license and copyright information please follow this link:
|
||||
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
add_library(lib_tgvoip INTERFACE IMPORTED GLOBAL)
|
||||
add_library(tdesktop::lib_tgvoip ALIAS lib_tgvoip)
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_package(PkgConfig)
|
||||
if (PkgConfig_FOUND)
|
||||
pkg_check_modules(TDESKTOP_TGVOIP IMPORTED_TARGET tgvoip)
|
||||
endif()
|
||||
|
||||
if (TDESKTOP_TGVOIP_FOUND)
|
||||
target_link_libraries(lib_tgvoip INTERFACE PkgConfig::TDESKTOP_TGVOIP)
|
||||
return()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include(CMakeDependentOption)
|
||||
|
||||
add_library(lib_tgvoip_bundled STATIC)
|
||||
init_target(lib_tgvoip_bundled)
|
||||
|
||||
cmake_dependent_option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend." OFF LINUX ON)
|
||||
cmake_dependent_option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend." OFF LINUX ON)
|
||||
|
||||
set(tgvoip_loc ${third_party_loc}/libtgvoip)
|
||||
|
||||
nice_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
|
||||
PRIVATE
|
||||
BlockingQueue.cpp
|
||||
BlockingQueue.h
|
||||
Buffers.cpp
|
||||
Buffers.h
|
||||
CongestionControl.cpp
|
||||
CongestionControl.h
|
||||
EchoCanceller.cpp
|
||||
EchoCanceller.h
|
||||
JitterBuffer.cpp
|
||||
JitterBuffer.h
|
||||
logging.cpp
|
||||
logging.h
|
||||
MediaStreamItf.cpp
|
||||
MediaStreamItf.h
|
||||
OpusDecoder.cpp
|
||||
OpusDecoder.h
|
||||
OpusEncoder.cpp
|
||||
OpusEncoder.h
|
||||
threading.h
|
||||
VoIPController.cpp
|
||||
VoIPGroupController.cpp
|
||||
VoIPController.h
|
||||
PrivateDefines.h
|
||||
VoIPServerConfig.cpp
|
||||
VoIPServerConfig.h
|
||||
audio/AudioInput.cpp
|
||||
audio/AudioInput.h
|
||||
audio/AudioOutput.cpp
|
||||
audio/AudioOutput.h
|
||||
audio/Resampler.cpp
|
||||
audio/Resampler.h
|
||||
NetworkSocket.cpp
|
||||
NetworkSocket.h
|
||||
PacketReassembler.cpp
|
||||
PacketReassembler.h
|
||||
MessageThread.cpp
|
||||
MessageThread.h
|
||||
audio/AudioIO.cpp
|
||||
audio/AudioIO.h
|
||||
video/ScreamCongestionController.cpp
|
||||
video/ScreamCongestionController.h
|
||||
video/VideoSource.cpp
|
||||
video/VideoSource.h
|
||||
video/VideoRenderer.cpp
|
||||
video/VideoRenderer.h
|
||||
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
|
||||
os/posix/NetworkSocketPosix.h
|
||||
)
|
||||
|
||||
target_compile_definitions(lib_tgvoip_bundled
|
||||
PRIVATE
|
||||
TGVOIP_USE_DESKTOP_DSP
|
||||
)
|
||||
|
||||
target_include_directories(lib_tgvoip_bundled
|
||||
PUBLIC
|
||||
${tgvoip_loc}
|
||||
)
|
||||
target_link_libraries(lib_tgvoip_bundled
|
||||
PRIVATE
|
||||
desktop-app::external_webrtc
|
||||
desktop-app::external_opus
|
||||
)
|
||||
|
||||
if (APPLE)
|
||||
target_compile_definitions(lib_tgvoip_bundled
|
||||
PUBLIC
|
||||
TARGET_OS_OSX
|
||||
TARGET_OSX
|
||||
)
|
||||
if (build_macstore)
|
||||
target_compile_definitions(lib_tgvoip_bundled
|
||||
PUBLIC
|
||||
TGVOIP_NO_OSX_PRIVATE_API
|
||||
)
|
||||
endif()
|
||||
elseif (LINUX)
|
||||
if (NOT LIBTGVOIP_DISABLE_ALSA)
|
||||
find_package(ALSA REQUIRED)
|
||||
target_include_directories(lib_tgvoip_bundled SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
|
||||
else()
|
||||
remove_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
|
||||
os/linux/AudioInputALSA.cpp
|
||||
os/linux/AudioInputALSA.h
|
||||
os/linux/AudioOutputALSA.cpp
|
||||
os/linux/AudioOutputALSA.h
|
||||
)
|
||||
|
||||
target_compile_definitions(lib_tgvoip_bundled PRIVATE WITHOUT_ALSA)
|
||||
endif()
|
||||
|
||||
if (NOT LIBTGVOIP_DISABLE_PULSEAUDIO)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(PULSE REQUIRED libpulse)
|
||||
target_include_directories(lib_tgvoip_bundled SYSTEM PRIVATE ${PULSE_INCLUDE_DIRS})
|
||||
else()
|
||||
remove_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
|
||||
os/linux/AudioOutputPulse.cpp
|
||||
os/linux/AudioOutputPulse.h
|
||||
os/linux/AudioInputPulse.cpp
|
||||
os/linux/AudioInputPulse.h
|
||||
os/linux/AudioPulse.cpp
|
||||
os/linux/AudioPulse.h
|
||||
)
|
||||
|
||||
target_compile_definitions(lib_tgvoip_bundled PRIVATE WITHOUT_PULSE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
add_library(lib_tgvoip_bundled_options INTERFACE)
|
||||
|
||||
if (MSVC)
|
||||
target_compile_options(lib_tgvoip_bundled_options
|
||||
INTERFACE
|
||||
/wd4005 # 'identifier' : macro redefinition
|
||||
/wd4068 # unknown pragma
|
||||
/wd4996 # deprecated
|
||||
/wd5055 # operator '>' deprecated between enumerations and floating-point types
|
||||
)
|
||||
else()
|
||||
target_compile_options_if_exists(lib_tgvoip_bundled_options
|
||||
INTERFACE
|
||||
-Wno-unqualified-std-cast-call
|
||||
-Wno-unused-variable
|
||||
-Wno-unknown-pragmas
|
||||
-Wno-error=sequence-point
|
||||
-Wno-error=unused-result
|
||||
)
|
||||
if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
|
||||
target_compile_options(lib_tgvoip_bundled_options INTERFACE -msse2)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_link_libraries(lib_tgvoip_bundled
|
||||
PRIVATE
|
||||
lib_tgvoip_bundled_options
|
||||
)
|
||||
|
||||
target_link_libraries(lib_tgvoip
|
||||
INTERFACE
|
||||
lib_tgvoip_bundled
|
||||
)
|
||||
|
|
@ -89,15 +89,12 @@ parts:
|
|||
- clang
|
||||
- libtool-bin
|
||||
- python3
|
||||
- libasound2-dev
|
||||
- libavif-dev
|
||||
- libboost-regex-dev
|
||||
- libgirepository1.0-dev
|
||||
- libglib2.0-dev
|
||||
- libheif-dev
|
||||
- libopenal-dev
|
||||
- libopus-dev
|
||||
- libpulse-dev
|
||||
- libssl-dev
|
||||
- libxcb1-dev
|
||||
- libxcb-keysyms1-dev
|
||||
|
|
@ -105,7 +102,6 @@ parts:
|
|||
- libxcb-screensaver0-dev
|
||||
- zlib1g-dev
|
||||
stage-packages:
|
||||
- libasound2t64
|
||||
- libavif16
|
||||
- libboost-regex1.83.0
|
||||
- libgeoclue-2-0
|
||||
|
|
@ -113,8 +109,6 @@ parts:
|
|||
- libglib2.0-0t64
|
||||
- libheif1
|
||||
- libopenal1
|
||||
- libopus0
|
||||
- libpulse0
|
||||
- libssl3t64
|
||||
- libwebkit2gtk-4.1-0
|
||||
- libxcb1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue