From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57376) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPEzI-00019Y-VG for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPEzG-0004so-Cn for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56398) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPEzG-0004sk-9Y for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPEzG-0005qK-6p for guix-patches@gnu.org; Thu, 16 Apr 2020 20:36:06 -0400 Subject: [bug#40677] [PATCH 25/30] gnu: pjproject-jami: Bump to 2.10; apply some cool patches. Resent-Message-ID: From: Jan Wielkiewicz Date: Fri, 17 Apr 2020 02:34:28 +0200 Message-Id: <20200417003433.5608-25-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz --- gnu/packages/jami.scm | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 7d4f13250b..d52bfa866e 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -96,16 +96,14 @@ (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))) - (patches - (search-patches "pjproject-fix.patch")) (snippet '(begin (let ((third-party-directories @@ -137,7 +135,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) @@ -159,7 +157,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" @@ -204,23 +202,15 @@ (jami-apply-dependency-patches #: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 -- 2.26.1