[libtgvoip/f31] Updated to latest Git snapshot.

commit 4d0dbe6eddbe4ea2973f2f356fe4952af194901a Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jan 24 19:53:12 2020 +0100 Updated to latest Git snapshot. .gitignore | 1 + libtgvoip-build-fixes.patch | 85 ------------------------------------------- libtgvoip-pr6.patch | 61 ------------------------------- libtgvoip-system-json11.patch | 47 ++++++++++++++++++++++++ libtgvoip.spec | 18 ++++----- sources | 2 +- 6 files changed, 56 insertions(+), 158 deletions(-) --- diff --git a/.gitignore b/.gitignore index a78bceb..a22db4e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libtgvoip-2.4.2.tar.gz /libtgvoip-2.4.4.tar.gz /libtgvoip-88b47b6.tar.gz +/libtgvoip-c5651ff.tar.gz diff --git a/libtgvoip-system-json11.patch b/libtgvoip-system-json11.patch new file mode 100644 index 0000000..949a241 --- /dev/null +++ b/libtgvoip-system-json11.patch @@ -0,0 +1,47 @@ +From 7e017735122d67b7e759b9b0548f088dc021e914 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +Date: Fri, 24 Jan 2020 12:11:13 +0100 +Subject: [PATCH] Build against system json11. + +--- + Makefile.am | 4 +--- + configure.ac | 1 + + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 8695bb1..40a5f59 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,8 +26,7 @@ audio/Resampler.cpp \ + os/posix/NetworkSocketPosix.cpp \ + video/VideoSource.cpp \ + video/VideoRenderer.cpp \ +-video/ScreamCongestionController.cpp \ +-json11.cpp ++video/ScreamCongestionController.cpp + + TGVOIP_HDRS = \ + TgVoip.h \ +@@ -55,7 +54,6 @@ os/posix/NetworkSocketPosix.h \ + video/VideoSource.h \ + video/VideoRenderer.h \ + video/ScreamCongestionController.h \ +-json11.hpp \ + utils.h + + if TARGET_OS_OSX +diff --git a/configure.ac b/configure.ac +index 8a3df4d..3a55189 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,6 +29,7 @@ AC_CHECK_LIB([crypto], [SHA1], [], [AC_MSG_FAILURE([libssl-dev is required but n + AC_CHECK_LIB([m], [floorf]) + AC_CHECK_LIB([opus], [opus_decoder_create], [], [AC_MSG_FAILURE([libopus-dev is required but not found])]) + AC_CHECK_LIB([pthread], [pthread_create]) ++AC_CHECK_LIB([json11], [main], [], [AC_MSG_FAILURE([json11-dev is required but not found])]) + + AC_CANONICAL_HOST + +-- +2.24.1 + diff --git a/libtgvoip.spec b/libtgvoip.spec index 2599c14..e3e5205 100644 --- a/libtgvoip.spec +++ b/libtgvoip.spec @@ -1,22 +1,18 @@ -%global commit0 88b47b6f808f2573d4eaf37e1463ecd59c43deda +%global commit0 c5651ffc728336e56d8567f5c6c179e8a5d4fe55 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global date 20191230 +%global date 20200123 Name: libtgvoip Version: 2.4.4 -Release: 3.%{date}git%{shortcommit0}%{?dist} +Release: 4.%{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/telegramdesktop/%{name} Summary: VoIP library for Telegram clients - Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -Patch0: %{name}-build-fixes.patch - -# https://github.com/telegramdesktop/libtgvoip/pull/6 -Patch100: %{name}-pr6.patch +Patch0: %{name}-system-json11.patch Provides: bundled(webrtc-audio-processing) = 0.3 @@ -64,11 +60,11 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/tgvoip.pc %changelog +* Fri Jan 24 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.4-4.20200123gitc5651ff +- Updated to latest Git snapshot. + * Thu Jan 09 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.4-3.20191230git88b47b6 - Switched to supported fork. * Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Mar 12 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.4-1 -- Updated to 2.4.4 (regular release). diff --git a/sources b/sources index b156de6..fea50fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtgvoip-88b47b6.tar.gz) = 1c05f1741c1b117c79961641fd4994b6a3c8f95f3fdb2b51a09afc4b900bed7e4f323d9f2da724ea8dd7516fc7b423d965f70ba976736e26e7cba2bf2203eefd +SHA512 (libtgvoip-c5651ff.tar.gz) = 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3