From patchwork Sat Aug 5 02:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 52498 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 AE02827BBE9; Sat, 5 Aug 2023 04:01:38 +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=unavailable 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 0A46A27BBE2 for ; Sat, 5 Aug 2023 04:01:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qS7XN-0000dS-0G; Fri, 04 Aug 2023 23:01:05 -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 1qS7XK-0000cn-MS for guix-patches@gnu.org; Fri, 04 Aug 2023 23:01:02 -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 1qS7XK-0005oD-Dj for guix-patches@gnu.org; Fri, 04 Aug 2023 23:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qS7XK-0001Pt-2f for guix-patches@gnu.org; Fri, 04 Aug 2023 23:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 03:01: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: hako@ultrarare.space, Distopico , rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16912044305395 (code B ref 64748); Sat, 05 Aug 2023 03:01:02 +0000 Received: (at 64748) by debbugs.gnu.org; 5 Aug 2023 03:00:30 +0000 Received: from localhost ([127.0.0.1]:55169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7Wo-0001Ow-9w for submit@debbugs.gnu.org; Fri, 04 Aug 2023 23:00:30 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7Wl-0001Og-Oo for 64748@debbugs.gnu.org; Fri, 04 Aug 2023 23:00:29 -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 4RHnPy28KCzDqWn; Sat, 5 Aug 2023 03:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1691204422; bh=oWO5QlRLjGKPskFduIFSVJNkeztLGkw34AUvvNlZIdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DY2SGsEa3tgQZI303XMhw53/9u2TwJe8D8yav4MR+GCsWI4R3lHJMPjElN84/nOgB iGxLR8zhjFJlkT7M/FtrmvvKDjLxQeRq/dHTyxm480qUXBqdBPGzB8UWWloGl9tZj5 4WHI3s5x0ShCK4r56x3xaKkA0y5L17P/YeDGUl44= X-Riseup-User-ID: 636FE8028452C5219FDFDAC7719715298F80F8017DD35EE588599D3A0540D97C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4RHnPx11tnzJmsF; Sat, 5 Aug 2023 03:00:20 +0000 (UTC) From: Distopico Date: Fri, 4 Aug 2023 21:59:50 -0500 Message-ID: <20230805030015.28796-1-distopico@riseup.net> In-Reply-To: <20230726200916.rwmqmutv7ig5wmbp@X-kone> References: <20230726200916.rwmqmutv7ig5wmbp@X-kone> 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 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit Fixes `telegram-desktop` calls that are not working with OpenSSL 3. Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` package instead of the submodule in the `unpack-additional-sources` phase. see: https://github.com/telegramdesktop/tdesktop/issues/26108 --- * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit Fixes `telegram-desktop` calls that are not working with OpenSSL 3. Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` package instead of the submodule in the `unpack-additional-sources` phase. gnu/packages/telegram.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) base-commit: cf9904bcc8dd03e73675475bb4d8746dc434e415 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..0b32b49d14 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. ;;; @@ -265,8 +266,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 +283,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 +312,13 @@ (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 #$(package-source + libsrtp) + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17