summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>2020-04-17 02:34:28 +0200
committerGuix Patches Tester <>2020-04-17 01:38:13 +0100
commit198d4649000a75843df4339c369ac2ebc08a176a (patch)
tree747c2360530ce816dd0ef945037b4d71d6ce2408
parentf1e7b24ee8135651a51a411341d741ef4a79d19d (diff)
downloadpatches-198d4649000a75843df4339c369ac2ebc08a176a.tar
patches-198d4649000a75843df4339c369ac2ebc08a176a.tar.gz
gnu: pjproject-jami: Bump to 2.10; apply some cool patches.
-rw-r--r--gnu/packages/jami.scm36
1 files 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