unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Distopico <distopico@riseup.net>
To: 64748@debbugs.gnu.org
Cc: Distopico <distopico@riseup.net>,
	rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi
Subject: [bug#64748] [PATCH v2] gnu: webrtc-for-telegram-desktop: Update to a45d8b8
Date: Thu, 20 Jul 2023 18:26:59 -0500	[thread overview]
Message-ID: <20230720232843.17471-1-distopico@riseup.net> (raw)
In-Reply-To: <20230720171841.31901-1-distopico@riseup.net>

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(-)

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 <rg@raghavgururajan.name>
 ;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
+;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
 ;;;
 ;;; 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

base-commit: 13cb9b302868b5a966a6ae177412c474084f4bf1
-- 
2.41.0





  parent reply	other threads:[~2023-07-20 23:30 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-20 17:18 [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Distopico
2023-07-20 19:33 ` Saku Laesvuori via Guix-patches via
2023-07-20 20:21   ` Distopico
2023-07-20 21:06     ` Saku Laesvuori via Guix-patches via
2023-07-20 23:09       ` Distopico
2023-07-21  7:22         ` Saku Laesvuori via Guix-patches via
2023-07-22  6:36           ` Raghav Gururajan via Guix-patches via
2023-07-22  8:25             ` Saku Laesvuori via Guix-patches via
2023-07-24 17:07               ` Distopico
2023-07-24 20:17                 ` Raghav Gururajan via Guix-patches via
2023-07-26  7:24                   ` Saku Laesvuori via Guix-patches via
2023-07-26 18:54                     ` Distopico
2023-07-20 23:26 ` Distopico [this message]
2023-07-26 18:54 ` [bug#64748] [PATCH v3] " Distopico
2023-07-26 19:13   ` Saku Laesvuori via Guix-patches via
2023-07-26 19:22     ` Distopico
2023-07-26 19:21 ` [bug#64748] [PATCH v4] " Distopico
2023-07-26 20:09   ` Saku Laesvuori via Guix-patches via
2023-08-05  2:59     ` [bug#64748] [PATCH] " Distopico
2023-08-07  9:38       ` Hilton Chain via Guix-patches via
2023-08-07 12:26         ` Hilton Chain via Guix-patches via
2023-08-28 13:30 ` [bug#64748] [PATCH v6 0/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942 Hilton Chain via Guix-patches via
2023-08-28 13:31   ` [bug#64748] [PATCH v6 1/2] gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121 Hilton Chain via Guix-patches via
2023-08-28 13:31   ` [bug#64748] [PATCH v6 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942 Hilton Chain via Guix-patches via
2023-08-28 14:56 ` [bug#64748] [PATCH v7 0/2] " Hilton Chain via Guix-patches via
2023-08-28 15:00   ` [bug#64748] [PATCH v7 1/2] gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121 Hilton Chain via Guix-patches via
2023-08-28 15:00   ` [bug#64748] [PATCH v7 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942 Hilton Chain via Guix-patches via
2023-08-29 18:13     ` Distopico
2023-09-01  9:01       ` bug#64748: " Hilton Chain via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230720232843.17471-1-distopico@riseup.net \
    --to=distopico@riseup.net \
    --cc=64748@debbugs.gnu.org \
    --cc=hako@ultrarare.space \
    --cc=rg@raghavgururajan.name \
    --cc=saku@laesvuori.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).