[libtgvoip/f31] Updated to latest Git snapshot.

commit 9187e67e592b14236d9883b795b9329926fd79a2 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sat Jun 6 14:22:17 2020 +0200 Updated to latest Git snapshot. .gitignore | 1 + libtgvoip-cxx-std-version.patch | 25 +++++++++++++++++++++++++ libtgvoip-system-json11.patch | 14 +++++++------- libtgvoip.spec | 13 +++++++------ sources | 2 +- 5 files changed, 41 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index a22db4e..ccba138 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libtgvoip-2.4.4.tar.gz /libtgvoip-88b47b6.tar.gz /libtgvoip-c5651ff.tar.gz +/libtgvoip-8682c5c.tar.gz diff --git a/libtgvoip-cxx-std-version.patch b/libtgvoip-cxx-std-version.patch new file mode 100644 index 0000000..0a282dc --- /dev/null +++ b/libtgvoip-cxx-std-version.patch @@ -0,0 +1,25 @@ +From 797768c6c278bee8a1fa361e3c9bc700a4764c3c Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +Date: Sat, 6 Jun 2020 14:16:01 +0200 +Subject: [PATCH 2/2] Incremented C++ standard version. + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3c23a74..1cec43b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -758,7 +758,7 @@ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS) + + pkgconfig_DATA = tgvoip.pc + +-CXXFLAGS += -std=gnu++0x $(CFLAGS) ++CXXFLAGS += -std=gnu++17 $(CFLAGS) + if TARGET_OS_OSX + OBJCFLAGS = $(CFLAGS) + OBJCXXFLAGS += -std=gnu++0x $(CFLAGS) +-- +2.26.2 + diff --git a/libtgvoip-system-json11.patch b/libtgvoip-system-json11.patch index 949a241..23cf0fc 100644 --- a/libtgvoip-system-json11.patch +++ b/libtgvoip-system-json11.patch @@ -1,7 +1,7 @@ -From 7e017735122d67b7e759b9b0548f088dc021e914 Mon Sep 17 00:00:00 2001 +From 9dde3c75d82c58506ef28d781827a2b9e5849b46 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. +Subject: [PATCH 1/2] Build against system json11. --- Makefile.am | 4 +--- @@ -9,7 +9,7 @@ Subject: [PATCH] Build against system json11. 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 8695bb1..40a5f59 100644 +index dba7383..3c23a74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,7 @@ audio/Resampler.cpp \ @@ -31,17 +31,17 @@ index 8695bb1..40a5f59 100644 if TARGET_OS_OSX diff --git a/configure.ac b/configure.ac -index 8a3df4d..3a55189 100644 +index 1756186..b8115d7 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 +@@ -29,6 +29,7 @@ PKG_CHECK_MODULES(CRYPTO, [libcrypto]) AC_CHECK_LIB([m], [floorf]) - AC_CHECK_LIB([opus], [opus_decoder_create], [], [AC_MSG_FAILURE([libopus-dev is required but not found])]) + PKG_CHECK_MODULES(OPUS, [opus]) 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 +2.26.2 diff --git a/libtgvoip.spec b/libtgvoip.spec index e3e5205..fb1c268 100644 --- a/libtgvoip.spec +++ b/libtgvoip.spec @@ -1,10 +1,10 @@ -%global commit0 c5651ffc728336e56d8567f5c6c179e8a5d4fe55 +%global commit0 8682c5c22e9c3a28ee3aacfd1d529db07ea914bf %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global date 20200123 +%global date 20200521 Name: libtgvoip Version: 2.4.4 -Release: 4.%{date}git%{shortcommit0}%{?dist} +Release: 5.%{date}git%{shortcommit0}%{?dist} # Libtgvoip shared library - Public Domain. # Bundled webrtc library - BSD with patented echo cancellation algorithms. @@ -13,6 +13,7 @@ URL: https://github.com/telegramdesktop/%{name} Summary: VoIP library for Telegram clients Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Patch0: %{name}-system-json11.patch +Patch100: %{name}-cxx-std-version.patch Provides: bundled(webrtc-audio-processing) = 0.3 @@ -60,11 +61,11 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/pkgconfig/tgvoip.pc %changelog +* Sat Jun 06 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.4-5.20200521git8682c5c +- Updated to latest Git snapshot. + * 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 diff --git a/sources b/sources index fea50fd..30ed2d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtgvoip-c5651ff.tar.gz) = 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3 +SHA512 (libtgvoip-8682c5c.tar.gz) = 2dc9f52c71cf5330c8b84a69e2e3895f08268c223d2efdfed7bb927565b8404b422d6bab440592c3d05a56ec3c42e93c96b9276c136db98443e90dfaff45a272