diff mbox series

[bug#40677,14/18] gnu: pjproject-jami: Bump to 2.10, apply new SFL patches.

Message ID 20200421161032.1847-14-tona_kosmicznego_smiecia@interia.pl
State Accepted
Headers show
Series [bug#40677,01/18] gnu: jami: Move Jami and its dependencies to jami.scm. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Jan Wielkiewicz April 21, 2020, 4:10 p.m. UTC 
---
 gnu/packages/jami.scm | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

Comments

Mathieu Othacehe April 22, 2020, 9:40 a.m. UTC | #1 
> -       (list "--disable-oss"
> +       (list ;;"--disable-oss" ; do we need this?

Do not introduce commented code. If you think we do not need this flag,
you can remove it and explain why in the commit message.

Mathieu
diff mbox series

Patch

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