[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/09: gnu: pjproject-jami: Update to 2.9
From: |
guix-commits |
Subject: |
07/09: gnu: pjproject-jami: Update to 2.9 |
Date: |
Sun, 1 Dec 2019 07:46:20 -0500 (EST) |
ambrevar pushed a commit to branch master
in repository guix.
commit fbcd60dd15a6522eadf9765b931c8058c4a09d14
Author: Pierre Neidhardt <address@hidden>
Date: Thu Nov 14 18:05:43 2019 +0100
gnu: pjproject-jami: Update to 2.9
* gnu/packages/telephony.scm (pjproject-jami)[arguments]: Fix flags, make
files writable, update patch set.
---
gnu/packages/telephony.scm | 36 ++++++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index e6d52bc..2d6e5b2 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2018 Jovany Leandro G.C <address@hidden>
;;; Copyright © 2018 Tim Gesthuizen <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2019 Jan Wielkiewicz <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -685,14 +686,20 @@ Initiation Protocol (SIP) and a multimedia framework.")
"--disable-openh264"
"--disable-resample"
"--disable-libwebrtc"
- ;; "-fPIC" is required for libring. Bug?
- "CFLAGS=-fPIC -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256
-DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3
-DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32"
- "CXXFLAGS=-fPIC -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256
-DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3
-DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32"
- ;; Now deviating from the rules.mak file.
- "--enable-ssl=gnutls"
- "--with-external-srtp")
+ "--with-gnutls"
+ "--with-external-srtp"
+ ;; We need -fPIC or else we get the following error when linking
+ ;; against pjproject-jami:
+ ;; relocation R_X86_64_32S against `.rodata' can not be used
when
+ ;; making a shared object;
+ "CFLAGS=-fPIC"
+ "CXXFLAGS=-fPIC")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
(add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
(let ((savoir-faire-linux-patches-directory "Savoir-faire Linux
patches")
@@ -700,19 +707,28 @@ Initiation Protocol (SIP) and a multimedia framework.")
;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
;; WARNING: These amount for huge changes in pjproject.
(savoir-faire-linux-patches
- '("gnutls"
+ '("fix_turn_alloc_failure"
"rfc2466"
"ipv6"
- "ice_config"
"multiple_listeners"
"pj_ice_sess"
"fix_turn_fallback"
"fix_ioqueue_ipv6_sendto"
"add_dtls_transport"
- "rfc6062")))
+ "rfc6544"
+ "ice_config"
+ "sip_config"
+ "fix_first_packet_turn_tcp"
+ "fix_ebusy_turn"
+ "ignore_ipv6_on_transport_check"
+ "fix_turn_connection_failure"
+ ;; "uwp_vs" ; for windows
+ "disable_local_resolution")))
(mkdir-p savoir-faire-linux-patches-directory)
(invoke "tar" "-xvf" (assoc-ref inputs
"savoir-faire-linux-patches")
- "-C" savoir-faire-linux-patches-directory
"--strip-components=5" "ring-project/daemon/contrib/src/pjproject")
+ "-C" savoir-faire-linux-patches-directory
+ "--strip-components=5"
+ "ring-project/daemon/contrib/src/pjproject")
(for-each
(lambda (file)
(invoke "patch" "--force" "-p1" "-i"
- branch master updated (f71b0a0 -> 5b02898), guix-commits, 2019/12/01
- 01/09: gnu: Add resample., guix-commits, 2019/12/01
- 02/09: gnu: Add sobjectizer., guix-commits, 2019/12/01
- 04/09: gnu: opendht: Update to 2.0.0beta2., guix-commits, 2019/12/01
- 05/09: gnu: pjproject: Update to 2.9., guix-commits, 2019/12/01
- 09/09: gnu: jami: Fix wrapper., guix-commits, 2019/12/01
- 03/09: gnu: Add restinio., guix-commits, 2019/12/01
- 07/09: gnu: pjproject-jami: Update to 2.9,
guix-commits <=
- 08/09: gnu: libring: Update to 20191101., guix-commits, 2019/12/01
- 06/09: gnu: jami: Update to 20191101.3.67671e7., guix-commits, 2019/12/01