12:11 p.m.
commit 4f80e81fd30f8a57c5ef3e6eb317171eb16773e9
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Jun 25 14:11:15 2022 +0200
Updated all third-party sources.
.gitignore | 1 +
sources | 3 ++-
tg_owt.spec | 51 +++++++++++++++++----------------------------------
3 files changed, 20 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ae937f..d435909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/tg_owt-a264028.tar.gz
/tg_owt-63a934d.tar.gz
/tg_owt-10d5f4b.tar.gz
+/crc32c-21fc8ef.tar.gz
diff --git a/sources b/sources
index e950c81..14c7b92 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (libyuv-ad89006.tar.gz) =
0d5b1afeab9d45a3ccfaf9f184e26218c4caccf1d829cbe0ec8522241a5b0b60209754c082086911d2e866ab94776c64c0c1f9acdeac4b1a25fc447053f090ec
+SHA512 (crc32c-21fc8ef.tar.gz) =
80dc12463c95d87a25eac49249ea303d6e4734bcf9a849dbcc564c70df1b1b5f70e7f7e4db96f4c1c66bb3d4eeca87aeef9f2312a8162ade885f09b049fd7417
+SHA512 (libyuv-ad89006.tar.gz) =
1168a777e1ce2caa172a18c59da97a8d665ad73cf7713b883ebdc75eace194ce1f76976fb944099e48575965b4a056171f1fac1531d791139f0aeaff5e01b211
SHA512 (tg_owt-10d5f4b.tar.gz) =
6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711
diff --git a/tg_owt.spec b/tg_owt.spec
index 09c40f4..1675f72 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -8,38 +8,29 @@
%global commit1 ad890067f661dc747a975bc55ba3767fe30d4452
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+# Git revision of crc32c...
+%global commit2 21fc8ef30415a635e7351ffa0e5d5367943d4a94
+%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+
Name: tg_owt
Version: 0
Release: 21.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
+# abseil-cpp - ASL 2.0
# libsrtp - BSD
# libyuv - BSD
# openh264 - BSD
# pffft - BSD
# rnnoise - BSD
-License: BSD
+License: BSD and ASL 2.0
Summary: WebRTC library for the Telegram messenger
URL: https://github.com/desktop-app/%{name}
Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
-Source1:
https://chromium.googlesource.com/libyuv/libyuv/+archive/%{commit1}.tar.g...
-
-BuildRequires: pkgconfig(absl_algorithm_container)
-BuildRequires: pkgconfig(absl_bind_front)
-BuildRequires: pkgconfig(absl_config)
-BuildRequires: pkgconfig(absl_core_headers)
-BuildRequires: pkgconfig(absl_flags)
-BuildRequires: pkgconfig(absl_flags_parse)
-BuildRequires: pkgconfig(absl_flags_usage)
-BuildRequires: pkgconfig(absl_flat_hash_map)
-BuildRequires: pkgconfig(absl_inlined_vector)
-BuildRequires: pkgconfig(absl_memory)
-BuildRequires: pkgconfig(absl_optional)
-BuildRequires: pkgconfig(absl_strings)
-BuildRequires: pkgconfig(absl_synchronization)
-BuildRequires: pkgconfig(absl_type_traits)
-BuildRequires: pkgconfig(absl_variant)
+Source1:
https://gitlab.com/chromiumsrc/libyuv/-/archive/%{commit1}/libyuv-%{short...
+Source2:
https://github.com/google/crc32c/archive/%{commit2}/crc32c-%{shortcommit2...
+
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(gbm)
@@ -84,6 +75,8 @@ Special fork of the OpenWebRTC library for the Telegram messenger.
%package devel
Summary: Development files for %{name}
Provides: %{name}-static%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: bundled(abseil-cpp) = 0~git39f46fa
+Provides: bundled(crc32c) = 1.1.0~git%{shortcommit2}
Provides: bundled(base64) = 0~git
Provides: bundled(fft) = 0~git
Provides: bundled(g711) = 1.1~git
@@ -97,21 +90,6 @@ Provides: bundled(portaudio) = 0~git
Provides: bundled(rnnoise) = 0~git91ef40
Provides: bundled(sigslot) = 0~git
Provides: bundled(spl_sqrt_floor) = 0~git
-Requires: pkgconfig(absl_algorithm_container)
-Requires: pkgconfig(absl_bind_front)
-Requires: pkgconfig(absl_config)
-Requires: pkgconfig(absl_core_headers)
-Requires: pkgconfig(absl_flags)
-Requires: pkgconfig(absl_flags_parse)
-Requires: pkgconfig(absl_flags_usage)
-Requires: pkgconfig(absl_flat_hash_map)
-Requires: pkgconfig(absl_inlined_vector)
-Requires: pkgconfig(absl_memory)
-Requires: pkgconfig(absl_optional)
-Requires: pkgconfig(absl_strings)
-Requires: pkgconfig(absl_synchronization)
-Requires: pkgconfig(absl_type_traits)
-Requires: pkgconfig(absl_variant)
Requires: pkgconfig(alsa)
Requires: pkgconfig(epoxy)
Requires: pkgconfig(gbm)
@@ -141,9 +119,14 @@ Requires: pkgconfig(xtst)
%prep
%autosetup -n %{name}-%{commit0} -p1
-tar -xf %{SOURCE1} -C src/third_party/libyuv
+tar -xf %{SOURCE1} -C src/third_party/libyuv --strip=1
+tar -xf %{SOURCE2} -C src/third_party/src/third_party/crc32c/src --strip=1
mkdir legal
+cp -f -p src/third_party/abseil-cpp/LICENSE legal/LICENSE.abseil-cpp
+cp -f -p src/third_party/abseil-cpp/README.chromium legal/README.abseil-cpp
+cp -f -p src/third_party/crc32c/src/LICENSE legal/LICENSE.crc32c
+cp -f -p src/third_party/crc32c/src/README.md legal/README.crc32c
cp -f -p src/third_party/libsrtp/LICENSE legal/LICENSE.libsrtp
cp -f -p src/third_party/libsrtp/README.chromium legal/README.libsrtp
cp -f -p src/third_party/libyuv/LICENSE legal/LICENSE.libyuv