From patchwork Sun Sep 11 10:11:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 5528 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 CA3A027BBE9; Sun, 11 Sep 2022 11:12:13 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 013A427BBEA for ; Sun, 11 Sep 2022 11:12:13 +0100 (BST) Received: from localhost ([::1]:58360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJwi-0005n7-5G for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJwY-0005mr-N3 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJwY-0007XY-Cq for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJwY-0007R0-7v for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166289110128537 (code B ref 57675); Sun, 11 Sep 2022 10:12:02 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:11:41 +0000 Received: from localhost ([127.0.0.1]:40772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwC-0007QD-Sa for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:11:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwA-0007Py-VB for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:11:39 -0400 Date: Sun, 11 Sep 2022 18:11:16 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yi1RRIk4jsLhjGkg6nX4zb2F+tXlNnLxxXGvgzhxPYs=; b=wD1VnSxg0/dRYCuWEjAvicgOTGIWSXDjg6tIOymETBt3mEwz+uhwDBlb4d8aZ3KLq3i5zs YfMgRhquo3/YBmXjwH8GGVwBx8p8OvTuQrjXlvi3jgb7VWW9I82Plj/rCwS4ydZt2/Wsg8 Q1Zr2GlD+U8rmbVUAjXUGsrUtzANbPT7Afd1Pqy+c0pkoaCPRqvqx/KAMn3TTEMw6AgW40 Q2liT7367VxVJ2IHs9MHe5NFp017QoH4iVgc3FCQEL2wl/m/oOR3ivdZxGdoWl5+3tA/fz 0si7gEaqM/MXvkcsASkTCbbF3YXyqVPeDr8fU4PTRkGrghPCSPqriyK8YQ3XOg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Simplify inputs. --- gnu/packages/telegram.scm | 84 +++++++++++---------------------------- 1 file changed, 23 insertions(+), 61 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4976acbc0c..9bef94788b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -85,11 +85,12 @@ (define-public webrtc-for-telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/tg_owt.git") - (commit commit))) + (commit commit) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -99,79 +100,40 @@ (define-public webrtc-for-telegram-desktop '( ;; Custom forks which are incompatible with the ones in Guix. "abseil-cpp" "libsrtp" "openh264" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" + "pffft" "usrsctp" "libyuv" ;; Has cmake support files for libvpx input. "libvpx"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target #:configure-flags (list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((libvpx-from (assoc-ref inputs "libvpx")) - (libyuv-from (assoc-ref inputs "libyuv")) - (libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + "-DCMAKE_CXX_FLAGS=-fPIC"))) (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.")