Skip to content

Commit 538df70

Browse files
committed
net-im/telegram-desktop + media-libs/tg_owt: bump
1 parent 31cd720 commit 538df70

File tree

4 files changed

+60
-31
lines changed

4 files changed

+60
-31
lines changed

media-libs/tg_owt/Manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
DIST libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz 636836 BLAKE2B 496afcb80f67a8f76104e338408d4930475daadaf3f7cd2d673336aef938986876995e475a4d932424d7f99f6a339bad360f566d6fd3719316eaf8241970cf8d SHA512 930e665434e80e8a26d81b785563c915619b546a9a0af0455a14278816997074add852fae107027f4899415cb0ab47ffbf9492bea76b94b10f558b52098bbf92
22
DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B a72e1f75491785b272b0ded46368a67aadb643278e5764d16dcd902ab7e4139d8664ffbacd940f30113ce3171e0b0846fe0d6111ced17c5b08f326cd61b2af14 SHA512 ff9cfbb61a1361e959740d00c741dc6fbe71ca7c61770abc35f70aada402df3884d7d5992ae79472dfe3d7641154d4f13065593fee41bf8eae924e26cc654117
3-
DIST tg_owt-0_pre20250501.tar.gz 11722696 BLAKE2B f170f5ee0713c5221ea0d8177b3fdf7be8e0766538df3563b09158eef7d29179b6473e9c9924a605408d2694312f1b59a387f9b113731a803ca10fe5260a060a SHA512 e18ac5669e9124a2fa02490da68c11d7a9a2915bcf17b80d84da5f9c917c2d757475e94e6437875ffff13d2f6976d7ecbed274da5eca3d5b0e24c5b8ef2a6f6f
3+
DIST tg_owt-0_pre20250515.tar.gz 11719653 BLAKE2B 804a72d97b535efb6e6319e609763f2b641cb9962e59d4afd5ea5b98b9b49b5c32344341ca6096899e806c3a115f784975a442c758896913a162a2d96a77703a SHA512 3930584575a61b5c8aeea871be85d0700ccc32b852adb10293ab4267066cfcf6857ceea51b267507f5d23e088c331fb7b42ebccbb71ef9b8a2ecdba60c2ca2e3
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
https://github.com/desktop-app/tg_owt/pull/161
2+
From: Brahmajit Das <[email protected]>
3+
Date: Fri, 27 Jun 2025 04:01:15 +0530
4+
Subject: [PATCH 1/1] Fix building with GCC 16
5+
6+
Building with GCC 16 results in the follwing build error:
7+
8+
/var/tmp/portage/media-libs/tg_owt-0_pre20250515/work/tg_owt-232ec410502e773024e8d83cfae83a52203306c0/src/video/stats_counter.h:116:28: error: uint32_t has not been declared
9+
116 | void Set(int64_t sample, uint32_t stream_id);
10+
| ^~~~~~~~
11+
12+
Downstream-bug: https://bugs.gentoo.org/958600
13+
Signed-off-by: Brahmajit Das <[email protected]>
14+
--- a/src/video/stats_counter.h
15+
+++ b/src/video/stats_counter.h
16+
@@ -13,6 +13,7 @@
17+
18+
#include <memory>
19+
#include <string>
20+
+#include <cstdint>
21+
22+
namespace webrtc {
23+
24+
--
25+
2.50.0
26+

media-libs/tg_owt/tg_owt-0_pre20250501-r10.ebuild renamed to media-libs/tg_owt/tg_owt-0_pre20250515-r10.ebuild

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DESCRIPTION="WebRTC (video) library (fork) for Telegram clients"
99
HOMEPAGE="https://github.com/desktop-app/tg_owt"
1010

1111
if [[ ! "${PV}" = 9999* ]]; then
12-
TG_OWT_COMMIT="c4192e8e2e10ccb72704daa79fa108becfa57b01"
12+
TG_OWT_COMMIT="232ec410502e773024e8d83cfae83a52203306c0"
1313
LIBYUV_COMMIT="04821d1e7d60845525e8db55c7bcd41ef5be9406"
1414
LIBSRTP_COMMIT="a566a9cfcd619e8327784aa7cff4a1276dc1e895"
1515
# ABSL_COMMIT="d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
@@ -45,12 +45,12 @@ IUSE="pipewire screencast +X"
4545
REQUIRED_USE="screencast? ( pipewire )"
4646

4747
# Bundled libs:
48-
# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it
48+
# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
4949
# - libsrtp (project uses private APIs)
5050
# - pffft (no stable versioning, patched)
5151
# - rnnoise (private APIs)
5252
RDEPEND="
53-
>=dev-cpp/abseil-cpp-20240116.2:=
53+
>=dev-cpp/abseil-cpp-20240722.0:=
5454
dev-libs/openssl:=
5555
media-libs/libjpeg-turbo:=
5656
>=media-libs/libvpx-1.10.0:=
@@ -62,11 +62,6 @@ RDEPEND="
6262
media-video/pipewire:=
6363
)
6464
dev-libs/crc32c
65-
screencast? (
66-
media-libs/libglvnd[X=]
67-
media-libs/mesa
68-
x11-libs/libdrm
69-
)
7065
X? (
7166
x11-libs/libX11
7267
x11-libs/libXcomposite
@@ -80,7 +75,14 @@ RDEPEND="
8075
"
8176
# media-libs/libyuv
8277
# net-libs/libsrtp
83-
DEPEND="${RDEPEND}"
78+
DEPEND="
79+
${RDEPEND}
80+
screencast? (
81+
media-libs/libglvnd[X=]
82+
media-libs/mesa
83+
x11-libs/libdrm
84+
)
85+
"
8486
BDEPEND="
8587
virtual/pkgconfig
8688
X? ( x11-base/xorg-proto )
@@ -93,9 +95,10 @@ PATCHES=(
9395
"${FILESDIR}/${PN}-0_pre20221215-allow-disabling-pulseaudio.patch"
9496
"${FILESDIR}/${PN}-0_pre20221215-expose-set_allow_pipewire.patch"
9597
# "${FILESDIR}/fix-clang-emplace.patch"
96-
"${FILESDIR}/patch-cmake-absl-external.patch"
98+
# "${FILESDIR}/patch-cmake-absl-external.patch"
9799
# XXX: 👆comment for re-bundling absl
98-
"${FILESDIR}/patch-cmake-crc32c-external.patch"
100+
# "${FILESDIR}/patch-cmake-crc32c-external.patch"
101+
"${FILESDIR}/${PN}-gcc16-build-fix.patch"
99102
)
100103

101104
src_unpack() {
@@ -156,23 +159,23 @@ src_prepare() {
156159
# "${S}"/src/modules/video_coding/codecs/av1/dav1d_decoder.cc \
157160
# "${S}"/src/api/video/i444_buffer.cc || die
158161

159-
# FIXME: abseil-cpp related things (absl::string_view casts)
160-
# tg_owt uses (when bundled) git-almost-HEAD (april's commit) link in submodule
161-
# gentoo for now have only release january release.
162-
# Upgrading to july release (placing it in overlay) doesn't help with build failure (without this) either
163-
# Although, I guess it is related to this:
164-
# https://github.com/gentoo/gentoo/pull/32281#issuecomment-1676404974
165-
sed -r \
166-
-e "/[ ]*(group_name = )(kDefaultProbingScreenshareBweSettings)/s@@\1(std::string)\2@" \
167-
-i "${S}/src/rtc_base/experiments/alr_experiment.cc" || die
168-
sed -r \
169-
-e "/[ \t]*transaction_id.insert/s@(magic_cookie)@(std::string)\1@" \
170-
-i "${S}/src/api/transport/stun.cc" || die
171-
sed -r \
172-
-e "/(candidate_stats->candidate_type = )(candidate.type_name)/s@@\1(std::string)\2@" \
173-
-i "${S}/src/pc/rtc_stats_collector.cc" || die
174-
# append-cppflags -I"${S}/src/third_party/abseil-cpp"
175-
# XXX: 👆for re-bundling absl
162+
# # FIXME: abseil-cpp related things (absl::string_view casts)
163+
# # tg_owt uses (when bundled) git-almost-HEAD (april's commit) link in submodule
164+
# # gentoo for now have only release january release.
165+
# # Upgrading to july release (placing it in overlay) doesn't help with build failure (without this) either
166+
# # Although, I guess it is related to this:
167+
# # https://github.com/gentoo/gentoo/pull/32281#issuecomment-1676404974
168+
# sed -r \
169+
# -e "/[ ]*(group_name = )(kDefaultProbingScreenshareBweSettings)/s@@\1(std::string)\2@" \
170+
# -i "${S}/src/rtc_base/experiments/alr_experiment.cc" || die
171+
# sed -r \
172+
# -e "/[ \t]*transaction_id.insert/s@(magic_cookie)@(std::string)\1@" \
173+
# -i "${S}/src/api/transport/stun.cc" || die
174+
# sed -r \
175+
# -e "/(candidate_stats->candidate_type = )(candidate.type_name)/s@@\1(std::string)\2@" \
176+
# -i "${S}/src/pc/rtc_stats_collector.cc" || die
177+
# # append-cppflags -I"${S}/src/third_party/abseil-cpp"
178+
# # XXX: 👆for re-bundling absl
176179

177180
cmake_src_prepare
178181
}
@@ -217,8 +220,8 @@ src_install() {
217220
rtc_base/third_party/base64
218221
)
219222
for dir in "${headers[@]}"; do
220-
pushd "${S}/src/${dir}" > /dev/null || die
221-
find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
223+
pushd "${S}/src/${dir}" > /dev/null || die
224+
find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
222225
popd > /dev/null || die
223226
done
224227
}

net-im/telegram-desktop/telegram-desktop-5.15.4.ebuild renamed to net-im/telegram-desktop/telegram-desktop-5.16.3.ebuild

File renamed without changes.

0 commit comments

Comments
 (0)