commit fb85f50d760436f967fcca2e4684fd37af06fc20 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Tue Dec 11 15:25:28 2018 +0100 Updated to 2.4 (regular release). .gitignore | 1 + libtgvoip-build-fixes.patch | 46 ++++++++++++++++++++++----------------------- libtgvoip.spec | 14 +++++++++++--- sources | 2 +- 4 files changed, 36 insertions(+), 27 deletions(-) --- diff --git a/.gitignore b/.gitignore index de38355..234dcb3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libtgvoip-2.2.tar.gz /libtgvoip-2.2.3.tar.gz /libtgvoip-2.2.4.tar.gz +/libtgvoip-2.4.tar.gz diff --git a/libtgvoip-build-fixes.patch b/libtgvoip-build-fixes.patch index ff5aa83..8aa9ac8 100644 --- a/libtgvoip-build-fixes.patch +++ b/libtgvoip-build-fixes.patch @@ -1,17 +1,17 @@ -From 9bae6eb0555636cd2950c69422f2e4a205242cb0 Mon Sep 17 00:00:00 2001 +From b5f964e08f39860ad5fdf033907564498ebbb852 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu, 6 Jul 2017 17:27:01 +0200 Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library. --- - libtgvoip.gyp | 7 ++-- - webrtc_dsp/webrtc/common_audio/wav_file.cc | 20 +++++++++--- - webrtc_dsp/webrtc/common_audio/wav_header.cc | 34 +++++++++++++++++++- - webrtc_dsp/webrtc/typedefs.h | 14 +++++++- + libtgvoip.gyp | 7 +++--- + webrtc_dsp/common_audio/wav_file.cc | 20 ++++++++++++---- + webrtc_dsp/common_audio/wav_header.cc | 34 ++++++++++++++++++++++++++- + webrtc_dsp/typedefs.h | 14 ++++++++++- 4 files changed, 65 insertions(+), 10 deletions(-) diff --git a/libtgvoip.gyp b/libtgvoip.gyp -index 0cf04ea..88a98cd 100644 +index 8c62b56..c362667 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp @@ -4,7 +4,8 @@ @@ -24,7 +24,7 @@ index 0cf04ea..88a98cd 100644 'dependencies': [], 'defines': [ 'WEBRTC_APM_DEBUG_DUMP=0', -@@ -13,11 +14,11 @@ +@@ -14,11 +15,11 @@ 'variables': { 'tgvoip_src_loc': '.', 'official_build_target%': '', @@ -38,11 +38,11 @@ index 0cf04ea..88a98cd 100644 ], 'direct_dependent_settings': { 'include_dirs': [ -diff --git a/webrtc_dsp/webrtc/common_audio/wav_file.cc b/webrtc_dsp/webrtc/common_audio/wav_file.cc -index 2b9098a..4f99da7 100644 ---- a/webrtc_dsp/webrtc/common_audio/wav_file.cc -+++ b/webrtc_dsp/webrtc/common_audio/wav_file.cc -@@ -77,9 +77,6 @@ size_t WavReader::num_samples() const { +diff --git a/webrtc_dsp/common_audio/wav_file.cc b/webrtc_dsp/common_audio/wav_file.cc +index 1b8bcbd..9ebf635 100644 +--- a/webrtc_dsp/common_audio/wav_file.cc ++++ b/webrtc_dsp/common_audio/wav_file.cc +@@ -93,9 +93,6 @@ size_t WavReader::num_samples() const { } size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { @@ -52,7 +52,7 @@ index 2b9098a..4f99da7 100644 // There could be metadata after the audio; ensure we don't read it. num_samples = std::min(num_samples, num_samples_remaining_); const size_t read = -@@ -88,6 +85,12 @@ size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { +@@ -104,6 +101,12 @@ size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { RTC_CHECK(read == num_samples || feof(file_handle_)); RTC_CHECK_LE(read, num_samples_remaining_); num_samples_remaining_ -= read; @@ -65,7 +65,7 @@ index 2b9098a..4f99da7 100644 return read; } -@@ -144,10 +147,17 @@ size_t WavWriter::num_samples() const { +@@ -178,10 +181,17 @@ size_t WavWriter::num_samples() const { void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) { #ifndef WEBRTC_ARCH_LITTLE_ENDIAN @@ -85,11 +85,11 @@ index 2b9098a..4f99da7 100644 RTC_CHECK_EQ(num_samples, written); num_samples_ += written; RTC_CHECK(num_samples_ >= written); // detect size_t overflow -diff --git a/webrtc_dsp/webrtc/common_audio/wav_header.cc b/webrtc_dsp/webrtc/common_audio/wav_header.cc -index 402ea17..b11ee58 100644 ---- a/webrtc_dsp/webrtc/common_audio/wav_header.cc -+++ b/webrtc_dsp/webrtc/common_audio/wav_header.cc -@@ -127,7 +127,39 @@ static inline std::string ReadFourCC(uint32_t x) { +diff --git a/webrtc_dsp/common_audio/wav_header.cc b/webrtc_dsp/common_audio/wav_header.cc +index e49b748..68a2620 100644 +--- a/webrtc_dsp/common_audio/wav_header.cc ++++ b/webrtc_dsp/common_audio/wav_header.cc +@@ -86,7 +86,39 @@ static inline std::string ReadFourCC(uint32_t x) { return std::string(reinterpret_cast<char*>(&x), 4); } #else @@ -130,10 +130,10 @@ index 402ea17..b11ee58 100644 #endif static inline uint32_t RiffChunkSize(size_t bytes_in_payload) { -diff --git a/webrtc_dsp/webrtc/typedefs.h b/webrtc_dsp/webrtc/typedefs.h +diff --git a/webrtc_dsp/typedefs.h b/webrtc_dsp/typedefs.h index c960d95..2252855 100644 ---- a/webrtc_dsp/webrtc/typedefs.h -+++ b/webrtc_dsp/webrtc/typedefs.h +--- a/webrtc_dsp/typedefs.h ++++ b/webrtc_dsp/typedefs.h @@ -48,7 +48,19 @@ #define WEBRTC_ARCH_32_BITS #define WEBRTC_ARCH_LITTLE_ENDIAN @@ -156,5 +156,5 @@ index c960d95..2252855 100644 #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN)) -- -2.17.1 +2.19.2 diff --git a/libtgvoip.spec b/libtgvoip.spec index b812d01..8c6cc41 100644 --- a/libtgvoip.spec +++ b/libtgvoip.spec @@ -1,5 +1,5 @@ Name: libtgvoip -Version: 2.2.4 +Version: 2.4 Release: 1%{?dist} Summary: VoIP library for Telegram clients @@ -47,14 +47,16 @@ popd # Installing shared library... mkdir -p "%{buildroot}%{_libdir}" install -m 0755 -p out/Release/lib.target/%{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.%{version}" -ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.2.2" ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.2" ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so" # Installing additional development files... -mkdir -p "%{buildroot}%{_includedir}/%{name}/audio" +mkdir -p "%{buildroot}%{_includedir}/%{name}" find . -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name} \; +mkdir -p "%{buildroot}%{_includedir}/%{name}/audio" find audio -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name}/audio \; +mkdir -p "%{buildroot}%{_includedir}/%{name}/video" +find video -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name}/video \; %files %license UNLICENSE @@ -65,6 +67,12 @@ find audio -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{build %{_libdir}/%{name}.so %changelog +* Tue Dec 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4-1 +- Updated to 2.4 (regular release). + +* Sat Nov 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.3-1 +- Updated to 2.3 (regular release). + * Sun Sep 02 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.2.4-1 - Updated to 2.2.4 (regular release). diff --git a/sources b/sources index 8190f8d..c5e0889 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96a5582c5ce65c8e51202044212c49ce libtgvoip-2.2.4.tar.gz +669390f08d17f5d54361de2c04e92c45 libtgvoip-2.4.tar.gz