[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/
Date: Thu, 29 Oct 2020 07:58:25 +0000 (UTC)	[thread overview]
Message-ID: <1603958162.7d6638241729057c5f0739fe4fc13539d93736eb.gyakovlev@gentoo> (raw)

commit:     7d6638241729057c5f0739fe4fc13539d93736eb
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 07:31:38 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 07:56:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d663824

net-im/telegram-desktop: remove alsa,webrtc flags

alsa is now required unconditionally due to webrtc
pulse now should work with apulse[sdk] or pulsaudio
webrtc is impossible to disable, remove the flag.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-im/telegram-desktop/metadata.xml               |  1 -
 .../telegram-desktop/telegram-desktop-2.4.4.ebuild | 29 ++++++++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 4e1022a426d..f7ab5b26ef9 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
 		<flag name="lto">Enable Link Time Optimization (LTO / IPO)</flag>
-		<flag name="webrtc">WebRTC based video call support</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
index d5937adb078..c95a2185c2e 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
@@ -14,15 +14,13 @@ TG_OWT_COMMIT="c73a4718cbff7048373a63db32068482e5fd11ef"
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz
-	webrtc? (
-		https://github.com/desktop-app/tg_owt/archive/c73a4718cbff7048373a63db32068482e5fd11ef.tar.gz -> tg_owt-${TG_OWT_COMMIT}.tar.gz
-	)
+	https://github.com/desktop-app/tg_owt/archive/c73a4718cbff7048373a63db32068482e5fd11ef.tar.gz -> tg_owt-${TG_OWT_COMMIT}.tar.gz
 "
 
-LICENSE="GPL-3-with-openssl-exception LGPL-2+ webrtc? ( BSD )"
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +gtk +hunspell libressl lto +pulseaudio +spell +webrtc +X"
+IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell +X"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
@@ -38,11 +36,13 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png,X(-)?]
 	media-fonts/open-sans
+	media-libs/alsa-lib
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20200818[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20200818
+	media-libs/openal[alsa]
 	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	media-video/ffmpeg:=[alsa,opus]
 	sys-libs/zlib[minizip]
 	virtual/libiconv
 	x11-libs/libxcb:=
@@ -58,8 +58,8 @@ RDEPEND="
 		x11-libs/libX11
 	)
 	hunspell? ( >=app-text/hunspell-1.7:= )
+	!pulseaudio? ( media-sound/apulse[sdk] )
 	pulseaudio? ( media-sound/pulseaudio )
-	webrtc? ( media-libs/libjpeg-turbo:= )
 "
 
 DEPEND="
@@ -72,15 +72,13 @@ DEPEND="
 BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
-	webrtc? ( amd64? ( dev-lang/yasm ) )
+	amd64? ( dev-lang/yasm )
 "
 
 REQUIRED_USE="
-	|| ( alsa pulseaudio )
 	spell? (
 		^^ ( enchant hunspell )
 	)
-	webrtc? ( alsa pulseaudio )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -97,7 +95,7 @@ pkg_pretend() {
 
 src_unpack() {
 	default
-	use webrtc && mv -v "${WORKDIR}/tg_owt-${TG_OWT_COMMIT}" "${WORKDIR}/tg_owt"
+	mv -v "${WORKDIR}/tg_owt-${TG_OWT_COMMIT}" "${WORKDIR}/tg_owt" || die
 }
 
 build_tg_owt() {
@@ -124,7 +122,7 @@ src_configure() {
 	append-cxxflags "${mycxxflags[@]}"
 
 	# we have to build tg_owt now before running telegram's cmake
-	use webrtc && build_tg_owt
+	build_tg_owt
 
 	# TODO: unbundle header-only libs, ofc telegram uses git versions...
 	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
@@ -141,10 +139,9 @@ src_configure() {
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
 		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)" # requires pulse AND alsa
 		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
 		$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '')
-		$(usex webrtc "-Dtg_owt_DIR=${WORKDIR}/tg_owt_build" '')
+		-Dtg_owt_DIR="${WORKDIR}/tg_owt_build"
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then

next             reply	other threads:[~2020-10-29  7:58 UTC|newest]

Thread overview: 228+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-29  7:58 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-09 11:40 [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/ Yixun Lan
2025-04-08 13:37 Yixun Lan
2025-04-02  9:49 Yixun Lan
2025-03-27 11:03 Sam James
2025-03-19 22:01 Yixun Lan
2025-03-19  6:40 Yixun Lan
2025-03-13 11:08 Yixun Lan
2025-03-12 12:01 Yixun Lan
2025-02-20 17:17 Sam James
2025-02-03 23:39 Yixun Lan
2025-01-07 19:52 Sam James
2025-01-06  2:05 Yixun Lan
2025-01-03 17:22 Sam James
2025-01-03  1:17 Yixun Lan
2024-12-11  6:58 WANG Xuerui
2024-12-11  6:58 WANG Xuerui
2024-12-10  8:02 Yixun Lan
2024-12-10  8:02 Yixun Lan
2024-11-30  2:08 Yixun Lan
2024-11-02 10:35 Yixun Lan
2024-11-02  8:30 WANG Xuerui
2024-10-23 10:49 Yixun Lan
2024-10-17  0:30 Yixun Lan
2024-10-11  0:18 Yixun Lan
2024-10-11  0:07 Yixun Lan
2024-10-07  8:31 Yixun Lan
2024-09-18  7:54 Yixun Lan
2024-09-11 15:29 Yixun Lan
2024-09-11 15:01 Arthur Zamarin
2024-09-07 23:36 Yixun Lan
2024-09-04  2:32 Yixun Lan
2024-07-06 12:17 Yixun Lan
2024-07-05 21:15 Jakov Smolić
2024-06-13  7:00 Yixun Lan
2024-05-30  0:22 Yixun Lan
2024-05-14  2:08 Yixun Lan
2024-05-14  2:08 Yixun Lan
2024-05-04  9:19 Yixun Lan
2024-05-04  9:19 Yixun Lan
2024-04-16 22:38 Yixun Lan
2024-04-16 22:38 Yixun Lan
2024-04-10 23:34 Yixun Lan
2024-04-08 23:17 Yixun Lan
2024-04-08 23:13 Yixun Lan
2024-04-08 23:13 Yixun Lan
2024-04-06 12:53 Yixun Lan
2024-03-14  2:38 Yixun Lan
2024-03-14  2:38 Yixun Lan
2024-03-14  2:38 Yixun Lan
2024-03-05 23:38 Yixun Lan
2024-03-05 23:38 Yixun Lan
2024-03-03 22:12 Sam James
2024-02-25  4:27 Yixun Lan
2024-02-25  4:27 Yixun Lan
2024-02-12  6:33 Yixun Lan
2024-02-12  6:33 Yixun Lan
2024-01-31  9:04 Yixun Lan
2024-01-24  8:35 Michał Górny
2024-01-20  0:02 Yixun Lan
2024-01-20  0:02 Yixun Lan
2024-01-15  3:32 Ionen Wolkens
2024-01-14 20:43 Sam James
2024-01-02 12:03 Yixun Lan
2024-01-02  6:06 WANG Xuerui
2023-12-28 13:58 Yixun Lan
2023-12-11 13:25 Yixun Lan
2023-12-11 13:25 Yixun Lan
2023-11-14 11:16 Yixun Lan
2023-11-11  0:18 Yixun Lan
2023-11-07  8:41 Yixun Lan
2023-11-04 23:01 Yixun Lan
2023-10-31  1:07 Yixun Lan
2023-10-19 21:15 Yixun Lan
2023-10-10 21:41 Yixun Lan
2023-10-07 23:10 Yixun Lan
2023-10-07 22:26 Ionen Wolkens
2023-07-15 16:25 Sam James
2023-06-11  0:03 Yixun Lan
2023-05-18  7:12 Joonas Niilola
2023-05-16 17:07 Sam James
2023-05-07  7:22 Sam James
2023-05-07  7:22 Sam James
2023-04-28  8:20 Joonas Niilola
2023-04-17 20:16 Georgy Yakovlev
2023-03-30 17:57 Arthur Zamarin
2023-03-15  5:05 Sam James
2023-03-15  5:05 Sam James
2023-02-22 23:03 Georgy Yakovlev
2023-02-01 19:27 Andreas Sturmlechner
2023-01-22 23:36 Georgy Yakovlev
2023-01-21 16:53 Sam James
2022-12-08 20:03 Georgy Yakovlev
2022-12-08 20:03 Georgy Yakovlev
2022-12-08 20:03 Georgy Yakovlev
2022-12-02 22:49 Georgy Yakovlev
2022-12-02 22:49 Georgy Yakovlev
2022-11-29 14:59 Georgy Yakovlev
2022-11-24  8:10 Joonas Niilola
2022-11-22 13:55 Joonas Niilola
2022-11-22 13:55 Joonas Niilola
2022-11-22 13:55 Joonas Niilola
2022-09-20 15:29 Matt Turner
2022-09-01  6:27 Joonas Niilola
2022-09-01  6:27 Joonas Niilola
2022-08-02 22:07 Georgy Yakovlev
2022-08-02 22:07 Georgy Yakovlev
2022-07-20  5:15 Sam James
2022-06-27  0:25 Ionen Wolkens
2022-04-26 21:49 Sam James
2022-03-20 20:40 Arthur Zamarin
2022-03-20 18:55 Arthur Zamarin
2022-02-28 10:08 Jakov Smolić
2022-02-16 19:43 Georgy Yakovlev
2022-02-07  6:37 Sam James
2022-02-07  6:32 Sam James
2022-01-10  8:38 Agostino Sarubbo
2022-01-07 17:01 Georgy Yakovlev
2022-01-06 23:47 Georgy Yakovlev
2022-01-06 23:47 Georgy Yakovlev
2022-01-06 23:47 Georgy Yakovlev
2021-12-10 21:31 Georgy Yakovlev
2021-11-16 10:08 Jakov Smolić
2021-11-16  4:34 Georgy Yakovlev
2021-11-16  4:34 Georgy Yakovlev
2021-11-16  4:34 Georgy Yakovlev
2021-11-05  1:48 Georgy Yakovlev
2021-11-01 20:34 Georgy Yakovlev
2021-10-14 13:39 Agostino Sarubbo
2021-10-13 16:34 Georgy Yakovlev
2021-10-10 18:57 Georgy Yakovlev
2021-09-24 17:33 Georgy Yakovlev
2021-09-12 23:00 Sam James
2021-09-05  2:18 Georgy Yakovlev
2021-09-01 16:32 Georgy Yakovlev
2021-08-12 17:56 Georgy Yakovlev
2021-08-12 17:56 Georgy Yakovlev
2021-08-04  8:54 Georgy Yakovlev
2021-08-04  8:31 Georgy Yakovlev
2021-08-04  8:31 Georgy Yakovlev
2021-08-04  8:31 Georgy Yakovlev
2021-08-04  6:39 Agostino Sarubbo
2021-07-17  0:06 Georgy Yakovlev
2021-06-28  8:38 Georgy Yakovlev
2021-06-28  8:38 Georgy Yakovlev
2021-06-12  1:18 Sam James
2021-06-04 18:45 Georgy Yakovlev
2021-05-01 18:07 Sam James
2021-04-22 12:08 Sam James
2021-03-26 21:30 Georgy Yakovlev
2021-03-26  0:04 Sam James
2021-03-25 19:31 Georgy Yakovlev
2021-02-28 20:26 Georgy Yakovlev
2020-11-24  5:53 Georgy Yakovlev
2020-11-10 21:20 Georgy Yakovlev
2020-11-10 21:20 Georgy Yakovlev
2020-11-10 21:20 Georgy Yakovlev
2020-11-10 21:20 Georgy Yakovlev
2020-11-05 17:54 Georgy Yakovlev
2020-11-03  9:07 Georgy Yakovlev
2020-11-03  9:07 Georgy Yakovlev
2020-11-03  6:27 Georgy Yakovlev
2020-11-03  6:09 Georgy Yakovlev
2020-11-02 19:14 Georgy Yakovlev
2020-11-02 19:14 Georgy Yakovlev
2020-11-01  5:30 Sam James
2020-10-31 21:35 Georgy Yakovlev
2020-10-31 21:30 Georgy Yakovlev
2020-10-31 21:25 Georgy Yakovlev
2020-10-31  0:40 Georgy Yakovlev
2020-10-29  8:38 Georgy Yakovlev
2020-10-29  7:58 Georgy Yakovlev
2020-10-27  8:17 Georgy Yakovlev
2020-10-27  0:02 Georgy Yakovlev
2020-10-26 21:13 Georgy Yakovlev
2020-10-26  8:03 Georgy Yakovlev
2020-07-27  2:46 Georgy Yakovlev
2020-07-26 20:18 Georgy Yakovlev
2020-07-25  0:16 Georgy Yakovlev
2020-07-17 15:05 Agostino Sarubbo
2020-07-08 21:48 Georgy Yakovlev
2020-07-08 21:48 Georgy Yakovlev
2020-07-02 22:02 Georgy Yakovlev
2020-07-01 17:02 Georgy Yakovlev
2020-06-28  1:29 Georgy Yakovlev
2020-06-18  7:04 Georgy Yakovlev
2020-06-14 20:30 Georgy Yakovlev
2020-06-14 20:30 Georgy Yakovlev
2020-06-14 20:30 Georgy Yakovlev
2020-06-08 17:49 Georgy Yakovlev
2020-06-05 22:07 Georgy Yakovlev
2020-06-05  9:25 Georgy Yakovlev
2020-06-04  1:56 Georgy Yakovlev
2020-06-04  1:56 Georgy Yakovlev
2020-05-28  6:14 Georgy Yakovlev
2020-05-25  7:04 Georgy Yakovlev
2020-05-25  7:04 Georgy Yakovlev
2020-05-14 16:52 Georgy Yakovlev
2020-05-14 13:22 Agostino Sarubbo
2020-05-14  4:23 Georgy Yakovlev
2020-05-09 20:45 Georgy Yakovlev
2020-05-09  5:12 Georgy Yakovlev
2020-05-05 21:13 Georgy Yakovlev
2020-05-02  0:43 Georgy Yakovlev
2020-04-21  8:52 Agostino Sarubbo
2020-04-20 17:59 Georgy Yakovlev
2020-04-20 17:59 Georgy Yakovlev
2020-03-31 12:51 Georgy Yakovlev
2020-03-28  0:56 Georgy Yakovlev
2020-03-14  4:19 Georgy Yakovlev
2020-03-14  4:19 Georgy Yakovlev
2020-02-24  7:29 Georgy Yakovlev
2020-02-24  7:29 Georgy Yakovlev
2020-02-22  7:26 Georgy Yakovlev
2020-02-19  7:59 Georgy Yakovlev
2020-02-14  7:31 Georgy Yakovlev
2020-02-12 22:42 Georgy Yakovlev
2020-02-12 10:47 Georgy Yakovlev
2020-02-12 10:47 Georgy Yakovlev
2020-02-12  5:25 Georgy Yakovlev
2020-02-11 19:02 Georgy Yakovlev
2020-02-10  2:13 Georgy Yakovlev
2020-02-09 23:15 Georgy Yakovlev
2020-02-07  8:10 Georgy Yakovlev
2020-02-02 19:35 Mart Raudsepp
2020-01-28 22:40 Georgy Yakovlev
2020-01-26  6:41 Georgy Yakovlev
2020-01-25 17:56 Stefan Strogin

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4e1022a426 dfblob:f7ab5b26ef dfblob:d5937adb07
dfblob:c95a2185c2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1603958162.7d6638241729057c5f0739fe4fc13539d93736eb.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox