From patchwork Wed Mar 31 05:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28214 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 BE44D27BC68; Wed, 31 Mar 2021 06:25:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6526D27BC65 for ; Wed, 31 Mar 2021 06:25:51 +0100 (BST) Received: from localhost ([::1]:44426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMU-0000ls-H3 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0000SP-TG for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0006Ol-LH for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLk-00037M-IM for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 08/12] ffmpeg-jami: Patch with the patches from Jami 20210326.1.cfba013. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825111847 (code B ref 47513); Wed, 31 Mar 2021 05:25:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:11 +0000 Received: from localhost ([127.0.0.1]:53254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKt-00034v-DW for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:11 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:34507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKl-00032V-Lz for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:04 -0400 Received: by mail-qv1-f48.google.com with SMTP id g8so9396767qvx.1 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xb9F4n0JXjg3BYwemeCPGelwABhhCb87Fy5yym2eScU=; b=bSoHi49Men6H/DGF7FnMxAtGVO1qu5GnVoruERLgH+rPPXfCwhB4Yzg7FskHrUgx/E r+aTDOd1apyxU9rqCpYpJTwP514BY81yaJNGbzfJnM7yPC1FoFl7pllgGaHYKt4dw2RR Xvg1D9YC68dlxdjJnb6h9RnxJXMbVV6DavpL+Y7QG7tKfGR/g10ERPmktpgW6EfrPcLc K92GqkHmAIDJBgH0IHtSovr61/FpijHBqOXK5HtMYpcfm4lRwwE33Sr48m6XqXkrU1qO CVq4Cz6XvOVJKEqspwg679orA5935BdPo7fCO/1IXIap/rqgYryx9zy7t8w5VjsG3hri bavg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xb9F4n0JXjg3BYwemeCPGelwABhhCb87Fy5yym2eScU=; b=iqLaXCVBpm9QQSuMaCNhhCXkXeH68g6T0sYRpSPnrUAjlP/kwODKuoQJUZE/S+PCRh sTIHgCSVFQgB/NIRL+oV6g+Z9luWERBGyXDptQ49UlfE7V1OP4pyGngaq+xADH0gP8PF JeXGAPAKsMe/fBHeeHanhefRNi1dJ1ehCbbOtHyVCS6ZG/eoHdBfXF7VDhaSUOmpjhbm cpjH9IId846VoD5G8XZHJzlGpQpAH9yNiERk+vxVd4+4ryPtcJCRyob7gBO7uDquTJBM tnAiUEFwp1WLHBJkW5bTfpPA0zFoQcy1FoiM7bAXBcv94moiGyc61hOSP3kfuGZDDDQ5 AogQ== X-Gm-Message-State: AOAM530xYVF1KWdetdbdGSw4FwRHp8OT9Lvdtj6i/PegTw/9KDUlzAJf AwRoQj1pPHWStLAag/oY9vgbNcZ5rcM= X-Google-Smtp-Source: ABdhPJw3W3rhGCmmLQIeto7BIH2VDmsvoPy9EwsobykjjiH2Kp1Zo8awXQRR4iGeF8Wtr+SmRhzkNw== X-Received: by 2002:a0c:f6cf:: with SMTP id d15mr1268628qvo.62.1617168238075; Tue, 30 Mar 2021 22:23:58 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:57 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:44 -0400 Message-Id: <20210331052348.5164-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (ffmpeg-jami): Remove trailing #t. [phases] : Add libopusdec-enable-FEC and libopusenc-enable-FEC to the list of patches to apply. --- gnu/packages/jami.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 35d84bb37b..9d5d00c60c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -403,21 +403,22 @@ of Jami." `(modify-phases ,phases (add-after 'unpack 'make-git-checkout-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) ;; These patches come from: ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "ffmpeg" - #:patches - '("remove-mjpeg-log" - "change-RTCP-ratio" - "rtp_ext_abs_send_time")) - #t)))))))))) + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time" + "libopusdec-enable-FEC" + "libopusenc-enable-FEC")))))))))))) (define-public libring (package