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 A7005139360 for ; Fri, 13 Aug 2021 23:30:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD0C4E09B1; Fri, 13 Aug 2021 23:30:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C4E1CE09B1 for ; Fri, 13 Aug 2021 23:30:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4D61D342B02 for ; Fri, 13 Aug 2021 23:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFA967B2 for ; Fri, 13 Aug 2021 23:30:07 +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: <1628897390.1e74d5871b7aff2cd35b2fce381aa65b7df39fac.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild X-VCS-Directories: net-im/telegram-desktop/files/ net-im/telegram-desktop/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 1e74d5871b7aff2cd35b2fce381aa65b7df39fac X-VCS-Branch: master Date: Fri, 13 Aug 2021 23:30:07 +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: 42b139aa-c31b-42ec-ad9f-afb2e53622af X-Archives-Hash: 0b81ab9a2c38a7635f321e5f734a2f4c commit: 1e74d5871b7aff2cd35b2fce381aa65b7df39fac Author: Esteve Varela Colominas gmail com> AuthorDate: Fri Aug 13 07:41:55 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Aug 13 23:29:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e74d587 net-im/telegram-desktop: Fix building with tg_owt[-screencast] Removed a patch from tg_owt forgetting it actually refused to build without. Upstream's current solution is a patch in telegram-desktop itself. Closes: https://bugs.gentoo.org/807907 Thanks-to: Teun Blok msn.com> Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21974 Signed-off-by: Georgy Yakovlev gentoo.org> ...desktop-2.8.11-fix-build-without-pipewire.patch | 26 ++++++++++++++++++++++ .../telegram-desktop-2.8.11-r2.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch new file mode 100644 index 00000000000..ecfc63abeb5 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch @@ -0,0 +1,26 @@ +Fix build without pipewire + +set_allow_pipewire isn't available if WEBRTC_USE_PIPEWIRE isn't set + +--- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp ++++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp +@@ -286,7 +286,7 @@ + options.set_allow_use_magnification_api(false); + #elif defined WEBRTC_MAC + options.set_allow_iosurface(true); +-#elif defined WEBRTC_LINUX ++#elif defined WEBRTC_USE_PIPEWIRE + options.set_allow_pipewire(true); + #endif // WEBRTC_WIN || WEBRTC_MAC + +--- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp ++++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp +@@ -33,7 +33,7 @@ + result.set_allow_use_magnification_api(false); + #elif defined WEBRTC_MAC + result.set_allow_iosurface(type == DesktopCaptureType::Screen); +-#elif defined WEBRTC_LINUX ++#elif defined WEBRTC_USE_PIPEWIRE + result.set_allow_pipewire(true); + #endif // WEBRTC_WIN || WEBRTC_MAC + result.set_detect_updated_region(true); diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild index becc983ec4b..940c5b1aed2 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild @@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" # Already upstream "${FILESDIR}/tdesktop-2.8.11-load-gtk-with-qlibrary.patch" + "${FILESDIR}/tdesktop-2.8.11-fix-build-without-pipewire.patch" ) pkg_pretend() {