From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36FF413835B for ; Thu, 29 Oct 2020 07:58:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FCAFE0982; Thu, 29 Oct 2020 07:58:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EB8AE0980 for ; Thu, 29 Oct 2020 07:58:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C07D6340A8E for ; Thu, 29 Oct 2020 07:58:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D39C3BF for ; Thu, 29 Oct 2020 07:58:25 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1603958162.7d6638241729057c5f0739fe4fc13539d93736eb.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/metadata.xml net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild X-VCS-Directories: net-im/telegram-desktop/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 7d6638241729057c5f0739fe4fc13539d93736eb X-VCS-Branch: master Date: Thu, 29 Oct 2020 07:58:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bee45d96-4b55-42be-b8fc-85d129b3e9be X-Archives-Hash: b791b3f2981e772b472fe1de774a1e51 commit: 7d6638241729057c5f0739fe4fc13539d93736eb Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Oct 29 07:31:38 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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 @@ Enable the app-text/aspell spell-checking backend Enable the app-text/hunspell spell-checking backend Enable Link Time Optimization (LTO / IPO) - WebRTC based video call support 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