From 14acd369ebbe74abf823fffbb0ccb5eb7259f158 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 6 Dec 2018 22:38:53 +0100 Subject: [PATCH] telegram-desktop: update to 1.5.0. [ci skip] --- srcpkgs/telegram-desktop/files/Telegram.cmake | 20 +- .../files/TelegramCodegen.cmake | 2 +- .../files/ThirdParty-libtgvoip-webrtc.cmake | 397 +++++++++++++++--- .../files/ThirdParty-libtgvoip.cmake | 14 +- .../patches/qt5-dynamic-linking.patch | 23 +- srcpkgs/telegram-desktop/template | 28 +- 6 files changed, 375 insertions(+), 109 deletions(-) diff --git a/srcpkgs/telegram-desktop/files/Telegram.cmake b/srcpkgs/telegram-desktop/files/Telegram.cmake index 70fc520c45a..81ad253c43b 100644 --- a/srcpkgs/telegram-desktop/files/Telegram.cmake +++ b/srcpkgs/telegram-desktop/files/Telegram.cmake @@ -19,7 +19,7 @@ option(BUILD_TESTS "Build all available test suites" OFF) option(ENABLE_CRASH_REPORTS "Enable crash reports" ON) option(ENABLE_GTK_INTEGRATION "Enable GTK integration" ON) option(USE_LIBATOMIC "Link Statically against libatomic.a" OFF) -option(USE_CUSTOM_API_ID "Use a custom Telegram API ID" OFF) +option(ENABLE_OPENAL_EFFECTS "Enable OpenAL effects" ON) find_package(LibLZMA REQUIRED) find_package(OpenAL REQUIRED) @@ -71,8 +71,12 @@ set_property(SOURCE ${TELEGRAM_GENERATED_SOURCES} PROPERTY SKIP_AUTOMOC ON) set(QRC_FILES Resources/qrc/telegram.qrc - Resources/qrc/telegram_emoji.qrc - Resources/qrc/telegram_emoji_large.qrc + Resources/qrc/telegram_emoji_1.qrc + Resources/qrc/telegram_emoji_2.qrc + Resources/qrc/telegram_emoji_3.qrc + Resources/qrc/telegram_emoji_4.qrc + Resources/qrc/telegram_emoji_5.qrc + # This only disables system plugin search path # We do not want this behavior for system build # Resources/qrc/telegram_linux.qrc @@ -98,7 +102,7 @@ file(GLOB FLAT_SOURCE_FILES SourceFiles/settings/*.cpp SourceFiles/storage/*.cpp SourceFiles/storage/cache/*.cpp - SourceFiles/support/*cpp + SourceFiles/support/*cpp ${THIRD_PARTY_DIR}/emoji_suggestions/*.cpp ) file(GLOB FLAT_EXTRA_FILES @@ -197,9 +201,13 @@ else() ) endif() -if(USE_CUSTOM_API_ID) +if(ENABLE_OPENAL_EFFECTS) list(APPEND TELEGRAM_COMPILE_DEFINITIONS - CUSTOM_API_ID + AL_ALEXT_PROTOTYPES + ) +else() + list(APPEND TELEGRAM_COMPILE_DEFINITIONS + TDESKTOP_DISABLE_OPENAL_EFFECTS ) endif() diff --git a/srcpkgs/telegram-desktop/files/TelegramCodegen.cmake b/srcpkgs/telegram-desktop/files/TelegramCodegen.cmake index 4abfebfbe5b..ae8cdf5ad9c 100644 --- a/srcpkgs/telegram-desktop/files/TelegramCodegen.cmake +++ b/srcpkgs/telegram-desktop/files/TelegramCodegen.cmake @@ -8,7 +8,7 @@ add_custom_command( ${GENERATED_DIR}/scheme.h ${GENERATED_DIR}/scheme.cpp COMMAND python ${TELEGRAM_SOURCES_DIR}/codegen/scheme/codegen_scheme.py -o${GENERATED_DIR} ${TELEGRAM_RESOURCES_DIR}/scheme.tl - DEPENDS ${CMAKE_SOURCE_DIR}/Resources/scheme.tl + DEPENDS ${TELEGRAM_RESOURCES_DIR}/scheme.tl COMMENT "Codegen scheme.tl" ) list(APPEND TELEGRAM_GENERATED_SOURCES diff --git a/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip-webrtc.cmake b/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip-webrtc.cmake index 836138998b7..a841ad5aa71 100644 --- a/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip-webrtc.cmake +++ b/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip-webrtc.cmake @@ -3,77 +3,351 @@ project(webrtc) set(CMAKE_INCLUDE_CURRENT_DIR ON) list(APPEND WEBRTC_C_SOURCE_FILES - "common_audio/fft4g.c" - "common_audio/ring_buffer.c" - "common_audio/signal_processing/auto_corr_to_refl_coef.c" - "common_audio/signal_processing/auto_correlation.c" - "common_audio/signal_processing/complex_bit_reverse.c" - "common_audio/signal_processing/complex_fft.c" - "common_audio/signal_processing/copy_set_operations.c" - "common_audio/signal_processing/cross_correlation.c" - "common_audio/signal_processing/division_operations.c" - "common_audio/signal_processing/dot_product_with_scale.c" - "common_audio/signal_processing/downsample_fast.c" - "common_audio/signal_processing/energy.c" - "common_audio/signal_processing/filter_ar.c" - "common_audio/signal_processing/filter_ar_fast_q12.c" - "common_audio/signal_processing/filter_ma_fast_q12.c" - "common_audio/signal_processing/get_hanning_window.c" - "common_audio/signal_processing/get_scaling_square.c" - "common_audio/signal_processing/ilbc_specific_functions.c" - "common_audio/signal_processing/levinson_durbin.c" - "common_audio/signal_processing/lpc_to_refl_coef.c" - "common_audio/signal_processing/min_max_operations.c" - "common_audio/signal_processing/randomization_functions.c" - "common_audio/signal_processing/real_fft.c" - "common_audio/signal_processing/refl_coef_to_lpc.c" - "common_audio/signal_processing/resample.c" - "common_audio/signal_processing/resample_48khz.c" - "common_audio/signal_processing/resample_by_2.c" - "common_audio/signal_processing/resample_by_2_internal.c" - "common_audio/signal_processing/resample_fractional.c" - "common_audio/signal_processing/spl_init.c" - "common_audio/signal_processing/spl_inl.c" - "common_audio/signal_processing/spl_sqrt.c" - "common_audio/signal_processing/spl_sqrt_floor.c" - "common_audio/signal_processing/splitting_filter_impl.c" - "common_audio/signal_processing/sqrt_of_one_minus_x_squared.c" - "common_audio/signal_processing/vector_scaling_operations.c" + "modules/third_party/fft/fft.c" + "modules/audio_coding/codecs/isac/main/source/pitch_estimator.c" + "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c" + "modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c" + "modules/audio_coding/codecs/isac/main/source/filterbanks.c" + "modules/audio_coding/codecs/isac/main/source/transform.c" + "modules/audio_coding/codecs/isac/main/source/pitch_filter.c" + "modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c" + "modules/audio_coding/codecs/isac/main/source/filter_functions.c" + "modules/audio_coding/codecs/isac/main/source/decode.c" + "modules/audio_coding/codecs/isac/main/source/lattice.c" + "modules/audio_coding/codecs/isac/main/source/intialize.c" + "modules/audio_coding/codecs/isac/main/source/lpc_tables.c" + "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c" + "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c" + "modules/audio_coding/codecs/isac/main/source/encode.c" + "modules/audio_coding/codecs/isac/main/source/lpc_analysis.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c" + "modules/audio_coding/codecs/isac/main/source/entropy_coding.c" + "modules/audio_coding/codecs/isac/main/source/isac_vad.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines.c" + "modules/audio_coding/codecs/isac/main/source/crc.c" + "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c" + "modules/audio_coding/codecs/isac/main/source/decode_bwe.c" + "modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c" + "modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c" + "modules/audio_coding/codecs/isac/main/source/isac.c" + "modules/audio_processing/ns/nsx_core.c" + "modules/audio_processing/ns/noise_suppression_x.c" + "modules/audio_processing/ns/nsx_core_c.c" + "modules/audio_processing/ns/ns_core.c" + "modules/audio_processing/ns/noise_suppression.c" "modules/audio_processing/agc/legacy/analog_agc.c" "modules/audio_processing/agc/legacy/digital_agc.c" - "modules/audio_processing/ns/noise_suppression.c" - "modules/audio_processing/ns/noise_suppression_x.c" - "modules/audio_processing/ns/ns_core.c" - "modules/audio_processing/ns/nsx_core.c" - "modules/audio_processing/ns/nsx_core_c.c" + "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + "common_audio/third_party/fft4g/fft4g.c" + "common_audio/ring_buffer.c" + "common_audio/signal_processing/complex_fft.c" + "common_audio/signal_processing/filter_ma_fast_q12.c" + "common_audio/signal_processing/levinson_durbin.c" + "common_audio/signal_processing/auto_corr_to_refl_coef.c" + "common_audio/signal_processing/resample_by_2_internal.c" + "common_audio/signal_processing/energy.c" + "common_audio/signal_processing/sqrt_of_one_minus_x_squared.c" + "common_audio/signal_processing/downsample_fast.c" + "common_audio/signal_processing/splitting_filter1.c" + "common_audio/signal_processing/filter_ar_fast_q12.c" + "common_audio/signal_processing/spl_init.c" + "common_audio/signal_processing/lpc_to_refl_coef.c" + "common_audio/signal_processing/cross_correlation.c" + "common_audio/signal_processing/division_operations.c" + "common_audio/signal_processing/auto_correlation.c" + "common_audio/signal_processing/get_scaling_square.c" + "common_audio/signal_processing/resample.c" + "common_audio/signal_processing/min_max_operations.c" + "common_audio/signal_processing/refl_coef_to_lpc.c" + "common_audio/signal_processing/filter_ar.c" + "common_audio/signal_processing/vector_scaling_operations.c" + "common_audio/signal_processing/resample_fractional.c" + "common_audio/signal_processing/real_fft.c" + "common_audio/signal_processing/ilbc_specific_functions.c" + "common_audio/signal_processing/complex_bit_reverse.c" + "common_audio/signal_processing/randomization_functions.c" + "common_audio/signal_processing/copy_set_operations.c" + "common_audio/signal_processing/resample_by_2.c" + "common_audio/signal_processing/get_hanning_window.c" + "common_audio/signal_processing/resample_48khz.c" + "common_audio/signal_processing/spl_inl.c" + "common_audio/signal_processing/spl_sqrt.c" + "common_audio/vad/vad_sp.c" + "common_audio/vad/webrtc_vad.c" + "common_audio/vad/vad_filterbank.c" + "common_audio/vad/vad_core.c" + "common_audio/vad/vad_gmm.c" ) list(APPEND WEBRTC_CXX_SOURCE_FILES - "base/checks.cc" - "base/stringutils.cc" - "common_audio/audio_util.cc" - "common_audio/channel_buffer.cc" - "common_audio/sparse_fir_filter.cc" - "common_audio/wav_file.cc" - "common_audio/wav_header.cc" + "system_wrappers/source/field_trial.cc" + "system_wrappers/source/metrics.cc" + "system_wrappers/source/cpu_features.cc" + "absl/strings/internal/memutil.cc" + "absl/strings/string_view.cc" + "absl/strings/ascii.cc" + "absl/types/bad_optional_access.cc" + "absl/types/optional.cc" + "absl/base/internal/raw_logging.cc" + "absl/base/internal/throw_delegate.cc" + "rtc_base/race_checker.cc" + "rtc_base/strings/string_builder.cc" + "rtc_base/memory/aligned_malloc.cc" + "rtc_base/timeutils.cc" + "rtc_base/platform_file.cc" + "rtc_base/string_to_number.cc" + "rtc_base/thread_checker_impl.cc" + "rtc_base/stringencode.cc" + "rtc_base/stringutils.cc" + "rtc_base/checks.cc" + "rtc_base/platform_thread.cc" + "rtc_base/criticalsection.cc" + "rtc_base/platform_thread_types.cc" + "rtc_base/event.cc" + "rtc_base/event_tracer.cc" + "rtc_base/logging_webrtc.cc" + "third_party/rnnoise/src/rnn_vad_weights.cc" + "third_party/rnnoise/src/kiss_fft.cc" + "api/audio/audio_frame.cc" + "api/audio/echo_canceller3_config.cc" + "api/audio/echo_canceller3_factory.cc" + "modules/third_party/fft/fft.c" + "modules/audio_coding/codecs/isac/main/source/pitch_estimator.c" + "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c" + "modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c" + "modules/audio_coding/codecs/isac/main/source/filterbanks.c" + "modules/audio_coding/codecs/isac/main/source/transform.c" + "modules/audio_coding/codecs/isac/main/source/pitch_filter.c" + "modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c" + "modules/audio_coding/codecs/isac/main/source/filter_functions.c" + "modules/audio_coding/codecs/isac/main/source/decode.c" + "modules/audio_coding/codecs/isac/main/source/lattice.c" + "modules/audio_coding/codecs/isac/main/source/intialize.c" + "modules/audio_coding/codecs/isac/main/source/lpc_tables.c" + "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c" + "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c" + "modules/audio_coding/codecs/isac/main/source/encode.c" + "modules/audio_coding/codecs/isac/main/source/lpc_analysis.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c" + "modules/audio_coding/codecs/isac/main/source/entropy_coding.c" + "modules/audio_coding/codecs/isac/main/source/isac_vad.c" + "modules/audio_coding/codecs/isac/main/source/arith_routines.c" + "modules/audio_coding/codecs/isac/main/source/crc.c" + "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c" + "modules/audio_coding/codecs/isac/main/source/decode_bwe.c" + "modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c" + "modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c" + "modules/audio_coding/codecs/isac/main/source/isac.c" + "modules/audio_processing/rms_level.cc" + "modules/audio_processing/echo_detector/normalized_covariance_estimator.cc" + "modules/audio_processing/echo_detector/moving_max.cc" + "modules/audio_processing/echo_detector/circular_buffer.cc" + "modules/audio_processing/echo_detector/mean_variance_estimator.cc" "modules/audio_processing/splitting_filter.cc" + "modules/audio_processing/gain_control_impl.cc" + "modules/audio_processing/ns/nsx_core.c" + "modules/audio_processing/ns/noise_suppression_x.c" + "modules/audio_processing/ns/nsx_core_c.c" + "modules/audio_processing/ns/ns_core.c" + "modules/audio_processing/ns/noise_suppression.c" + "modules/audio_processing/audio_buffer.cc" + "modules/audio_processing/typing_detection.cc" + "modules/audio_processing/include/audio_processing_statistics.cc" + "modules/audio_processing/include/audio_generator_factory.cc" + "modules/audio_processing/include/aec_dump.cc" + "modules/audio_processing/include/audio_processing.cc" + "modules/audio_processing/include/config.cc" + "modules/audio_processing/agc2/interpolated_gain_curve.cc" + "modules/audio_processing/agc2/agc2_common.cc" + "modules/audio_processing/agc2/gain_applier.cc" + "modules/audio_processing/agc2/adaptive_agc.cc" + "modules/audio_processing/agc2/adaptive_digital_gain_applier.cc" + "modules/audio_processing/agc2/limiter.cc" + "modules/audio_processing/agc2/saturation_protector.cc" + "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc" + "modules/audio_processing/agc2/rnn_vad/rnn.cc" + "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc" + "modules/audio_processing/agc2/rnn_vad/spectral_features.cc" + "modules/audio_processing/agc2/rnn_vad/pitch_search.cc" + "modules/audio_processing/agc2/rnn_vad/features_extraction.cc" + "modules/audio_processing/agc2/rnn_vad/fft_util.cc" + "modules/audio_processing/agc2/rnn_vad/lp_residual.cc" + "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc" + "modules/audio_processing/agc2/vector_float_frame.cc" + "modules/audio_processing/agc2/noise_level_estimator.cc" + "modules/audio_processing/agc2/agc2_testing_common.cc" + "modules/audio_processing/agc2/fixed_digital_level_estimator.cc" + "modules/audio_processing/agc2/fixed_gain_controller.cc" + "modules/audio_processing/agc2/vad_with_level.cc" + "modules/audio_processing/agc2/limiter_db_gain_curve.cc" + "modules/audio_processing/agc2/down_sampler.cc" + "modules/audio_processing/agc2/signal_classifier.cc" + "modules/audio_processing/agc2/noise_spectrum_estimator.cc" + "modules/audio_processing/agc2/compute_interpolated_gain_curve.cc" + "modules/audio_processing/agc2/biquad_filter.cc" + "modules/audio_processing/agc2/adaptive_mode_level_estimator.cc" + "modules/audio_processing/transient/moving_moments.cc" + "modules/audio_processing/transient/wpd_tree.cc" + "modules/audio_processing/transient/wpd_node.cc" + "modules/audio_processing/transient/transient_suppressor.cc" + "modules/audio_processing/transient/transient_detector.cc" + "modules/audio_processing/low_cut_filter.cc" + "modules/audio_processing/level_estimator_impl.cc" "modules/audio_processing/three_band_filter_bank.cc" + "modules/audio_processing/aec/echo_cancellation.cc" + "modules/audio_processing/aec/aec_resampler.cc" "modules/audio_processing/aec/aec_core.cc" "modules/audio_processing/aec/aec_core_sse2.cc" - "modules/audio_processing/aec/aec_resampler.cc" - "modules/audio_processing/aec/echo_cancellation.cc" + "modules/audio_processing/voice_detection_impl.cc" + "modules/audio_processing/echo_cancellation_impl.cc" + "modules/audio_processing/gain_control_for_experimental_agc.cc" + "modules/audio_processing/agc/agc.cc" + "modules/audio_processing/agc/loudness_histogram.cc" + "modules/audio_processing/agc/agc_manager_direct.cc" + "modules/audio_processing/agc/legacy/analog_agc.c" + "modules/audio_processing/agc/legacy/digital_agc.c" + "modules/audio_processing/agc/utility.cc" + "modules/audio_processing/audio_processing_impl.cc" + "modules/audio_processing/audio_generator/file_audio_generator.cc" + "modules/audio_processing/gain_controller2.cc" + "modules/audio_processing/residual_echo_detector.cc" + "modules/audio_processing/noise_suppression_impl.cc" "modules/audio_processing/aecm/aecm_core.cc" "modules/audio_processing/aecm/aecm_core_c.cc" "modules/audio_processing/aecm/echo_control_mobile.cc" + "modules/audio_processing/aec3/render_reverb_model.cc" + "modules/audio_processing/aec3/reverb_model_fallback.cc" + "modules/audio_processing/aec3/echo_remover_metrics.cc" + "modules/audio_processing/aec3/matched_filter_lag_aggregator.cc" + "modules/audio_processing/aec3/render_delay_buffer2.cc" + "modules/audio_processing/aec3/echo_path_variability.cc" + "modules/audio_processing/aec3/frame_blocker.cc" + "modules/audio_processing/aec3/subtractor.cc" + "modules/audio_processing/aec3/aec3_fft.cc" + "modules/audio_processing/aec3/fullband_erle_estimator.cc" + "modules/audio_processing/aec3/suppression_filter.cc" + "modules/audio_processing/aec3/block_processor.cc" + "modules/audio_processing/aec3/subband_erle_estimator.cc" + "modules/audio_processing/aec3/render_delay_controller_metrics.cc" + "modules/audio_processing/aec3/render_delay_buffer.cc" + "modules/audio_processing/aec3/vector_buffer.cc" + "modules/audio_processing/aec3/erl_estimator.cc" + "modules/audio_processing/aec3/aec_state.cc" + "modules/audio_processing/aec3/adaptive_fir_filter.cc" + "modules/audio_processing/aec3/render_delay_controller.cc" + "modules/audio_processing/aec3/skew_estimator.cc" + "modules/audio_processing/aec3/echo_path_delay_estimator.cc" + "modules/audio_processing/aec3/block_framer.cc" + "modules/audio_processing/aec3/erle_estimator.cc" + "modules/audio_processing/aec3/reverb_model.cc" + "modules/audio_processing/aec3/cascaded_biquad_filter.cc" + "modules/audio_processing/aec3/render_buffer.cc" + "modules/audio_processing/aec3/subtractor_output.cc" + "modules/audio_processing/aec3/stationarity_estimator.cc" + "modules/audio_processing/aec3/render_signal_analyzer.cc" + "modules/audio_processing/aec3/subtractor_output_analyzer.cc" + "modules/audio_processing/aec3/suppression_gain.cc" + "modules/audio_processing/aec3/echo_audibility.cc" + "modules/audio_processing/aec3/block_processor_metrics.cc" + "modules/audio_processing/aec3/moving_average.cc" + "modules/audio_processing/aec3/reverb_model_estimator.cc" + "modules/audio_processing/aec3/aec3_common.cc" + "modules/audio_processing/aec3/residual_echo_estimator.cc" + "modules/audio_processing/aec3/matched_filter.cc" + "modules/audio_processing/aec3/reverb_decay_estimator.cc" + "modules/audio_processing/aec3/render_delay_controller2.cc" + "modules/audio_processing/aec3/suppression_gain_limiter.cc" + "modules/audio_processing/aec3/main_filter_update_gain.cc" + "modules/audio_processing/aec3/echo_remover.cc" + "modules/audio_processing/aec3/downsampled_render_buffer.cc" + "modules/audio_processing/aec3/matrix_buffer.cc" + "modules/audio_processing/aec3/block_processor2.cc" + "modules/audio_processing/aec3/echo_canceller3.cc" + "modules/audio_processing/aec3/block_delay_buffer.cc" + "modules/audio_processing/aec3/fft_buffer.cc" + "modules/audio_processing/aec3/comfort_noise_generator.cc" + "modules/audio_processing/aec3/shadow_filter_update_gain.cc" + "modules/audio_processing/aec3/filter_analyzer.cc" + "modules/audio_processing/aec3/reverb_frequency_response.cc" + "modules/audio_processing/aec3/decimator.cc" + "modules/audio_processing/echo_control_mobile_impl.cc" "modules/audio_processing/logging/apm_data_dumper.cc" - "modules/audio_processing/splitting_filter.cc" - "modules/audio_processing/three_band_filter_bank.cc" - "modules/audio_processing/utility/block_mean_calculator.cc" - "modules/audio_processing/utility/delay_estimator.cc" - "modules/audio_processing/utility/delay_estimator_wrapper.cc" + "modules/audio_processing/vad/voice_activity_detector.cc" + "modules/audio_processing/vad/standalone_vad.cc" + "modules/audio_processing/vad/pitch_internal.cc" + "modules/audio_processing/vad/vad_circular_buffer.cc" + "modules/audio_processing/vad/vad_audio_proc.cc" + "modules/audio_processing/vad/pole_zero_filter.cc" + "modules/audio_processing/vad/pitch_based_vad.cc" + "modules/audio_processing/vad/gmm.cc" "modules/audio_processing/utility/ooura_fft.cc" + "modules/audio_processing/utility/delay_estimator_wrapper.cc" "modules/audio_processing/utility/ooura_fft_sse2.cc" - "system_wrappers/source/cpu_features.cc" + "modules/audio_processing/utility/delay_estimator.cc" + "modules/audio_processing/utility/block_mean_calculator.cc" + "common_audio/window_generator.cc" + "common_audio/channel_buffer.cc" + "common_audio/fir_filter_factory.cc" + "common_audio/wav_header.cc" + "common_audio/real_fourier_ooura.cc" + "common_audio/audio_util.cc" + "common_audio/fir_filter_sse.cc" + "common_audio/resampler/push_sinc_resampler.cc" + "common_audio/resampler/resampler.cc" + "common_audio/resampler/sinc_resampler_sse.cc" + "common_audio/resampler/push_resampler.cc" + "common_audio/resampler/sinc_resampler.cc" + "common_audio/resampler/sinusoidal_linear_chirp_source.cc" + "common_audio/wav_file.cc" + "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + "common_audio/third_party/fft4g/fft4g.c" + "common_audio/audio_converter.cc" + "common_audio/real_fourier.cc" + "common_audio/sparse_fir_filter.cc" + "common_audio/smoothing_filter.cc" + "common_audio/fir_filter_c.cc" + "common_audio/ring_buffer.c" + "common_audio/signal_processing/complex_fft.c" + "common_audio/signal_processing/filter_ma_fast_q12.c" + "common_audio/signal_processing/levinson_durbin.c" + "common_audio/signal_processing/dot_product_with_scale.cc" + "common_audio/signal_processing/auto_corr_to_refl_coef.c" + "common_audio/signal_processing/resample_by_2_internal.c" + "common_audio/signal_processing/energy.c" + "common_audio/signal_processing/sqrt_of_one_minus_x_squared.c" + "common_audio/signal_processing/downsample_fast.c" + "common_audio/signal_processing/splitting_filter1.c" + "common_audio/signal_processing/filter_ar_fast_q12.c" + "common_audio/signal_processing/spl_init.c" + "common_audio/signal_processing/lpc_to_refl_coef.c" + "common_audio/signal_processing/cross_correlation.c" + "common_audio/signal_processing/division_operations.c" + "common_audio/signal_processing/auto_correlation.c" + "common_audio/signal_processing/get_scaling_square.c" + "common_audio/signal_processing/resample.c" + "common_audio/signal_processing/min_max_operations.c" + "common_audio/signal_processing/refl_coef_to_lpc.c" + "common_audio/signal_processing/filter_ar.c" + "common_audio/signal_processing/vector_scaling_operations.c" + "common_audio/signal_processing/resample_fractional.c" + "common_audio/signal_processing/real_fft.c" + "common_audio/signal_processing/ilbc_specific_functions.c" + "common_audio/signal_processing/complex_bit_reverse.c" + "common_audio/signal_processing/randomization_functions.c" + "common_audio/signal_processing/copy_set_operations.c" + "common_audio/signal_processing/resample_by_2.c" + "common_audio/signal_processing/get_hanning_window.c" + "common_audio/signal_processing/resample_48khz.c" + "common_audio/signal_processing/spl_inl.c" + "common_audio/signal_processing/spl_sqrt.c" + "common_audio/vad/vad_sp.c" + "common_audio/vad/vad.cc" + "common_audio/vad/webrtc_vad.c" + "common_audio/vad/vad_filterbank.c" + "common_audio/vad/vad_core.c" + "common_audio/vad/vad_gmm.c" ) add_library(${PROJECT_NAME} OBJECT ${WEBRTC_C_SOURCE_FILES} ${WEBRTC_CXX_SOURCE_FILES}) @@ -81,13 +355,16 @@ add_library(${PROJECT_NAME} OBJECT ${WEBRTC_C_SOURCE_FILES} ${WEBRTC_CXX_SOURCE_ target_compile_definitions(${PROJECT_NAME} PUBLIC WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_POSIX + WEBRTC_LINUX + WEBRTC_NS_FLOAT +) + +# TODO: drop include dirs with latest webrtc +target_include_directories(${PROJECT_NAME} PUBLIC + "${CMAKE_CURRENT_LIST_DIR}/.." ) if( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2") endif( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" ) -# TODO: drop include dirs with latest webrtc -target_include_directories(${PROJECT_NAME} PUBLIC - "${CMAKE_CURRENT_LIST_DIR}/.." -) diff --git a/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip.cmake b/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip.cmake index 3a73da5d69d..8c57ca86c68 100644 --- a/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip.cmake +++ b/srcpkgs/telegram-desktop/files/ThirdParty-libtgvoip.cmake @@ -2,7 +2,7 @@ project(tgvoip) option(ENABLE_PULSEAUDIO "Enable pulseaudio" ON) -add_subdirectory("${PROJECT_SOURCE_DIR}/webrtc_dsp/webrtc") +add_subdirectory("${PROJECT_SOURCE_DIR}/webrtc_dsp") find_package(PkgConfig REQUIRED) pkg_check_modules(OPUS REQUIRED opus) @@ -12,15 +12,9 @@ file(GLOB TGVOIP_SOURCE_FILES audio/*.cpp os/linux/*.cpp os/posix/*.cpp + video/*.cpp ) -file(GLOB TGVOIP_EXTRA_FILES - audio/AudioIOCallback.cpp - BufferInputStream.cpp - BufferOutputStream.cpp - BufferPool.cpp -) -list(REMOVE_ITEM TGVOIP_SOURCE_FILES ${TGVOIP_EXTRA_FILES}) -set(TGVOIP_COMPILE_DEFINITIONS TGVOIP_USE_DESKTOP_DSP) +set(TGVOIP_COMPILE_DEFINITIONS TGVOIP_USE_DESKTOP_DSP WEBRTC_NS_FLOAT WEBRTC_POSIX WEBRTC_LINUX) if(ENABLE_PULSEAUDIO) pkg_check_modules(LIBPULSE REQUIRED libpulse) @@ -28,7 +22,6 @@ else() file(GLOB PULSEAUDIO_SOURCE_FILES os/linux/AudioInputPulse.cpp os/linux/AudioOutputPulse.cpp - os/linux/PulseAudioLoader.cpp ) list(REMOVE_ITEM TGVOIP_SOURCE_FILES ${PULSEAUDIO_SOURCE_FILES}) list(APPEND TGVOIP_COMPILE_DEFINITIONS WITHOUT_PULSE) @@ -40,6 +33,5 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC ${TGVOIP_COMPILE_DEFINITIONS}) target_include_directories(${PROJECT_NAME} PUBLIC "${OPUS_INCLUDE_DIRS}" "${CMAKE_CURRENT_LIST_DIR}/webrtc_dsp" - "${CMAKE_CURRENT_LIST_DIR}/webrtc_dsp/webrtc" ) target_link_libraries(${PROJECT_NAME} dl ${OPUS_LIBRARIES}) diff --git a/srcpkgs/telegram-desktop/patches/qt5-dynamic-linking.patch b/srcpkgs/telegram-desktop/patches/qt5-dynamic-linking.patch index 0b1ed9e29fb..0ced7f0caaa 100644 --- a/srcpkgs/telegram-desktop/patches/qt5-dynamic-linking.patch +++ b/srcpkgs/telegram-desktop/patches/qt5-dynamic-linking.patch @@ -29,22 +29,17 @@ index d4bdadc17..bf9066274 100644 DEBUG_LOG(("Telegram finished, result: %1").arg(result)); diff --git Telegram/SourceFiles/qt_static_plugins.cpp Telegram/SourceFiles/qt_static_plugins.cpp index e29f348c8..122ff0f5d 100644 ---- Telegram/SourceFiles/qt_static_plugins.cpp -+++ Telegram/SourceFiles/qt_static_plugins.cpp -@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) +--- Telegram/SourceFiles/qt_static_plugins.cpp 2018-12-10 16:37:52.000000000 +0100 ++++ - 2018-12-10 19:00:42.884810312 +0100 +@@ -14,7 +14,7 @@ + Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) - #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC --Q_IMPORT_PLUGIN(QWebpPlugin) --Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) --Q_IMPORT_PLUGIN(QConnmanEnginePlugin) --Q_IMPORT_PLUGIN(QGenericEnginePlugin) --Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin) --Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) - #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX +-#elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC ++#elif 0 // Q_OS_WIN | Q_OS_MAC + Q_IMPORT_PLUGIN(QWebpPlugin) + Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) + Q_IMPORT_PLUGIN(QConnmanEnginePlugin) -- 2.19.0 diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 5e75141f47e..290921ff7e6 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,19 +1,18 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=1.4.3 -revision=3 -_libtgvoip_commit=9b292fdbc84f148f736407176facc920e20592f9 +version=1.5.0 +revision=1 +_libtgvoip_commit=78e584c443b93ce2794bee75c7448d1b00f1edc9 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec _variant_commit=550ac2f159ca883d360c196149b466955c77a573 _crl_commit=4291015efab76bda5886a56b5007f4531be17d46 _Catch_commit=5ca44b68721833ae3731802ed99af67c6f38a53a -build_style=cmake create_wrksrc=yes build_wrksrc="tdesktop-${version}/Telegram" +build_style=cmake cmake_builddir=build-telegram configure_args="-DENABLE_CRASH_REPORTS=OFF -DENABLE_GTK_INTEGRATION=ON - -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio 'ON' 'OFF') - -DUSE_CUSTOM_API_ID=$(vopt_if custom_api_id 'ON' 'OFF')" + -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio 'ON' 'OFF')" hostmakedepends="pkg-config qt5-qmake qt5-host-tools python" makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel @@ -30,8 +29,8 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz" -checksum="bc57654d3d014252dd128c8b5699ca843b8b6dbb926a3e31d10221be16826cc8 - cbfb0955ee56be06b519418b8d22c5a27538e2e9ae5382d558f85f78c9ca761a +checksum="12791c7e7c1316b438ba9c4f3f909efc0ecd873b992bd919f0fa202da3cbc419 + 3bef7809958a9ea93bcfee9553d79365a58ffd0cc3ab2096701bc3d3cc0bf901 be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6 aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d aee42a2fe003888d0d0133cd208a1524f5d95af6af506c1cd7e07e268d0d9081 @@ -40,9 +39,11 @@ checksum="bc57654d3d014252dd128c8b5699ca843b8b6dbb926a3e31d10221be16826cc8 build_options="clang custom_api_id pulseaudio" build_options_default="pulseaudio custom_api_id" +CXXFLAGS="-DTDESKTOP_API_ID=209235 -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43" + if [ "$build_option_clang" ]; then CFLAGS="-fPIE -fPIC -fstack-protector-strong" - CXXFLAGS="-fPIE -fPIC -fstack-protector-strong" + CXXFLAGS+="-fPIE -fPIC -fstack-protector-strong" LDFLAGS="-pie" hostmakedepends+=" clang" configure_args+=" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" @@ -90,7 +91,7 @@ post_extract() { cp ${FILESDIR}/ThirdParty-crl.cmake ${build_wrksrc}/ThirdParty/crl/CMakeLists.txt cp ${FILESDIR}/ThirdParty-libtgvoip.cmake ${build_wrksrc}/ThirdParty/libtgvoip/CMakeLists.txt cp ${FILESDIR}/ThirdParty-libtgvoip-webrtc.cmake \ - ${build_wrksrc}/ThirdParty/libtgvoip/webrtc_dsp/webrtc/CMakeLists.txt + ${build_wrksrc}/ThirdParty/libtgvoip/webrtc_dsp/CMakeLists.txt mkdir -p ${build_wrksrc}/cmake cp ${FILESDIR}/FindBreakpad.cmake ${build_wrksrc}/cmake @@ -99,16 +100,9 @@ post_extract() { mkdir -p ${build_wrksrc}/native cp ${FILESDIR}/TelegramCodegenTools.cmake ${build_wrksrc}/native/CMakeLists.txt - mkdir ${wrksrc}/TelegramPrivate if [ -r "$FILESDIR/custom_api_id.h" ]; then cp "${FILESDIR}/custom_api_id.h" "${wrksrc}/TelegramPrivate" - else - # This Keys are only intended for use in Void Linux - cat > ${wrksrc}/TelegramPrivate/custom_api_id.h <<_EOF -static const int32 ApiId = 209235; -static const char *ApiHash= "169ee702e1df4b6e66d80311db36cc43"; -_EOF fi # change wrksrc temporarily so that patches can be applied