diff options
| author | Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> | 2020-05-02 03:14:46 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-05-02 12:04:58 +0200 |
| commit | 2ff4e549bbb8cb0e40f730830be0ba6d19269292 (patch) | |
| tree | 68950fe406ebfb6f6b069e450db205ef449984e0 | |
| parent | 7f8f39d344ed12983470b756696345778e5f1efc (diff) | |
| download | patches-2ff4e549bbb8cb0e40f730830be0ba6d19269292.tar patches-2ff4e549bbb8cb0e40f730830be0ba6d19269292.tar.gz | |
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>
| -rw-r--r-- | gnu/packages/jami.scm | 29 | ||||
| -rw-r--r-- | gnu/packages/telephony.scm | 14 |
2 files changed, 18 insertions, 25 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3992d18f89..06067a9253 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -60,7 +60,7 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20191101.3.67671e7") +(define %jami-version "20200401.1.6f090de") (define* (jami-source #:key without-daemon) (origin @@ -76,7 +76,7 @@ #f)) (sha256 (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) ;; Savoir-Faire Linux modifies many libraries to add features ;; to Jami. This procedure makes applying patches to a given @@ -152,22 +152,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..17974e17f9 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -651,13 +651,17 @@ 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 version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) (modules '((guix build utils))) (snippet '(begin @@ -686,11 +690,7 @@ calls and messages") (lambda (dirs) (substitute* "third_party/build/os-linux.mak" (((string-append "DIRS += " dirs)) ""))) - third-party-dirs)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + third-party-dirs)))))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) |