gnu: pjproject-jami: Update to 2.10.

* gnu/packages/telephony.scm (pjproject): Update to 2.10,
[source]: reorder "file-name" and "sha256" fields.
* gnu/packages/jami.scm (%jami-version): Update to 20200401.1.6f090d,
(pjproject-jami)[arguments]: apply patches related to 2.10.

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
This commit is contained in:
Jan Wielkiewicz 2020-05-02 03:14:46 +02:00 committed by Mathieu Othacehe
parent 7f8f39d344
commit 2ff4e549bb
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 18 additions and 25 deletions

View File

@ -60,7 +60,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils))
(define %jami-version "20191101.3.67671e7") (define %jami-version "20200401.1.6f090de")
(define* (jami-source #:key without-daemon) (define* (jami-source #:key without-daemon)
(origin (origin
@ -76,7 +76,7 @@
#f)) #f))
(sha256 (sha256
(base32 (base32
"0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh"))))
;; Savoir-Faire Linux modifies many libraries to add features ;; Savoir-Faire Linux modifies many libraries to add features
;; to Jami. This procedure makes applying patches to a given ;; to Jami. This procedure makes applying patches to a given
@ -152,22 +152,15 @@
#:inputs inputs #:inputs inputs
#:dep-name "pjproject" #:dep-name "pjproject"
#:patches #:patches
'("fix_turn_alloc_failure" '("0001-rfc6544"
"rfc2466" "0002-rfc2466"
"ipv6" "0003-add-tcp-keep-alive"
"multiple_listeners" "0004-multiple_listeners"
"pj_ice_sess" "0005-fix_ebusy_turn"
"fix_turn_fallback" "0006-ignore_ipv6_on_transport_check"
"fix_ioqueue_ipv6_sendto" "0007-pj_ice_sess"
"add_dtls_transport" "0008-fix_ioqueue_ipv6_sendto"
"rfc6544" "0009-add-config-site"))
"ice_config"
"sip_config"
"fix_first_packet_turn_tcp"
"fix_ebusy_turn"
"ignore_ipv6_on_transport_check"
"fix_turn_connection_failure"
"disable_local_resolution"))
#t))) #t)))
;; TODO: We could use substitute-keyword-arguments instead of ;; TODO: We could use substitute-keyword-arguments instead of
;; repeating the phases from pjproject, but somehow it does ;; repeating the phases from pjproject, but somehow it does

View File

@ -651,13 +651,17 @@ calls and messages")
(define-public pjproject (define-public pjproject
(package (package
(name "pjproject") (name "pjproject")
(version "2.9") (version "2.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pjsip/pjproject.git") (url "https://github.com/pjsip/pjproject.git")
(commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -686,11 +690,7 @@ calls and messages")
(lambda (dirs) (lambda (dirs)
(substitute* "third_party/build/os-linux.mak" (substitute* "third_party/build/os-linux.mak"
(((string-append "DIRS += " dirs)) ""))) (((string-append "DIRS += " dirs)) "")))
third-party-dirs)))) third-party-dirs))))))
(file-name (git-file-name name version))
(sha256
(base32
"1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("portaudio" ,portaudio))) `(("portaudio" ,portaudio)))