commit 3b6b8eb0b1712c279c62034b6e9cf2d7f5984d98
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Feb 1 17:32:17 2022 +0100
Updated to the latest Git snapshot.
Switched to packaged version of libvpx.
Switched to packaged version of usrsctp.
.gitignore | 1 +
sources | 3 +--
tg_owt.spec | 50 +++++++++++++++++++++++---------------------------
3 files changed, 25 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 294c9fa..a890218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/libyuv-639dd4e.tar.gz
/tg_owt-d578c76.tar.gz
/tg_owt-d5c3d43.tar.gz
+/tg_owt-25c8637.tar.gz
diff --git a/sources b/sources
index 5d43b3d..320055f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (libvpx-5b63f0f.tar.gz) =
f5f5cf02d72b04345600c5c83bc91e4fb220ef324f72686da2aaecbc3c636ab2e2ccf296619fc91a3b7d5dc5e01949817285de13e753c4119486392d987ee937
SHA512 (libyuv-ad89006.tar.gz) =
0d5b1afeab9d45a3ccfaf9f184e26218c4caccf1d829cbe0ec8522241a5b0b60209754c082086911d2e866ab94776c64c0c1f9acdeac4b1a25fc447053f090ec
-SHA512 (tg_owt-d5c3d43.tar.gz) =
7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
+SHA512 (tg_owt-25c8637.tar.gz) =
d3ac4c9a43fe401fc050a218c2d6626b39907326b256e85e532120ba469308de62522763fd1fcab1283c83bf9036be06dacce249e9dd4529017fcba6d39bce41
diff --git a/tg_owt.spec b/tg_owt.spec
index 3fc3cdb..0d00c7b 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -1,43 +1,39 @@
%undefine __cmake_in_source_build
%global debug_package %{nil}
-%global commit0 d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589
+%global commit0 25c8637f5975db830cc5d74477641a8b609e248d
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date 20211207
-
-# Git revision of libvpx...
-%global commit1 5b63f0f821e94f8072eb483014cfc33b05978bb9
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+%global date 20220201
# Git revision of libyuv...
-%global commit2 ad890067f661dc747a975bc55ba3767fe30d4452
-%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+%global commit1 ad890067f661dc747a975bc55ba3767fe30d4452
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
Name: tg_owt
Version: 0
-Release: 15.%{date}git%{shortcommit0}%{?dist}
+Release: 16.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
# abseil-cpp - ASL 2.0
# libsrtp - BSD
-# libwebm - BSD
# libyuv - BSD
# openh264 - BSD
# pffft - BSD
# rnnoise - BSD
-# usrsctp - 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/webm/libvpx/+archive/%{commit1}.tar.gz#...
-Source2:
https://chromium.googlesource.com/libyuv/libyuv/+archive/%{commit2}.tar.g...
+Source1:
https://chromium.googlesource.com/libyuv/libyuv/+archive/%{commit1}.tar.g...
BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(epoxy)
+BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpulse)
@@ -45,6 +41,8 @@ BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(usrsctp)
+BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xdamage)
@@ -75,9 +73,7 @@ Provides: bundled(fft) = 0~git
Provides: bundled(g711) = 1.1~git
Provides: bundled(g722) = 1.14~git
Provides: bundled(libsrtp) = 2.2.0~git94ac00d
-Provides: bundled(libvpx) = 1.8.2~git%{shortcommit1}
-Provides: bundled(libwebm) = 0~git37d9b86
-Provides: bundled(libyuv) = 1767~git%{shortcommit2}
+Provides: bundled(libyuv) = 1767~git%{shortcommit1}
Provides: bundled(ooura) = 0~git
Provides: bundled(openh264) = 1.10.0~git6f26bce
Provides: bundled(pffft) = 0~git483453d
@@ -85,11 +81,13 @@ Provides: bundled(portaudio) = 0~git
Provides: bundled(rnnoise) = 0~git91ef40
Provides: bundled(sigslot) = 0~git
Provides: bundled(spl_sqrt_floor) = 0~git
-Provides: bundled(usrsctp) = 0.9.3.0~gitbee946a
Requires: pkgconfig(alsa)
+Requires: pkgconfig(epoxy)
+Requires: pkgconfig(gbm)
Requires: pkgconfig(libavcodec)
Requires: pkgconfig(libavformat)
Requires: pkgconfig(libavutil)
+Requires: pkgconfig(libdrm)
Requires: pkgconfig(libjpeg)
Requires: pkgconfig(libpipewire-0.3)
Requires: pkgconfig(libpulse)
@@ -97,6 +95,8 @@ Requires: pkgconfig(libswresample)
Requires: pkgconfig(libswscale)
Requires: pkgconfig(openssl)
Requires: pkgconfig(opus)
+Requires: pkgconfig(usrsctp)
+Requires: pkgconfig(vpx)
Requires: pkgconfig(x11)
Requires: pkgconfig(xcomposite)
Requires: pkgconfig(xdamage)
@@ -111,17 +111,13 @@ Requires: pkgconfig(xtst)
%prep
%autosetup -n %{name}-%{commit0} -p1
-tar -xf %{SOURCE1} -C src/third_party/libvpx/source/libvpx
-tar -xf %{SOURCE2} -C src/third_party/libyuv
+tar -xf %{SOURCE1} -C src/third_party/libyuv
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/libsrtp/LICENSE legal/LICENSE.libsrtp
cp -f -p src/third_party/libsrtp/README.chromium legal/README.libsrtp
-cp -f -p src/third_party/libvpx/source/libvpx/LICENSE legal/LICENSE.libvpx
-cp -f -p src/third_party/libvpx/source/libvpx/PATENTS legal/PATENTS.libvpx
-cp -f -p src/third_party/libvpx/README.chromium legal/README.libvpx
cp -f -p src/third_party/libyuv/LICENSE legal/LICENSE.libyuv
cp -f -p src/third_party/libyuv/PATENTS legal/PATENTS.libyuv
cp -f -p src/third_party/libyuv/README.chromium legal/README.libyuv
@@ -131,11 +127,6 @@ cp -f -p src/third_party/pffft/LICENSE legal/LICENSE.pffft
cp -f -p src/third_party/pffft/README.chromium legal/README.pffft
cp -f -p src/third_party/rnnoise/COPYING legal/LICENSE.rnnoise
cp -f -p src/third_party/rnnoise/README.chromium legal/README.rnnoise
-cp -f -p src/third_party/usrsctp/LICENSE legal/LICENSE.usrsctp
-cp -f -p src/third_party/usrsctp/README.chromium legal/README.usrsctp
-cp -f -p src/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT
legal/LICENSE.libwebm
-cp -f -p src/third_party/libvpx/source/libvpx/third_party/libwebm/PATENTS.TXT
legal/PATENTS.libwebm
-cp -f -p src/third_party/libvpx/source/libvpx/third_party/libwebm/README.libvpx
legal/README.libwebm
cp -f -p src/common_audio/third_party/ooura/LICENSE legal/LICENSE.ooura
cp -f -p src/common_audio/third_party/ooura/README.chromium legal/README.ooura
cp -f -p src/common_audio/third_party/spl_sqrt_floor/LICENSE
legal/LICENSE.spl_sqrt_floor
@@ -175,6 +166,11 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium
legal/README.sigslot
%{_libdir}/lib%{name}.a
%changelog
+* Tue Feb 01 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-16.20220201git25c8637
+- Updated to latest Git snapshot.
+- Switched to packaged version of libvpx.
+- Switched to packaged version of usrsctp.
+
* Thu Dec 09 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-15.20211207gitd5c3d43
- Updated to latest Git snapshot.
- Build with OpenSSL 3.0 on Fedora 36+.