Subject: [bug#40677] [PATCH V3 11/15] gnu: pjproject, pjproject-jami: Bump to 2.10, apply new SFL patches.

From: Jan Wielkiewicz <[email-masked]>
Date: Sat, 2 May 2020 03:14:46 +0200

* gnu/packages/telephony.scm (pjproject): Bump the version to 2.10.

* gnu/packages/jami.scm (pjproject-jami)[arguments]:
Use the new patches instead of the old.
---
 gnu/packages/jami.scm      | 27 ++++++++++-----------------
 gnu/packages/telephony.scm |  6 +++---
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index eb699a5b33..86745e8be1 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -107,7 +107,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"
@@ -151,22 +151,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"))
+                '("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
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 747b0d75a1..ba0d96ba93 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -651,13 +651,13 @@ calls and messages")
 (define-public pjproject
   (package
     (name "pjproject")
-    (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
@@ -690,7 +690,7 @@ calls and messages")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393"))))
+         "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"))))
     (build-system gnu-build-system)
     (inputs
      `(("portaudio" ,portaudio)))
-- 
2.26.2