From patchwork Thu Jul 20 23:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 51884 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 AC34827BBEA; Fri, 21 Jul 2023 00:30:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0482E27BBE2 for ; Fri, 21 Jul 2023 00:30:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMd65-0001IP-3S; Thu, 20 Jul 2023 19:30:13 -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 1qMd62-0001IG-8t for guix-patches@gnu.org; Thu, 20 Jul 2023 19:30:10 -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 1qMd61-0006Vg-TX for guix-patches@gnu.org; Thu, 20 Jul 2023 19:30:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMd5u-0007qi-Jj; Thu, 20 Jul 2023 19:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v2] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi, guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 23:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Distopico , rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi X-Debbugs-Original-Xcc: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168989574630084 (code B ref 64748); Thu, 20 Jul 2023 23:30:02 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 23:29:06 +0000 Received: from localhost ([127.0.0.1]:60190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMd4z-0007p9-FS for submit@debbugs.gnu.org; Thu, 20 Jul 2023 19:29:05 -0400 Received: from mx1.riseup.net ([198.252.153.129]:45840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMd4u-0007oc-M2 for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 19:29:03 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R6TQv0QxRzDqKr for <64748@debbugs.gnu.org>; Thu, 20 Jul 2023 23:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689895735; bh=deesPfLVJSS5JT77fAurOCVkj2CoSYLTx/ywesaaRgE=; h=From:To:Cc:Subject:Date:From; b=UAycH2TyRxMaGwQvNHOHoN2ZmeQckYn1BuVWUTKA+Wwe5FdBMBngMKcXcKpLLHB6Z p3oIGBUlu60Hm++D2IKYmMOCw8oPVf+PlJmDhgkuH+kPqCROrWF7PyC1qReRQFNxGa M0PePM29EBd4CIvEPYWPwgcF6BlNRGU01bp10ay4= X-Riseup-User-ID: EE551987009BDE17E3E2012C07CBA35773691132515D1BE3E385EF2AACF8CF7A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R6TQt2ZsDzJn1j; Thu, 20 Jul 2023 23:28:54 +0000 (UTC) From: Distopico Date: Thu, 20 Jul 2023 18:26:59 -0500 Message-ID: <20230720232843.17471-1-distopico@riseup.net> MIME-Version: 1.0 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 Fixes telegram-desktop call not working with openSSL 3 Add libsrtp-for-telegram-desktop because webrtc (tg_owt) now use `libsrtp` as submodule and in the code use code source directly from the submodule. see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit * gnu/packages/telegram.scm (libsrtp-for-telegram-desktop): Add libsrtp a566a9 revision commit --- Add more context about the change in the commit message gnu/packages/telegram.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) base-commit: 13cb9b302868b5a966a6ae177412c474084f4bf1 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..aeab249198 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,21 @@ (define libyuv-for-telegram-desktop (base32 "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) +(define libsrtp-for-telegram-desktop + (let ((commit "a566a9cfcd619e8327784aa7cff4a1276dc1e895") + (revision "1494")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit commit))) + (file-name (git-file-name + "libsrtp-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -265,8 +281,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") @@ -282,14 +298,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" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +327,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