From patchwork Tue Apr 21 16:10:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21387 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 102CE27BBE4; Tue, 21 Apr 2020 17:12:31 +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_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTP id CCBB627BBE1 for ; Tue, 21 Apr 2020 17:12:30 +0100 (BST) Received: from localhost ([::1]:60864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVe-0003jZ-85 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52336) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVL-0003Rs-UP for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045C-7I for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVH-00044w-Pb for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVH-00061i-KN for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 14/18] gnu: pjproject-jami: Bump to 2.10, apply new SFL patches. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748549823012 (code B ref 40677); Tue, 21 Apr 2020 16:12:07 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:38 +0000 Received: from localhost ([127.0.0.1]:50602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUo-0005yz-DZ for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:38 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:33906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUX-0005vs-Pq for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (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; Tue, 21 Apr 2020 18:11:15 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:28 +0200 Message-Id: <20200421161032.1847-14-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485476; bh=gYy6AQ9CyFB9VYZi7lig0mYvN+DzHUUDWoscMTsLs8w=; 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=o63KAV7mVXdfdnYUCcbZO9KjX/YdgEKNhQc2k7RGb2t1Oe83XBbRpkI231zIHULTI qpvWurBM/GLbVmqJkUwEbbDErUPNM4i4N79TyGB9M9Dcq4iQOLa4mMOAubbqyDKWFo v3/ahQWrQELJvE01JYyzA21GWGAL9nqiDYITWpm0= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 95f34afa03..291eb8522c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -99,13 +99,13 @@ (define-public pjproject-jami (package (name "pjproject-jami") - (version "2.9") + (version "2.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/pjsip/pjproject.git") - (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) + (commit "3e7b75cb2e482baee58c1991bd2fa4fb06774e0d"))) (modules '((guix build utils))) (snippet '(begin @@ -138,7 +138,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) @@ -160,7 +160,7 @@ `(#:tests? #f ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. #:configure-flags - (list "--disable-oss" + (list ;;"--disable-oss" ; do we need this? "--disable-sound" "--disable-video" "--enable-ext-sound" @@ -206,23 +206,15 @@ #:inputs inputs #:dep-name "pjproject" #:patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - "disable_local_resolution" - "fix_assert_on_connection_attempt")) + '("0001-rfc6544" + "0002-rfc2466" + "0003-add-tcp-keep-alive" + "0004-multiple_listeners" + "0005-fix_ebusy_turn" + "0006-ignore_ipv6_on_transport_check" + "0007-pj_ice_sess" + "0008-fix_ioqueue_ipv6_sendto" + "0009-add-config-site")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does