From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sEuxFrBIA18fbAAA0tVLHw (envelope-from ) for ; Mon, 06 Jul 2020 15:52:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MBCKErBIA19NAwAA1q6Kng (envelope-from ) for ; Mon, 06 Jul 2020 15:52:16 +0000 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 0D48B9401AE for ; Mon, 6 Jul 2020 15:52:16 +0000 (UTC) Received: from localhost ([::1]:40452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsTPj-00031C-2A for larch@yhetil.org; Mon, 06 Jul 2020 11:52:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsTOY-0000nl-Nj for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsTOY-0000Ek-Dn for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jsTOY-0001fN-Ax for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [PATCH 3/9] gnu: jami-apply-dependency-patches, ffmpeg-jami, pjproject-jami: Apply patches from the new libring source. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jul 2020 15:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42229@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15940506466319 (code B ref 42229); Mon, 06 Jul 2020 15:51:02 +0000 Received: (at 42229) by debbugs.gnu.org; 6 Jul 2020 15:50:46 +0000 Received: from localhost ([127.0.0.1]:34702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOI-0001dm-29 for submit@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:46 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:43733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOF-0001cr-A6 for 42229@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:44 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Mon, 6 Jul 2020 17:50:36 +0200 (CEST) From: Jan Wielkiewicz Date: Mon, 6 Jul 2020 17:50:24 +0200 Message-Id: <20200706155030.1938-3-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl> References: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1594050636; bh=1VgQVPNCvZc5hIJPwx6WrvrKV+6PC8K0ZyloCicqIrc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=PFqNecYIqdwRn5aqKMFkYeMlMJRPC2VJiuMi8YgUymVwIosU2pQSxvZHXd1Vqp2XD O3X2hTQz2u02CEC0MNp5wMne3vi2X/O8pXqM4Mra53kYMeCzV9qDmOqEDJSJPF9CyL aMKgUWPo36j6CCfRnLajXL3FCLTZv5r8NJAKZq+E= X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=interia.pl header.s=biztos header.b=PFqNecYI; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 4.99 X-TUID: B1dsJLrVTlM9 * gnu/packages/jami.scm: (libring-source): [without-contrib] is now true by default. (jami-apply-dependency-patches): Do not invoke tar, patches are now fetched from git. Apply "--ignore-whitespace" to patch to prevent failing. (pjproject-jami)[native-inputs]: Use (libring-source) procedure instead of (jami-source). [arguments]: Add new patches. (ffmpeg-jami)[native-inputs]: Use (libring-source) procedure instead of (jami-source). --- gnu/packages/jami.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index ef2a74abb3..4531c68f5c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -67,7 +67,7 @@ (define %libring-commit "0e36d0b352d543437f0f744230c2eb8c0bc77f36") (define %libring-revision "0") -(define* (libring-source #:key without-contrib) +(define* (libring-source #:key (without-contrib #t)) (origin (method git-fetch) (uri (git-reference @@ -92,16 +92,13 @@ ;; package easy. (define jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) - (let ((patches-directory "sfl-patches")) - (mkdir-p patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "sfl-patches") - "-C" patches-directory - "--strip-components=5" - (string-append "ring-project/daemon/contrib/src/" - dep-name)) + (let ((patches-directory (string-append + (assoc-ref inputs "sfl-patches") + "/contrib/src/" dep-name))) (for-each (lambda (file) - (invoke "patch" "--force" "-p1" "-i" + (invoke "patch" "--force" + "--ignore-whitespace" "-p1" "-i" (string-append patches-directory "/" file ".patch"))) patches)))) @@ -111,7 +108,7 @@ (inherit pjproject) (name "pjproject-jami") (native-inputs - `(("sfl-patches" ,(jami-source)) + `(("sfl-patches" ,(libring-source #:without-contrib #f)) ,@(package-native-inputs pjproject))) (arguments `(#:tests? #f @@ -174,7 +171,9 @@ "0006-ignore_ipv6_on_transport_check" "0007-pj_ice_sess" "0008-fix_ioqueue_ipv6_sendto" - "0009-add-config-site")) + "0009-add-config-site" + "0010-fix-pkgconfig" + "0011-fix-tcp-death-detection")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does @@ -414,7 +413,7 @@ (inherit ffmpeg) (name "ffmpeg-jami") (native-inputs - `(("sfl-patches" ,(jami-source)) + `(("sfl-patches" ,(libring-source #:without-contrib #f)) ("libiconv" ,libiconv) ,@(package-native-inputs ffmpeg))) (supported-systems '("x86_64-linux" "i686-linux" -- 2.27.0