From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eKlsCHz+KGPYIgEAbAwnHQ (envelope-from ) for ; Tue, 20 Sep 2022 01:42:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WOKaB3z+KGMbdQAAG6o9tA (envelope-from ) for ; Tue, 20 Sep 2022 01:42:52 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AAF5F1380D for ; Tue, 20 Sep 2022 01:42:51 +0200 (CEST) Received: from localhost ([::1]:50596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQPa-0004jn-VC for larch@yhetil.org; Mon, 19 Sep 2022 19:42:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQI3-0006ED-3U for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQI2-0004UY-R2 for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQI2-0006rS-MY for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:35: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.166363048526337 (code B ref 57675); Mon, 19 Sep 2022 23:35:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:34:45 +0000 Received: from localhost ([127.0.0.1]:55537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQHk-0006qj-SZ for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQHj-0006qV-Pe for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:44 -0400 Date: Tue, 20 Sep 2022 07:34:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630477; 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=pKLi19+Qv8I+QFtQxV5Vq2qYLQPj5iwAxR8A0HYygpo=; b=eoeg4hfTEq/HD0YZUhxTO43QO9tBxUaVXO6Xa6LCNFGxsLA2a0bsEON5MvDL4uU7+Umca9 wKGPY4Okv/9cwyOmi+rVob2bhorr69cqF6uOBTvgczkyWYfspOy7J2sMcxT95RafDEKF8r Y9y6HBBPbrXYIyyRBmqT/Q3amsXtC0qDtJYEA51XtGE9eGPI4qZGWEfKlTNoK4zhhPpdxH UUWP+akH2zduaGDeBgDrDKkSYKND7VLZqnf2K0BnIXEFqYJi7FgB1T/3U3Tf2YONgkHPqb YIXWIfA8xC/8t9hltrwrLujBcPCiRdACZnOIibCJ/5mQzEtS+OkYt/INnxKDeQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663630971; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=pKLi19+Qv8I+QFtQxV5Vq2qYLQPj5iwAxR8A0HYygpo=; b=P7A7mS4XpxDx49gbfdtzi4DbS0+nCOo3apfQA5ZJy8rNwQWs3SmiofPWeuzzVAqy2BbIPN NN/WdPFfFZKgd6qbT93jTcDlj0pXZxjDjDv40YWXRGF9LUs+C6vtgoGCTCGLpbAzpEpdXX yb4zMSrRHKKJ0iG++NzPoIMM3nhcEH5R3PpJZ+o2HbaNkPZewQKaFHaER35k8fCioY9s2E amtEzARt3Q5cVXV+TqdAjrkyC/Uc5FJF+nO7GtAvFjqbXUNGSfxxXuwd8ihlNHanjGNEoB rI/LAEUJxufLjBehIS3cvFkJlTm3716J4Tfcd9dXf1Wu7piqPXSFoRzQ9SLecA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663630971; a=rsa-sha256; cv=none; b=gF+3epk0jlR55GSyf4XnFpmnOrBzdJj24OzIBNvTCbdyxccjp2d63EQLFqVYNVv9GUxQj8 jwkUTR2QiLvkY+hl5RtZUXuxZLkZCLY5WXB4Nq947XPtB14NdnsTIbYQXyXiww0qnTRakp QHGGRk9PTtPAmfmRDUvX0XBLKtfAt/oR1ihlHSyR9ZE5WCnnw499LHDbTHa3DuEKhGqjFb dgGxxk66SOU/GXuOiaJS8giL9F3GeTE2vU5E1RkmpHu45qMHiOqHUzshx0mb+daUgU6QUJ 3+yt3u64MamhrHteTq1iZGSLEsK2vN8QIwkTjsP6MAccSp4JamDpCbx9UubHSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=eoeg4hfT; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=eoeg4hfT; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: AAF5F1380D X-Spam-Score: -2.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: Z9Sj5g5aUA0p * gnu/packages/telegram.scm (libvpx-for-telegram-desktop, libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. [inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 148 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08a72d2e0f..9e68965607 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define libvpx-for-telegram-desktop + (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") + (revision "0") + (name "libvpx-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + +(define libyuv-for-telegram-desktop + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "0") + (name "libyuv-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; 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))))))))) + #~(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; 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))))))))) (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))))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (let* ((libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) + (native-inputs (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.") -- 2.37.3