Skip to content

Commit

Permalink
net-im/telegram-desktop: bump (+owt)
Browse files Browse the repository at this point in the history 
Signed-off-by: Vadim Misbakh-Soloviov <[email protected]>
  • Loading branch information
@msva
msva committed Sep 13, 2024
1 parent 3ff319d commit 522f086
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 240 deletions.
1 change: 0 additions & 1 deletion dev-cpp/abseil-cpp/Manifest
View file

This file was deleted.

68 changes: 0 additions & 68 deletions dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
View file

This file was deleted.

41 changes: 0 additions & 41 deletions dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch
View file

This file was deleted.

33 changes: 0 additions & 33 deletions dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch
View file

This file was deleted.

8 changes: 0 additions & 8 deletions dev-cpp/abseil-cpp/metadata.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion media-libs/tg_owt/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DIST libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz 636836 BLAKE2B 496afcb80f67a8f76104e338408d4930475daadaf3f7cd2d673336aef938986876995e475a4d932424d7f99f6a339bad360f566d6fd3719316eaf8241970cf8d SHA512 930e665434e80e8a26d81b785563c915619b546a9a0af0455a14278816997074add852fae107027f4899415cb0ab47ffbf9492bea76b94b10f558b52098bbf92
DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B a72e1f75491785b272b0ded46368a67aadb643278e5764d16dcd902ab7e4139d8664ffbacd940f30113ce3171e0b0846fe0d6111ced17c5b08f326cd61b2af14 SHA512 ff9cfbb61a1361e959740d00c741dc6fbe71ca7c61770abc35f70aada402df3884d7d5992ae79472dfe3d7641154d4f13065593fee41bf8eae924e26cc654117
DIST tg_owt-0_pre20240731.tar.gz 11723023 BLAKE2B 9bd8cc37ef0edcd7d39a0d6adea4951665f67ea9170cd516c098da5a73d0da5ad2e3d34c02899ddf6274cf2f44f66d2959f9d866fbb4b5810e076af6b121df71 SHA512 a122994deabeeb7232076a0bf1fd2ee6f5013baf28bd9b8894df170c507e2cd7445f56eece6ce52a52dbd21d2dcc4a0e194596ca0ec1ef07a632129e9c25ac00
DIST tg_owt-0_pre20240804.tar.gz 11722734 BLAKE2B 084bedf7ae20ba173244851e82749dba31ba1320d83d021876f12350ecaa2fb03e47857fdc8013c87df6cae6e9250ec78548b498f35a92d305a28070475f36e4 SHA512 12bc17f39569f8b09c793d0e65b82926325c8d9046454e385ef7c82ab26f4e39e8f44f7491c80be71743abd78565bca50023b62365437fc8e43fc23d1b64840b
30 changes: 0 additions & 30 deletions media-libs/tg_owt/files/135.patch
View file

This file was deleted.

42 changes: 23 additions & 19 deletions ...a-libs/tg_owt/tg_owt-0_pre20240731.ebuild → ...bs/tg_owt/tg_owt-0_pre20240804-r10.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,11 @@ inherit cmake flag-o-matic
DESCRIPTION="WebRTC (video) library (fork) for Telegram clients"
HOMEPAGE="https://github.com/desktop-app/tg_owt"

if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/desktop-app/${PN}"
inherit git-r3
EGIT_SUBMODULES=(
'*'
# -src/third_party/libyuv
-src/third_party/abseil-cpp
-src/third_party/crc32c/src
# -src/third_party/libsrtp # TODO: unbundle
)
else
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
TG_OWT_COMMIT="e9d103e2480e0983bf464debc371b049cdd83648"
if [[ ! "${PV}" = 9999* ]]; then
TG_OWT_COMMIT="dc17143230b5519f3c1a8da0079e00566bd4c5a8"
LIBYUV_COMMIT="04821d1e7d60845525e8db55c7bcd41ef5be9406"
LIBSRTP_COMMIT="a566a9cfcd619e8327784aa7cff4a1276dc1e895"
ABSL_COMMIT="d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
# ABSL_COMMIT="d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
# check https://github.com/desktop-app/tg_owt/tree/master/src periodically for srtp and others commits
SRC_URI="
https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
Expand All @@ -33,10 +22,24 @@ else
# https://github.com/abseil/abseil-cpp/archive/${ABSL_COMMIT}.tar.gz -> abseil-cpp-${ABSL_COMMIT}.tar.gz
S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
# Upstream libyuv: https://chromium.googlesource.com/libyuv/libyuv
else
EGIT_REPO_URI="https://github.com/desktop-app/${PN}"
inherit git-r3
EGIT_SUBMODULES=(
'*'
# -src/third_party/libyuv
-src/third_party/abseil-cpp
-src/third_party/crc32c/src
# -src/third_party/libsrtp # TODO: unbundle
)
fi
# 👇 kludge for eix
[[ "${PV}" = 9999* ]] && SLOT="0/${PV}"
[[ "${PV}" = 9999* ]] || SLOT="0/${PV##*pre}"
[[ "${PV}" = 9999* ]] || KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
# 👆 kludge for eix

LICENSE="BSD"
SLOT="0/${PV##*pre}"
IUSE="pipewire screencast +X"

REQUIRED_USE="screencast? ( pipewire )"
Expand All @@ -48,8 +51,6 @@ REQUIRED_USE="screencast? ( pipewire )"
# - rnnoise (private APIs)
RDEPEND="
>=dev-cpp/abseil-cpp-20240116.2:=
dev-libs/crc32c
dev-libs/libevent:=
dev-libs/openssl:=
media-libs/libjpeg-turbo:=
>=media-libs/libvpx-1.10.0:=
Expand All @@ -60,8 +61,9 @@ RDEPEND="
dev-libs/glib:2
media-video/pipewire:=
)
dev-libs/crc32c
screencast? (
media-libs/libglvnd
media-libs/libglvnd[X=]
media-libs/mesa
x11-libs/libdrm
)
Expand Down Expand Up @@ -94,7 +96,6 @@ PATCHES=(
"${FILESDIR}/patch-cmake-absl-external.patch"
# XXX: 👆comment for re-bundling absl
"${FILESDIR}/patch-cmake-crc32c-external.patch"
"${FILESDIR}/135.patch"
)

src_unpack() {
Expand Down Expand Up @@ -179,6 +180,9 @@ src_prepare() {
src_configure() {
append-flags '-fPIC'
filter-flags '-DDEBUG' # produces bugs in bundled forks of 3party code
# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
# See https://bugs.gentoo.org/754012
# EAPI 8 still wipes this flag.
append-cppflags '-DNDEBUG' # Telegram sets that in code
# (and I also forced that in ebuild to have the same behaviour),
# and segfaults on voice calls on mismatch
Expand Down
42 changes: 23 additions & 19 deletions media-libs/tg_owt/tg_owt-9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,11 @@ inherit cmake flag-o-matic
DESCRIPTION="WebRTC (video) library (fork) for Telegram clients"
HOMEPAGE="https://github.com/desktop-app/tg_owt"

if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/desktop-app/${PN}"
inherit git-r3
EGIT_SUBMODULES=(
'*'
# -src/third_party/libyuv
-src/third_party/abseil-cpp
-src/third_party/crc32c/src
# -src/third_party/libsrtp # TODO: unbundle
)
else
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
TG_OWT_COMMIT="e9d103e2480e0983bf464debc371b049cdd83648"
if [[ ! "${PV}" = 9999* ]]; then
TG_OWT_COMMIT="dc17143230b5519f3c1a8da0079e00566bd4c5a8"
LIBYUV_COMMIT="04821d1e7d60845525e8db55c7bcd41ef5be9406"
LIBSRTP_COMMIT="a566a9cfcd619e8327784aa7cff4a1276dc1e895"
ABSL_COMMIT="d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
# ABSL_COMMIT="d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
# check https://github.com/desktop-app/tg_owt/tree/master/src periodically for srtp and others commits
SRC_URI="
https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
Expand All @@ -33,10 +22,24 @@ else
# https://github.com/abseil/abseil-cpp/archive/${ABSL_COMMIT}.tar.gz -> abseil-cpp-${ABSL_COMMIT}.tar.gz
S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
# Upstream libyuv: https://chromium.googlesource.com/libyuv/libyuv
else
EGIT_REPO_URI="https://github.com/desktop-app/${PN}"
inherit git-r3
EGIT_SUBMODULES=(
'*'
# -src/third_party/libyuv
-src/third_party/abseil-cpp
-src/third_party/crc32c/src
# -src/third_party/libsrtp # TODO: unbundle
)
fi
# 👇 kludge for eix
[[ "${PV}" = 9999* ]] && SLOT="0/${PV}"
[[ "${PV}" = 9999* ]] || SLOT="0/${PV##*pre}"
[[ "${PV}" = 9999* ]] || KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
# 👆 kludge for eix

LICENSE="BSD"
SLOT="0/${PV##*pre}"
IUSE="pipewire screencast +X"

REQUIRED_USE="screencast? ( pipewire )"
Expand All @@ -48,8 +51,6 @@ REQUIRED_USE="screencast? ( pipewire )"
# - rnnoise (private APIs)
RDEPEND="
>=dev-cpp/abseil-cpp-20240116.2:=
dev-libs/crc32c
dev-libs/libevent:=
dev-libs/openssl:=
media-libs/libjpeg-turbo:=
>=media-libs/libvpx-1.10.0:=
Expand All @@ -60,8 +61,9 @@ RDEPEND="
dev-libs/glib:2
media-video/pipewire:=
)
dev-libs/crc32c
screencast? (
media-libs/libglvnd
media-libs/libglvnd[X=]
media-libs/mesa
x11-libs/libdrm
)
Expand Down Expand Up @@ -94,7 +96,6 @@ PATCHES=(
"${FILESDIR}/patch-cmake-absl-external.patch"
# XXX: 👆comment for re-bundling absl
"${FILESDIR}/patch-cmake-crc32c-external.patch"
"${FILESDIR}/135.patch"
)

src_unpack() {
Expand Down Expand Up @@ -179,6 +180,9 @@ src_prepare() {
src_configure() {
append-flags '-fPIC'
filter-flags '-DDEBUG' # produces bugs in bundled forks of 3party code
# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
# See https://bugs.gentoo.org/754012
# EAPI 8 still wipes this flag.
append-cppflags '-DNDEBUG' # Telegram sets that in code
# (and I also forced that in ebuild to have the same behaviour),
# and segfaults on voice calls on mismatch
Expand Down
Loading

0 comments on commit 522f086

Please sign in to comment.