From patchwork Mon Aug 14 01:53:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 52803 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2BCF827BBEA; Mon, 14 Aug 2023 02:54:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C37D27BBE2 for ; Mon, 14 Aug 2023 02:54:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVMmS-0006WO-FB; Sun, 13 Aug 2023 21:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVMmR-0006WG-6y for guix-patches@gnu.org; Sun, 13 Aug 2023 21:54:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVMmQ-0005iT-Vk for guix-patches@gnu.org; Sun, 13 Aug 2023 21:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVMmQ-0007AR-7i for guix-patches@gnu.org; Sun, 13 Aug 2023 21:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65278] [PATCH] gnu: webrtc-for-telegram-desktop: Update to commit 77c2121f7e6b8e694d6e908bbbe9be24214097da. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Aug 2023 01:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65278 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65278@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169197802927530 (code B ref -1); Mon, 14 Aug 2023 01:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Aug 2023 01:53:49 +0000 Received: from localhost ([127.0.0.1]:60486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVMmD-00079y-0d for submit@debbugs.gnu.org; Sun, 13 Aug 2023 21:53:49 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVMmB-00079h-4a for submit@debbugs.gnu.org; Sun, 13 Aug 2023 21:53:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVMm3-0006Tt-UA for guix-patches@gnu.org; Sun, 13 Aug 2023 21:53:40 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVMm2-0005eQ-1p for guix-patches@gnu.org; Sun, 13 Aug 2023 21:53:39 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 1A0483200708 for ; Sun, 13 Aug 2023 21:53:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 13 Aug 2023 21:53:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm2; t=1691978013; x=1692064413; bh=ks MgOgcjzRSjknrmPzF05OHzXXFrXrFHQknyJy6hIow=; b=tShvzvjUwFbWdezm51 7FNUl9WNx2eIZgsAvxynOxZJ0qUICTwsmP+qf/mIawtT4bZ94W6IwhnpLAHf7/ht 0odk6A5AluynvMwBHnVNX/qFCNtv9zT8P3vxvSFPiUdCJWguAXbCHzPSHMPYttQ2 fS9v3YxKJzr0FVh8xlrg0YBDhj3ANnbRnEqHdR6Nt024SmCTkKqxqFGHRsGAHYpJ cDx/b5VUyr73xRLit7dS2UIrHf/ztFvwoDRNL4YUH9FIeOTC1kea6Ii1eQbePrgx Aq4SUw930Fa2s5B2TaZksLHcZP9YG1qhMrO8Gj4jjGGWFQqsvxJj/p3I4w0Q7PEr uY0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1691978013; x=1692064413; bh=ksMgOgcjzRSjk nrmPzF05OHzXXFrXrFHQknyJy6hIow=; b=Pn4elvVocFty4SMm9S66qum09NMc1 3ot2Ir33LBCzthK3HJeelEtKPL/MA0sQ8XJypOGGoHRQyeGdDNKLiCQ9aRcX/MTD PB0qKUfCWPwU4ha7B9ojP6fINqSJWwdKoSiFyoQ+IrvSAvUGts99GY/6OEdPd7eB KEk3M/b1VXXj+8VmTdXuMQ/dwVsOlH03Oauos9rLAqB7KDSHRQHgvOVBVKBXE8sh mw8iEMIdpuZ+YvG2TxUHZD5Vdmi0w/EvkY8phMPSW+1hbdj5k8xw7+r28MVizgVF 56RjnNe+y7nszeOdcMOwUyO4N4T5UP6U5ZMgQv5GqvoL8IFs6drt3a+6g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedruddtfedghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnheptddtuddtjedvgedvteefieeiveelffetheffgfevueeiteelleevfedvudevje fgnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 13 Aug 2023 21:53:32 -0400 (EDT) From: dan Date: Mon, 14 Aug 2023 09:53:26 +0800 Message-ID: <20230814015327.30555-1-i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.25; envelope-from=i@dan.games; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This patch update webrtc-for-telegram-desktop, trying to fix an issue causing the voice call functionality malfunctioning. * gnu/packages/telegram.scm (libyuv-for-telegram-desktop): Update to commit 77c2121f7e6b8e694d6e908bbbe9be24214097da. * gnu/packages/telegram.scm (libsrtp-for-telegram-desktop): New variable. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to commit a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd. [origin]: keep libsrtp_config instead of libsrtp. [arguments]<#:phases>: copy libsrtp-for-telegram-desktop to src/third_party/libsrtp. --- gnu/packages/telegram.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) base-commit: e7b8edc74490ebd345ca3b518418a59d1d00abe2 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa5c303603..d95c97d375 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2023 Lu Hui +;;; Copyright © 2023 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,8 +84,8 @@ (define-module (gnu packages telegram) (define %telegram-version "4.8.1") (define libyuv-for-telegram-desktop - (let ((commit "00950840d1c9bcbb3eb6ebc5aac5793e71166c8b") - (revision "2212")) + (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") + (revision "2439")) (origin (method git-fetch) (uri (git-reference @@ -95,7 +96,18 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) + "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c"))))) + +(define libsrtp-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit (string-append "v" "2.5.0")))) + (file-name (git-file-name "libsrtp" "2.5.0")) + (sha256 + (base32 + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s")))) (define cmake-helpers-for-telegram-desktop (origin @@ -266,8 +278,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -283,14 +295,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("libsrtp_config" "rnnoise" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -312,9 +324,12 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$libsrtp-for-telegram-desktop + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17