commit 8fcb1b551e054b85de82ceb7966f57d672c83d3f Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jun 1 13:18:23 2018 +0200 Updated to version 2.0 alpha 4. .gitignore | 1 + libtgvoip-build-fixes.patch | 67 ++++++--------------------------------------- libtgvoip.spec | 28 ++++++++++++------- sources | 2 +- 4 files changed, 28 insertions(+), 70 deletions(-) --- diff --git a/.gitignore b/.gitignore index d3123b2..7db1cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libtgvoip-bfd5cfe.tar.gz /libtgvoip-6a0b3b2.tar.gz /libtgvoip-1.0.3.tar.gz +/libtgvoip-83ac2c6.tar.gz diff --git a/libtgvoip-build-fixes.patch b/libtgvoip-build-fixes.patch index 7979ca8..c026504 100644 --- a/libtgvoip-build-fixes.patch +++ b/libtgvoip-build-fixes.patch @@ -1,44 +1,17 @@ -From 58b79cc2f7ebdb9f70ae726c60a1a51772d42180 Mon Sep 17 00:00:00 2001 +From 6e00eb1438629ad49468765460d2408f1339432e 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. --- - VoIPController.cpp | 5 +++- - libtgvoip.gyp | 17 +++++++++----- - webrtc_dsp/webrtc/common_audio/wav_file.cc | 20 ++++++++++++---- - webrtc_dsp/webrtc/common_audio/wav_header.cc | 34 +++++++++++++++++++++++++++- - webrtc_dsp/webrtc/typedefs.h | 14 +++++++++++- - 5 files changed, 76 insertions(+), 14 deletions(-) + 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 +++++++- + 4 files changed, 65 insertions(+), 10 deletions(-) -diff --git a/VoIPController.cpp b/VoIPController.cpp -index ab7e2fd..cb2fabd 100644 ---- a/VoIPController.cpp -+++ b/VoIPController.cpp -@@ -103,9 +103,12 @@ bool VoIPController::didInitWin32TimeScale = false; - #define SHA256_LENGTH 32 - - #ifndef TGVOIP_USE_CUSTOM_CRYPTO -+extern "C" { - #include <openssl/sha.h> - #include <openssl/aes.h> -+#include <openssl/modes.h> - #include <openssl/rand.h> -+} - - void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){ - AES_KEY akey; -@@ -134,7 +137,7 @@ void tgvoip_openssl_sha256(uint8_t* msg, size_t len, uint8_t* output){ - void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){ - AES_KEY akey; - AES_set_encrypt_key(key, 32*8, &akey); -- AES_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num); -+ CRYPTO_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num, (block128_f) AES_encrypt); - } - - voip_crypto_functions_t VoIPController::crypto={ diff --git a/libtgvoip.gyp b/libtgvoip.gyp -index 527708d..f5db56a 100644 +index 08c07e3..71b26fa 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp @@ -4,7 +4,8 @@ @@ -65,30 +38,6 @@ index 527708d..f5db56a 100644 ], 'direct_dependent_settings': { 'include_dirs': [ -@@ -381,9 +382,6 @@ - 'defines': [ - 'WEBRTC_POSIX', - ], -- 'cflags_cc': [ -- '-msse2', -- ], - 'direct_dependent_settings': { - 'libraries': [ - -@@ -391,6 +389,13 @@ - }, - }, - ], -+ [ -+ '"<!(uname -p)" == "i686"', { -+ 'cflags_cc': [ -+ '-msse2', -+ ], -+ } -+ ], - ], - }, - ], 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 @@ -207,5 +156,5 @@ index c960d95..2252855 100644 #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN)) -- -2.14.3 +2.17.0 diff --git a/libtgvoip.spec b/libtgvoip.spec index 896d3b4..84bbb76 100644 --- a/libtgvoip.spec +++ b/libtgvoip.spec @@ -1,14 +1,18 @@ +%global commit0 83ac2c603beabf4d34007fb838aa0c6d68857a54 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global date 20180528 + Summary: VoIP library for Telegram clients Name: libtgvoip -Version: 1.0.3 -Release: 2%{?dist} +Version: 2.0 +Release: 0.3.%{date}git%{shortcommit0}%{?dist} # Libtgvoip shared library - Public Domain. # Bundled webrtc library - BSD with patented echo cancellation algorithms. License: Public Domain and BSD URL: https://github.com/grishka/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Patch0: %{name}-build-fixes.patch Provides: bundled(webrtc-audio-processing) = 0.3 @@ -32,7 +36,7 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{summary}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{commit0} -p1 %build export VOIPVER="%{version}" @@ -47,8 +51,7 @@ 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.1.0" -ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.1" +ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.2" ln -s %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so" # Installing additional development files... @@ -56,8 +59,7 @@ mkdir -p "%{buildroot}%{_includedir}/%{name}/audio" find . -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name} \; find audio -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name}/audio \; -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license UNLICENSE @@ -68,8 +70,14 @@ find audio -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{build %{_libdir}/%{name}.so %changelog -* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Tue May 29 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.0-0.3.20180528git83ac2c6 +- Updated to latest snapshot. + +* Sun May 27 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.0-0.2.20180525gitd2453dd +- Updated to latest snapshot. + +* Thu May 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.0-0.1.20180515gitb52eb58 +- Updated to 2.0-alpha4 (snapshot). * Fri Dec 29 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.0.3-1 - Updated to 1.0.3 (regular release). diff --git a/sources b/sources index b71c39c..20aaba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dd7d3c64a7c03e70b1a0d090e6fe0bb libtgvoip-1.0.3.tar.gz +ea43c3d5cf4b6c35ac8c7368314ecb23 libtgvoip-83ac2c6.tar.gz