From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43989) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVJXL-0004CZ-5p for guix-patches@gnu.org; Thu, 14 Nov 2019 13:08:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVJXJ-0001zO-VX for guix-patches@gnu.org; Thu, 14 Nov 2019 13:08:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVJXJ-0001zK-Ry for guix-patches@gnu.org; Thu, 14 Nov 2019 13:08:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iVJXJ-00077S-Kc for guix-patches@gnu.org; Thu, 14 Nov 2019 13:08:05 -0500 Subject: [bug#38211] [PATCH 7/9] gnu: pjproject-jami: Update to 2.9 Resent-Message-ID: From: Pierre Neidhardt Date: Thu, 14 Nov 2019 19:07:06 +0100 Message-Id: <20191114180708.6942-5-mail@ambrevar.xyz> In-Reply-To: <20191114180708.6942-1-mail@ambrevar.xyz> References: <20191114180708.6942-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38211@debbugs.gnu.org * 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 e6d52bc832..2d6e5b2154 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 Jan Wielkiewicz ;;; ;;; 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" -- 2.23.0