From patchwork Wed Jul 26 18:54:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 52198 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 A1D0727BBE9; Wed, 26 Jul 2023 19:57:52 +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 6B8BE27BBE2 for ; Wed, 26 Jul 2023 19:57:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOjh3-0008VA-6u; Wed, 26 Jul 2023 14:57: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 1qOjh0-0008Un-Lq for guix-patches@gnu.org; Wed, 26 Jul 2023 14:57: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 1qOjh0-000286-E3 for guix-patches@gnu.org; Wed, 26 Jul 2023 14:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOjh0-0000gG-AJ for guix-patches@gnu.org; Wed, 26 Jul 2023 14:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v3] 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: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 18:57: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.16903977712560 (code B ref 64748); Wed, 26 Jul 2023 18:57:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 18:56:11 +0000 Received: from localhost ([127.0.0.1]:50073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjgA-0000fD-Il for submit@debbugs.gnu.org; Wed, 26 Jul 2023 14:56:10 -0400 Received: from mx0.riseup.net ([198.252.153.6]:54910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjg8-0000f0-JH for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 14:56:09 -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 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4RB35G6F5mz9tFB; Wed, 26 Jul 2023 18:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690397762; bh=ZImdSbPBDGjTnUrkoDVuK4L3MwaUzQX6J0UUZLPwXBo=; h=From:To:Cc:Subject:Date:From; b=aWp3LR4KRtYY/ncEMfA0xBjgF0lx2BIQ0RbJhfGhoYd+8fBWhjEZ9jsj67AOzLGCz zURa0mBZFCFLmkB9buYqQs+c8grcgQ0Bs8VLZ7ZztXp2nDmfmjT6un2FxFI9egCeYi Ctoa8ZdwaEQJ4xeY4cLnHji0H32yf+WQow2gWrFk= X-Riseup-User-ID: 5E2525FA60A46AC5DB24DA0C8F9CD9909CB89CE0FA7D642B39F9DDF13B4CC933 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4RB35F5dbqzJn7m; Wed, 26 Jul 2023 18:56:01 +0000 (UTC) From: Distopico Date: Wed, 26 Jul 2023 13:54:48 -0500 Message-ID: <20230726185551.1911-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 , Use sources from `libsrtp` instead of the submodule. gnu: libsrtp: Update to 2.5.0. see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit * gnu/packages/telephony.scm (libsrtp): Update to 2.5.0. --- use sources from existing `libsrtp` package, update it to the last version gnu/packages/telegram.scm | 17 +++++++++++------ gnu/packages/telephony.scm | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) 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 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index aa65c4eaad..dc0adc7334 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -456,7 +456,7 @@ (define-public sipwitch (define-public libsrtp (package (name "libsrtp") - (version "2.4.2") + (version "2.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -465,7 +465,7 @@ (define-public libsrtp (file-name (git-file-name name version)) (sha256 (base32 - "1gswpjm4jacfxmgglbf8hxi3yzsag4drk4q943p0wkmv21zj8l78")))) + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s")))) (native-inputs (list psmisc ;some tests require 'killall' procps))