From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MCWiAz3kVmAcdQAA0tVLHw (envelope-from ) for ; Sun, 21 Mar 2021 06:14:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iUcgOzzkVmAGKwAA1q6Kng (envelope-from ) for ; Sun, 21 Mar 2021 06:14:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B1DE170D8 for ; Sun, 21 Mar 2021 07:14:18 +0100 (CET) Received: from localhost ([::1]:47382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNrLt-0000aG-F4 for larch@yhetil.org; Sun, 21 Mar 2021 02:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNrLe-0000Yi-Ih for guix-patches@gnu.org; Sun, 21 Mar 2021 02:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNrLe-0001ae-90 for guix-patches@gnu.org; Sun, 21 Mar 2021 02:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNrLe-0002uq-4F for guix-patches@gnu.org; Sun, 21 Mar 2021 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47274] Linphone Packages Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Mar 2021 06:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47274@debbugs.gnu.org Cc: Danny Milosavljevic , =?UTF-8?Q?L=C3=A9o?= Le Bouter , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161630722411178 (code B ref -1); Sun, 21 Mar 2021 06:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2021 06:13:44 +0000 Received: from localhost ([127.0.0.1]:53451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNrLM-0002uE-M0 for submit@debbugs.gnu.org; Sun, 21 Mar 2021 02:13:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:48988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNrLL-0002u7-RZ for submit@debbugs.gnu.org; Sun, 21 Mar 2021 02:13:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNrLL-0000Y4-2L for guix-patches@gnu.org; Sun, 21 Mar 2021 02:13:43 -0400 Received: from out2.migadu.com ([2001:41d0:2:aacc::]:47970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNrL8-0001Hd-Tw for guix-patches@gnu.org; Sun, 21 Mar 2021 02:13:42 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616307205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gaq3/WFSsnd+gqKlaZ0yFF8m4NQJkxr3iiiig9PeMrs=; b=QB79nYBdD7RGvBvzaxgQJEHXf6FEalWzBtspDvlGEqAd0/S4GJIUeBUIehBcb0fdL2AhIy JxtMv0YHU6PZGGQsjooEYzaxRRVMdxBP4d5vfXXQ/Tmt2ntyEUSbs5sFR48Cr43UISTuuH UTZodvkOQru9pnvq2JN8iAD21arG8VVEhpqKxR/AZmzAPBSHncerkhBivdy7egXtl4V4jy qe3xG2UgUqDOOUEPL2ZiNBQPZHxb6B/Ts/48YpS+7nYjcspxraXXynh48kS4KVniaYZP7E JWG28CI8ju17mdMRE6TdEc68GA7RkS+x5ZoXc5RAIdN5QV6pVT9pekmQGMJ38g== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Message-ID: <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> Date: Sun, 21 Mar 2021 02:13:23 -0400 MIME-Version: 1.0 In-Reply-To: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PGJFeONrb0FSlIEfnhWDrMjA7gmXnLAJs" X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=2001:41d0:2:aacc::; envelope-from=rg@raghavgururajan.name; helo=out2.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616307259; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=gaq3/WFSsnd+gqKlaZ0yFF8m4NQJkxr3iiiig9PeMrs=; b=t71QdJQzAPPqFogrXMYIHBIzUodGMu9PTllR29b0eaEDubean8QLzPa7AWnYR1MHf57gOf Y2dxHeMy+xwZ4X3sVbTmkksXNJ/Zn/Nqhvkz6IOtQ6JkB3KMWEm2IUi7zL2AXQKUCXbW9F wsHNhKpLv4Pt+lRUz6nDrxqwxf0Nst4tBBYMmmn7e7aA15CjogxkHV4DlvpneRuUkYFWlV VLmhLbUmkcjT17yZubA+P7QwHoJfkjpBuz5L6Sd0Btf+O77ER/DQOOTVkmDg8dqE+fOQdb 28bNeT/AzsXP2nyT5wD1ZvNdUQT6S14zQWHfgrqn5DCEYVRnRSq24j/R6Bvb0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616307259; a=rsa-sha256; cv=none; b=DqtoMnZN6oNVBcq/mN09N8gmtYRt+k0VnBFSi96M6dCWRfStzoxmWbLY8X2Q7ndwwHjOGd t1VMYOn7mSxXN4u9+R+Wc4RM+TPRBt2G6ACppUoKXjJnK4+u2hn9KRqXvfU9y3BTa/wyfe +u2+lq3JGYGdWRa6FeqhOh20M5Ql/i1Be7uFOJmQyDNCEzOSKch0iwdpmUf0ipl1dhNZwR Slxewa3oOVuPAKhaD2X7gomzmx0en32bycBZmqcqOIZ8Ta9IlYipXrfffkn4iW5uG11jX0 wg7vv89qP41a2PJW+2fJeChX6jvfwl0FdcBdsK2tHA/Rj0nyqEocab3JLNVM9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=QB79nYBd; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.52 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=QB79nYBd; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8B1DE170D8 X-Spam-Score: -3.52 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5UlBDtPTv1yU This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PGJFeONrb0FSlIEfnhWDrMjA7gmXnLAJs Content-Type: multipart/mixed; boundary="NQwWqNN14fWXe7poR4vsVPbwrlqpRQeTj"; protected-headers="v1" From: Raghav Gururajan To: guix-patches@gnu.org Cc: Maxim Cournoyer , Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> Subject: Re: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> In-Reply-To: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> --NQwWqNN14fWXe7poR4vsVPbwrlqpRQeTj Content-Type: multipart/mixed; boundary="------------24DC7399EE6447761D3A762B" Content-Language: en-US This is a multi-part message in MIME format. --------------24DC7399EE6447761D3A762B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! > The packages in linphone.scm has been severely outdated and posses risk= ,=20 > as upstream even removed the tarballs. So I have re-worked all the=20 > packages in linphone.scm, as fast as I could. >=20 > @Maxim: Thanks so much for offering to review. >=20 > Please find the attached patch-set. >=20 > I am still working on one component, linphone-desktop. The upgrade from= =20 > v4.1.1 to v4.2.5, turns to be more complicated than I expected. Phew! All done. Attached new patch-set. Regards, RG. --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-libdecaf.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-libdecaf.patch" =46rom 08aa3c9f46b1e78ea5e055cf0f321911ec94b334 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 17:08:57 -0500 Subject: [PATCH 01/53] gnu: Add libdecaf. * gnu/packages/crypto.scm (libdecaf): New variable. --- gnu/packages/crypto.scm | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 0000e7fbf2..3959464d56 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -47,9 +47,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) #:use-module (gnu packages libbsd) @@ -88,6 +90,67 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) =20 +(define-public libdecaf + (package + (name "libdecaf") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.code.sf.net/p/ed448goldilocks/code")= + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1ajgmyvc6a4m1h2hg1g4wz7ibx10x1xys9m6ancnmmf1f2sr= lfly")))) + (build-system cmake-build-system) + (outputs '("out" "python" "doc")) + (arguments + `(#:configure-flags '("-DENABLE_STATIC=3DOFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-binding + (lambda _ + (substitute* "python/setup.py" + (("gmake") + "make") + (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") + "'..', '..', 'build', 'src', 'libdecaf.so'")) + #t)) + (add-after 'install 'install-python-binding + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "../source/python" + (invoke "python" "setup.py" "install" + (string-append "--prefix=3D" (assoc-ref outputs "= python")) + "--root=3D/")) + #t)) + (add-after 'install-python-binding 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "doc") + (let* ((doc (assoc-ref outputs "doc")) + (dest (string-append doc "/share/doc"))) + (copy-recursively "doc" dest)) + #t))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("python" ,python-wrapper))) + (inputs + `(("python2" ,python-2.7) + ("python3" ,python))) + (synopsis "Decaf Elliptic Curve Library") + (description "The libdecaf library is an implementation of elliptic = curve +cryptography using the Montgomery and Edwards curves Curve25519, Ed25519= , +Ed448-Goldilocks and Curve448, using the Decaf encoding.") + (home-page "http://ed448goldilocks.sourceforge.net/") + (license + (list + ;; Library. + license:expat + ;; Binding. + license:bsd-2)))) + (define-public libsodium (package (name "libsodium") --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-bcunit-Update-to-3.0.2-13.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-bcunit-Update-to-3.0.2-13.patch" =46rom 4b03df1e5abf22da27c65e1f22ffe4be65377d29 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 12:04:37 -0500 Subject: [PATCH 02/53] gnu: bcunit: Update to 3.0.2-13. * gnu/packages/linphone.scm (bcunit) [source]: Switch to git repository. [version]: Update to 3.0.2-13. [native-inputs]: Add perl. --- gnu/packages/linphone.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index afa542412f..6d243d2073 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -57,28 +58,33 @@ #:use-module (guix build-system gnu)) =20 (define-public bcunit - (package - (name "bcunit") - (version "3.0.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))= )) + (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") + (revision "13")) + (package + (name "bcunit") + (version (git-version "3.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/bcunit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b"= )))) (build-system cmake-build-system) (arguments '(#:tests? #f ; No test target #:configure-flags (list "-DENABLE_STATIC=3DNO"))) ; Not required + (native-inputs + `(("perl" ,perl))) (synopsis "Belledonne Communications Unit Testing Framework") (description "BCUnit is a fork of the defunct project CUnit, with se= veral fixes and patches applied. It is an unit testing framework for writing,= administering, and running unit tests in C.") (home-page "https://gitlab.linphone.org/BC/public/bcunit") - (license license:lgpl2.0+))) + (license license:lgpl2.0+)))) =20 (define-public bctoolbox (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-bcunit-Enable-curses-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-bcunit-Enable-curses-support.patch" =46rom 3f282a59899dda366e473236b5f96b84ef54e866 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 12:17:47 -0500 Subject: [PATCH 03/53] gnu: bcunit: Enable curses support. * gnu/packages/linphone.scm (bcunit) [arguments]<#:configure-flags> [-DENABLE_CURSES]: New flag. [inputs]: Add ncurses. --- gnu/packages/linphone.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 6d243d2073..dc78636f5a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -76,9 +77,13 @@ (arguments '(#:tests? #f ; No test target #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_CURSES=3DON"))) (native-inputs `(("perl" ,perl))) + (inputs + `(("ncurses" ,ncurses))) (synopsis "Belledonne Communications Unit Testing Framework") (description "BCUnit is a fork of the defunct project CUnit, with se= veral fixes and patches applied. It is an unit testing framework for writing,= --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-bcunit-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-bcunit-Enable-documentation.patch" =46rom c90a23d65b76451620c4500f37aaaec7a311c2ad Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 13:02:42 -0500 Subject: [PATCH 04/53] gnu: bcunit: Enable documentation. * gnu/packages/linphone.scm (bcunit) [outputs]: New output "doc". [arguments]<#:configure-flags>[-DENABLE_DOC]: New flag. <#:phases>['seperate-outputs]: New phase. --- gnu/packages/linphone.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index dc78636f5a..bbea6411f7 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -74,12 +74,25 @@ (sha256 (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b"= )))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments - '(#:tests? #f ; No test target + `(#:tests? #f ; No test target #:configure-flags (list "-DENABLE_STATIC=3DNO" - "-DENABLE_CURSES=3DON"))) + "-DENABLE_CURSES=3DON" + "-DENABLE_DOC=3DON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/BCUnit") + (string-append doc "/share/doc/BCUnit"))) + #t))))) (native-inputs `(("perl" ,perl))) (inputs --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-bcunit-Enable-examples.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-bcunit-Enable-examples.patch" =46rom 9b9f3bc1c8b3f1a1f64863cc360640a38a752514 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:11:32 -0400 Subject: [PATCH 05/53] gnu: bcunit: Enable examples. * gnu/packages/linphone.scm (bcunit) [outputs]: New output "example". [arguments]<#:configure-flag>[-DENABLE_EXAMPLES]: New flag. <#:phases>['patch-source]: New phase. ['seperate-outputs]: Modify. --- gnu/packages/linphone.scm | 72 ++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index bbea6411f7..6b161d326f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -73,36 +73,52 @@ (file-name (git-file-name name version)) (sha256 (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b"= )))) - (build-system cmake-build-system) - (outputs '("out" "doc")) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=3DNO" - "-DENABLE_CURSES=3DON" - "-DENABLE_DOC=3DON") - #:phases - (modify-phases %standard-phases - (add-after 'install 'seperate-outputs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share/doc")) - (rename-file - (string-append out "/share/doc/BCUnit") - (string-append doc "/share/doc/BCUnit"))) - #t))))) - (native-inputs - `(("perl" ,perl))) - (inputs - `(("ncurses" ,ncurses))) - (synopsis "Belledonne Communications Unit Testing Framework") - (description "BCUnit is a fork of the defunct project CUnit, with se= veral + (build-system cmake-build-system) + (outputs '("out" "doc" "example")) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_CURSES=3DON" + "-DENABLE_DOC=3DON" + "-DENABLE_EXAMPLES=3DON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Include BCunit headers for examples. + (substitute* "Examples/CMakeLists.txt" + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}") + (string-append "${CMAKE_CURRENT_SOURCE_DIR} " + "${PROJECT_SOURCE_DIR}/BCUnit/Headers "= + "${CMAKE_BINARY_DIR}/BCUnit/Headers")))= + #t)) + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (example (assoc-ref outputs "example"))) + (for-each mkdir-p + `(,(string-append doc "/share/doc") + ,(string-append example "/share/BCUnit"))) + (rename-file + (string-append out "/share/doc/BCUnit") + (string-append doc "/share/doc/BCUnit")) + (rename-file + (string-append out "/share/BCUnit/Examples") + (string-append example "/share/BCUnit/Examples"))) + #t))))) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("ncurses" ,ncurses))) + (synopsis "Belledonne Communications Unit Testing Framework") + (description "BCUnit is a fork of the defunct project CUnit, with = several fixes and patches applied. It is an unit testing framework for writing,= administering, and running unit tests in C.") - (home-page "https://gitlab.linphone.org/BC/public/bcunit") - (license license:lgpl2.0+)))) + (home-page "https://gitlab.linphone.org/BC/public/bcunit") + (license license:lgpl2.0+)))) =20 (define-public bctoolbox (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-bcunit-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-bcunit-Enable-tests.patch" =46rom fdad19e4ecc2c9ed82295e07a79b3c275bc99ec8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:17:15 -0400 Subject: [PATCH 06/53] gnu: bcunit: Enable tests. * gnu/packages/linphone.scm (bcunit) [arguments]<#:tests?>: Remove argume= nt. <#:configure-flags>[-DENABLE_TEST]: New flag. <#:phases>['patch-source]: Modify. ['check]: Replace with custom phase. --- gnu/packages/linphone.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 6b161d326f..b7cf777401 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -76,13 +76,13 @@ (build-system cmake-build-system) (outputs '("out" "doc" "example")) (arguments - `(#:tests? #f ; No test target - #:configure-flags + `(#:configure-flags (list "-DENABLE_STATIC=3DNO" "-DENABLE_CURSES=3DON" "-DENABLE_DOC=3DON" - "-DENABLE_EXAMPLES=3DON") + "-DENABLE_EXAMPLES=3DON" + "-DENABLE_TEST=3DON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -93,6 +93,17 @@ (string-append "${CMAKE_CURRENT_SOURCE_DIR} " "${PROJECT_SOURCE_DIR}/BCUnit/Headers "= "${CMAKE_BINARY_DIR}/BCUnit/Headers")))= + ;; Link bcunit and bcunit_tests libraries. + (substitute* "BCUnit/Sources/CMakeLists.txt" + (("target_include_directories\\(bcunit_test PUBLIC Test= \\)") + (string-append + "target_include_directories(bcunit_test PUBLIC Test)\= n" + "target_link_libraries(bcunit_test bcunit)"))) + #t)) + (replace 'check + (lambda _ + (with-directory-excursion "BCUnit/Sources/Test" + (invoke "./test_bcunit")) #t)) (add-after 'install 'seperate-outputs (lambda* (#:key outputs #:allow-other-keys) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-bcunit-Enable-mem-trace-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-bcunit-Enable-mem-trace-support.patch" =46rom 430bc171bc948d1350666575bd62984dd1526aaa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:18:44 -0400 Subject: [PATCH 07/53] gnu: bcunit: Enable mem-trace support. * gnu/packages/linphone.scm (bcunit) [arguments]<#:configure-flags> [-DENABLE_MEMTRACE]: New flag. --- gnu/packages/linphone.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index b7cf777401..09f4c24730 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -82,7 +82,8 @@ "-DENABLE_CURSES=3DON" "-DENABLE_DOC=3DON" "-DENABLE_EXAMPLES=3DON" - "-DENABLE_TEST=3DON") + "-DENABLE_TEST=3DON" + "-DENABLE_MEMTRACE=3DON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-bctoolbox-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-bctoolbox-Update-to-4.4.34.patch" =46rom 28d1d2369f6c5d4e25429c1a5c7c796281ea3e3c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:00:48 -0500 Subject: [PATCH 08/53] gnu: bctoolbox: Update to 4.4.34. * gnu/packages/linphone.scm (bctoolbox) [source]: Switch to git repositor= y. [version]: Update to 4.4.34. --- gnu/packages/linphone.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 09f4c24730..90f5796c1f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -135,15 +135,16 @@ administering, and running unit tests in C.") (define-public bctoolbox (package (name "bctoolbox") - (version "0.6.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/bctoolbox") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))= )) + (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"))= )) (build-system cmake-build-system) (arguments '(#:tests? #f ; No test target @@ -156,7 +157,7 @@ administering, and running unit tests in C.") (description "BcToolBox is an utilities library used by Belledonne Communications software like belle-sip, mediastreamer2 and linphone.") (home-page "https://gitlab.linphone.org/BC/public/bctoolbox") - (license license:gpl2+))) + (license license:gpl3+))) =20 (define-public belr (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-bctoolbox-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-bctoolbox-Enable-tests.patch" =46rom 998bbda5aad3038a690b83580476e4ac56e75029 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:55:03 -0500 Subject: [PATCH 09/53] gnu: bctoolbox: Enable tests. * gnu/packages/linphone.scm (bctoolbox) [arguments]<#:tests?>: Remove arg= ument. <#:phases>['patch-source]: New phase. ['check]: Replace with custom phase. --- gnu/packages/linphone.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 90f5796c1f..9d54b1b874 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -147,9 +147,21 @@ administering, and running unit tests in C.") (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"))= )) (build-system cmake-build-system) (arguments - '(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DOFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=3DOFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Disable failing tests. + (substitute* "tester/port.c" + (("[ \t]*TEST_NO_TAG\\(\"Addrinfo sort\", bctbx_addrinfo_= sort_test\\)") + "")) + #t)) + (replace 'check + (lambda _ + (with-directory-excursion "tester" + (invoke "./bctoolbox_tester")) + #t))))) (inputs `(("bcunit" ,bcunit) ("mbedtls" ,mbedtls-apache))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-bctoolbox-Enable-decaf-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-bctoolbox-Enable-decaf-support.patch" =46rom 075c98bdb0bfa7632432dbd4f5e826e176dba199 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 19:32:01 -0500 Subject: [PATCH 10/53] gnu: bctoolbox: Enable decaf support. * gnu/packages/linphone.scm (bctoolbox) [arguments]<#:phases>['patch-sour= ce]: Modify. [inputs]: Add libdecaf. --- gnu/packages/linphone.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 9d54b1b874..1a83105334 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -151,7 +152,16 @@ administering, and running unit tests in C.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix decaf dependency. + (let* ((decaf (assoc-ref inputs "decaf"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(Decaf CONFIG\\)") + "set(DECAF_FOUND 1)") + (("\\$\\{DECAF_INCLUDE_DIRS\\}") + (string-append decaf "/include/decaf")) + (("\\$\\{DECAF_TARGETNAME\\}") + "decaf"))) ;; Disable failing tests. (substitute* "tester/port.c" (("[ \t]*TEST_NO_TAG\\(\"Addrinfo sort\", bctbx_addrinfo_= sort_test\\)") @@ -164,6 +174,7 @@ administering, and running unit tests in C.") #t))))) (inputs `(("bcunit" ,bcunit) + ("decaf" ,libdecaf) ("mbedtls" ,mbedtls-apache))) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-belr-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-belr-Update-to-4.4.34.patch" =46rom 0d06d47006cfd7ee1446446ce793332f22355ecf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 14 Mar 2021 23:40:02 -0400 Subject: [PATCH 11/53] gnu: belr: Update to 4.4.34. * gnu/packages/linphone.scm (belr) [source]: Switch to git repository. [version]: Update to 4.4.34. [inputs]: Add eudev. --- gnu/packages/linphone.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 1a83105334..26b2b0cbba 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -185,22 +185,24 @@ Communications software like belle-sip, mediastream= er2 and linphone.") (define-public belr (package (name "belr") - (version "0.1.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/belr") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))= )) + (base32 "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target #:configure-flags (list "-DENABLE_STATIC=3DOFF"))) ; Not required (inputs - `(("bctoolbox" ,bctoolbox))) + `(("bctoolbox" ,bctoolbox) + ("libudev" ,eudev))) (synopsis "Belledonne Communications Language Recognition Library") (description "Belr is Belledonne Communications' language recognitio= n library, written in C++11. It parses text inputs formatted according to= a --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-belr-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-belr-Enable-tests.patch" =46rom 2c4cd1b4437a7d92e029e79218ec8d27c239c7e6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 01:57:33 -0400 Subject: [PATCH 12/53] gnu: belr: Enable tests. * gnu/packages/linphone.scm (belr) [outputs]: New output "test". [arguments]<#:tests?>: Remove argument. <#:phases>['check]: Replace with custom phase. ['seperate-outputs]: New phase. --- gnu/packages/linphone.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 26b2b0cbba..8767662050 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -196,10 +196,32 @@ Communications software like belle-sip, mediastream= er2 and linphone.") (sha256 (base32 "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"))= )) (build-system cmake-build-system) + (outputs '("out" "test")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DOFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=3DOFF") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (copy-file "tester/belr_tester" "../source/tester/belr_test= er") + (with-directory-excursion "../source/tester" + (invoke "./belr_tester")) + #t)) + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (test (assoc-ref outputs "test")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/belr-tester") + (string-append test "/share/" test-name))) + #t))))) (inputs `(("bctoolbox" ,bctoolbox) ("libudev" ,eudev))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-belcard-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-belcard-Update-to-4.4.34.patch" =46rom 187e4df880b18b3606c61154bb9039bcbf2774e3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 16:24:20 -0400 Subject: [PATCH 13/53] gnu: belcard: Update to 4.4.34. * gnu/packages/linphone.scm (belcard) [source]: Switch to git repository.= [version]: Update to 4.4.34. [native-inputs]: Add python-wrapper. [inputs]: Add eudev. --- gnu/packages/linphone.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 8767662050..25cfe6de94 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -236,23 +236,27 @@ IETF.") (define-public belcard (package (name "belcard") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/belcard") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))= )) + (base32 "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target #:configure-flags (list "-DENABLE_STATIC=3DOFF"))) ; Not required + (native-inputs + `(("python" ,python-wrapper))) (inputs `(("bctoolbox" ,bctoolbox) - ("belr" ,belr))) + ("belr" ,belr) + ("libudev" ,eudev))) (synopsis "Belledonne Communications VCard Library") (description "Belcard is a C++ library to manipulate VCard standard format.") --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-belcard-Seperate-outputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-belcard-Seperate-outputs.patch" =46rom 76aab981123ace59f320f62ded3bd93e796ac2e7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 17:11:06 -0400 Subject: [PATCH 14/53] gnu: belcard: Seperate outputs. * gnu/packages/linphone.scm (belcard) [outputs]: New output "test". ['seperate-outputs]: New phase. --- gnu/packages/linphone.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 25cfe6de94..aee6ce4611 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -247,10 +247,27 @@ IETF.") (sha256 (base32 "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"))= )) (build-system cmake-build-system) + (outputs '("out" "test")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DOFF"))) ; Not required + `(#:tests? #f ; FIX-ME + #:configure-flags '("-DENABLE_STATIC=3DOFF") + #:phases + (modify-phases %standard-phases + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (test (assoc-ref outputs "test")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/" test-name) + (string-append test "/share/" test-name))) + #t))))) (native-inputs `(("python" ,python-wrapper))) (inputs --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-bcmatroska2-Change-source.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-bcmatroska2-Change-source.patch" =46rom f94cbb3081d6b4ed59fc9ef94e5ab82317ddab93 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 20:30:21 -0400 Subject: [PATCH 15/53] gnu: bcmatroska2: Change source. * gnu/packages/linphone.scm (bcmatroska2) [source]: Switch to git reposit= ory. --- gnu/packages/linphone.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index aee6ce4611..d42744d7af 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -286,12 +286,13 @@ format.") (version "0.23") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/bcmatroska2") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))= )) + (base32 "1avl9w18kh4dxm3g8j0bkw39bksd7bz3nfxvyibqqnz63ds8vfi2"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-bcg729-Remove-.git-suffix-from-URL.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0016-gnu-bcg729-Remove-.git-suffix-from-URL.patch" =46rom f44adcaa82e6c800293fd41afb79842df45753e8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:11:02 -0400 Subject: [PATCH 16/53] gnu: bcg729: Remove '.git' suffix from URL. * gnu/packages/linphone.scm (bcg729) [source]: Remove '.git' suffix from = URL. --- gnu/packages/linphone.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d42744d7af..5bbf60e204 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -321,7 +321,7 @@ tracks in one file. ") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/bcg729.git") + (url "git://git.linphone.org/bcg729") (commit version))) (file-name (git-file-name name version)) (sha256 --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-bcg729-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-bcg729-Enable-tests.patch" =46rom c487293d21986019a92162c43b8d9e6ff3faf5a6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 21:30:54 -0400 Subject: [PATCH 17/53] gnu: bcg729: Enable tests. * gnu/packages/linphone.scm (bcg729) [arguments]<#:tests?>: Remove argume= nt. <#:configure-flags>[-DENABLE_TESTS]: New flag. <#:phases>['copy-inputs]: New phase. ['check]: Replace with custom phase. [native-inputs]: Add perl, test-patterns and unzip. --- gnu/packages/linphone.scm | 55 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 5bbf60e204..346ca30a77 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -328,9 +328,58 @@ tracks in one file. ") (base32 "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"))= )) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required + `(#:configure-flags + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_TESTS=3DYES") + #:phases + (modify-phases %standard-phases + (add-before 'check 'copy-inputs + (lambda* (#:key inputs #:allow-other-keys) + (let ((test-patterns (assoc-ref inputs "test-patterns")) + (dest (string-append "test/bcg729-patterns.zip"))) + (copy-recursively test-patterns dest)) + #t)) + (replace 'check + (lambda _ + (with-directory-excursion "test" + (invoke "unzip" "bcg729-patterns.zip") + (for-each + (lambda (test-name) + (invoke "./testCampaign" "-s" test-name)) + (list + "fixedCodebookSearch" + "postProcessing" + "adaptativeCodebookSearch" + "computeLP" + "computeAdaptativeCodebookGain" + "postFilter" + "decoder" + "LPSynthesisFilter" + "decodeLSP" + ;; "encoder" + ;; "LSPQuantization" + "preProcessing" + "decodeFixedCodeVector" + "CNGdecoder" + ;; "LP2LSPConversion" + "gainQuantization" + "findOpenLoopPitchDelay" + "decodeGains" + "computeWeightedSpeech" + "interpolateqLSPAndConvert2LP" + "decodeAdaptativeCodeVector"))) + #t))))) + (native-inputs + `(("perl" ,perl) + ("test-patterns" + ,(origin + (method url-fetch) + (uri (string-append "http://www.belledonne-communications.com= /" + "bc-downloads/bcg729-patterns.zip")) + (sha256 + (base32 "1kivarhh3izrl9sg0szs6x6pbq2ap0y6xsraw0gbgspi4gnfihr= h")))) + ("unzip" ,unzip))) (synopsis "Belledonne Communications G729 Codec") (description "BcG729 is an implementation of both encoder and decode= r of the ITU G729 speech codec. The library written in C 99 is fully portabl= e and --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-bcg729-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0018-gnu-bcg729-Update-home-page-and-license.patch" =46rom 26301852706db96375e9669cfa01f77f7977ee68 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 21:38:07 -0400 Subject: [PATCH 18/53] gnu: bcg729: Update home-page and license. * gnu/packages/linphone.scm (bcg729) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 346ca30a77..f1bcae1208 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -386,8 +386,8 @@ the ITU G729 speech codec. The library written in C = 99 is fully portable and can be executed on many platforms including both ARM and x86 processors.= It supports concurrent channels encoding and decoding for multi call applic= ation such as conferencing.") - (home-page "https://gitlab.linphone.org/BC/public/belcard") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/bcg729") + (license license:gpl3+))) =20 (define-public ortp (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-ortp-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0019-gnu-ortp-Update-to-4.4.34.patch" =46rom aa8b9dbcca306c55bfd8335d8a8ee933cfa60654 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:09:07 -0400 Subject: [PATCH 19/53] gnu: ortp: Update to 4.4.34. * gnu/packages/linphone.scm (ortp) [source]: Switch to git repository. [version]: Update to 4.4.34. --- gnu/packages/linphone.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f1bcae1208..fbe9d81d58 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -392,15 +392,16 @@ such as conferencing.") (define-public ortp (package (name "ortp") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/ortp") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))= )) + (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-ortp-Seperate-outputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0020-gnu-ortp-Seperate-outputs.patch" =46rom 89e071f57db2da8deed0c19e722e8eec35b509a1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:19:47 -0400 Subject: [PATCH 20/53] gnu: ortp: Seperate outputs. * gnu/packages/linphone.scm (ortp) [outputs]: New output "doc". [arguments]<#:phases>['seperate-outputs]: New phase. --- gnu/packages/linphone.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index fbe9d81d58..3273df02c2 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -403,10 +403,24 @@ such as conferencing.") (sha256 (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"))= )) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required + (list + "-DENABLE_STATIC=3DNO") + #:phases + (modify-phases %standard-phases + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-4.4.0"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name))) + #t))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-ortp-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0021-gnu-ortp-Enable-tests.patch" =46rom 7fe7aa78121467b19e11a88589eaea9662605772 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:08:52 -0400 Subject: [PATCH 21/53] gnu: ortp: Enable tests. * gnu/packages/linphone.scm (ortp) [outputs]: New output "test". [arguments]<#:configure-flag>[-DENABLE_TESTS]: New flag. <#:phases>['seperate-outputs]: Modify. --- gnu/packages/linphone.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 3273df02c2..98209ee982 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -403,23 +403,30 @@ such as conferencing.") (sha256 (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"))= )) (build-system cmake-build-system) - (outputs '("out" "doc")) + (outputs '("out" "doc" "test")) (arguments - `(#:tests? #f ; No test target + `(#:tests? #f ; Require networking #:configure-flags (list - "-DENABLE_STATIC=3DNO") + "-DENABLE_STATIC=3DNO" + "-DENABLE_TESTS=3DYES") #:phases (modify-phases %standard-phases (add-after 'install 'seperate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc")) - (doc-name (string-append ,name "-4.4.0"))) - (mkdir-p (string-append doc "/share/doc")) + (doc-name (string-append ,name "-4.4.0")) + (test (assoc-ref outputs "test"))) + (for-each mkdir-p + `(,(string-append doc "/share/doc") + ,(string-append test "/bin"))) (rename-file (string-append out "/share/doc/" doc-name) - (string-append doc "/share/doc/" doc-name))) + (string-append doc "/share/doc/" doc-name)) + (rename-file + (string-append out "/bin") + (string-append test "/bin"))) #t))))) (native-inputs `(("dot" ,graphviz) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-ortp-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0022-gnu-ortp-Update-home-page-and-license.patch" =46rom f3076dfd6a9a4c506e0c61950453c2843c5f7112 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:52:10 -0400 Subject: [PATCH 22/53] gnu: ortp: Update home-page and license. * gnu/packages/linphone.scm (ortp) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 98209ee982..28c9d3f599 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -436,8 +436,8 @@ such as conferencing.") (synopsis "Belledonne Communications RTP Library") (description "oRTP is a C library implementing the RTP protocol. It= implements the RFC 3550 standard.") - (home-page "https://gitlab.linphone.org/BC/public/ortp") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/ortp") + (license license:gpl3+))) =20 (define-public bzrtp (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-bztrp-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0023-gnu-bztrp-Update-to-4.4.34.patch" =46rom db753921f89f63db65ea7ec3bc4e60dc3093772a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:22:31 -0400 Subject: [PATCH 23/53] gnu: bztrp: Update to 4.4.34. * gnu/packages/linphone.scm (bzrtp) [source]: Switch to git repository. [version]: Update to 4.4.34. --- gnu/packages/linphone.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 28c9d3f599..bba7cefb8a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -442,15 +442,16 @@ implements the RFC 3550 standard.") (define-public bzrtp (package (name "bzrtp") - (version "1.0.6") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/bzrtp") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))= )) + (base32 "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-bzrtp-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0024-gnu-bzrtp-Enable-tests.patch" =46rom a73a2d4c200072111b675295e84763c868f466e0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:29:07 -0400 Subject: [PATCH 24/53] gnu: bzrtp: Enable tests. * gnu/packages/linphone.scm (bzrtp) [arguments]<#:tests?>: Remove argumen= t. <#:configure-flags>[-DENABLE_TESTS]: New flag. --- gnu/packages/linphone.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index bba7cefb8a..596fb467a0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -454,9 +454,10 @@ implements the RFC 3550 standard.") (base32 "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"))= )) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required + `(#:configure-flags + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_TESTS=3DYES"))) (inputs `(("bctoolbox" ,bctoolbox) ("sqlite3" ,sqlite) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-bzrtp-Update-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-bzrtp-Update-license.patch" =46rom ef057926e3a1f6e1334aadf114afeef93c69a7d7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:30:58 -0400 Subject: [PATCH 25/53] gnu: bzrtp: Update license. * gnu/packages/linphone.scm (bzrtp) [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 596fb467a0..7261dbe1d8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -467,7 +467,7 @@ implements the RFC 3550 standard.") written in C. It is fully portable and can be executed on many platform= s including both ARM and x86.") (home-page "https://gitlab.linphone.org/BC/public/bzrtp") - (license license:gpl2+))) + (license license:gpl3+))) =20 (define-public belle-sip (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-belle-sip-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0026-gnu-belle-sip-Update-to-4.4.34.patch" =46rom dfa4c6c2dcf6b5e643cc76fedf4263e4cf93de64 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:40:05 -0400 Subject: [PATCH 26/53] gnu: belle-sip: Update to 4.4.34. * gnu/packages/linphone.scm (belle-sip) [source]: Switch to git repositor= y. [version]: Update to 4.4.34. [native-iputs]: Add python-wrapper. --- gnu/packages/linphone.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7261dbe1d8..cc2ab09db0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -472,15 +472,16 @@ including both ARM and x86.") (define-public belle-sip (package (name "belle-sip") - (version "1.6.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/belle-sip") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))= )) + (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"))= )) (build-system cmake-build-system) (arguments `(#:tests? #f ; Requires network access @@ -495,6 +496,8 @@ including both ARM and x86.") ;; which would not be reproducible. (("-Xmultithreaded ") "")) #t))))) + (native-inputs + `(("python" ,python-wrapper))) (inputs `(("antlr3" ,antlr3-3.3) ("antlr3c" ,libantlr3c) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-belle-sip-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-belle-sip-Enable-tests.patch" =46rom 17a4f88266b97931d8070575bdb7d6ae19d1b5c5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 13:25:14 -0400 Subject: [PATCH 27/53] gnu: belle-sip: Enable tests. * gnu/packages/linphone.scm (belle-sip) [outputs]: New output "test". [arguments]<#:tests?>: Remove argument. <#:phases>['check]: Replace with custom phase. ['seperate-outputs]: New phase. --- gnu/packages/linphone.scm | 46 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index cc2ab09db0..e3d8febae9 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -483,9 +483,9 @@ including both ARM and x86.") (sha256 (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"))= )) (build-system cmake-build-system) + (outputs '("out" "test")) (arguments - `(#:tests? #f ; Requires network access - #:configure-flags + `(#:configure-flags (list "-DENABLE_STATIC=3DNO") ; Not required #:phases (modify-phases %standard-phases @@ -495,6 +495,48 @@ including both ARM and x86.") ;; ANTLR would use multithreaded DFA generation otherwise= , ;; which would not be reproducible. (("-Xmultithreaded ") "")) + #t)) + (replace 'check + (lambda _ + (copy-file + "tester/belle_sip_tester" + "../source/tester/belle_sip_tester") + (with-directory-excursion "../source/tester" + (for-each + (lambda (suite-name) + (invoke "./belle_sip_tester" "--suite" suite-name)) + (list + "Object inheritance" + "SIP URI" + "FAST SIP URI" + "FAST SIP URI 2" + "Generic uri" + "Headers" + "Core" + "SDP" + ;; "Resolver" + "Message" + "Authentication helper" + ;; "Register" + ;; "Dialog" + "Refresher" + ;; "HTTP stack" + "Object"))) + #t)) + (add-after 'install 'seperate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (test (assoc-ref outputs "test")) + (test-name (string-append "belle_sip" "_tester"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/" test-name) + (string-append test "/share/" test-name))) #t))))) (native-inputs `(("python" ,python-wrapper))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-belle-sip-Enable-mDNS-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0028-gnu-belle-sip-Enable-mDNS-support.patch" =46rom 48d976256513575667b3a3b59756faa003e649a5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:28:56 -0400 Subject: [PATCH 28/53] gnu: belle-sip: Enable mDNS support. * gnu/packages/linphone.scm (belle-sip) [arguments]<#:configure-flags> [-DENABLE_MDNS]: New flag. <#:phases>['patch]: Modify. --- gnu/packages/linphone.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e3d8febae9..9b04ec90ef 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages audio) + #:use-module (gnu packages avahi) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -486,11 +487,22 @@ including both ARM and x86.") (outputs '("out" "test")) (arguments `(#:configure-flags - (list "-DENABLE_STATIC=3DNO") ; Not required + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_MDNS=3DON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix mDNS dependency. + (let* ((avahi (assoc-ref inputs "avahi"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(DNSSD REQUIRED\\)") + "set(DNSSD_FOUND 1)") + (("\\$\\{DNSSD_INCLUDE_DIRS\\}") + (string-append avahi "/include/avahi-compat-libdns_sd"= )) + (("\\$\\{DNSSD_LIBRARIES\\}") + "dns_sd"))) (substitute* "src/CMakeLists.txt" ;; ANTLR would use multithreaded DFA generation otherwise= , ;; which would not be reproducible. @@ -543,6 +555,7 @@ including both ARM and x86.") (inputs `(("antlr3" ,antlr3-3.3) ("antlr3c" ,libantlr3c) + ("avahi" ,avahi) ("bctoolbox" ,bctoolbox) ("java" ,icedtea) ("zlib" ,zlib))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-belle-sip-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0029-gnu-belle-sip-Update-home-page-and-license.patch" =46rom 63ce26b00ae6cbdc2b5914bdabcbc07034ee97fe Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:32:16 -0400 Subject: [PATCH 29/53] gnu: belle-sip: Update home-page and license. * gnu/packages/linphone.scm (belle-sip) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 9b04ec90ef..e573e71932 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -563,8 +563,8 @@ including both ARM and x86.") (description "Belle-sip is a modern library implementing SIP transpo= rt, transaction and dialog layers. It is written in C, with an object-orien= ted API. It also comprises a simple HTTP/HTTPS client implementation.") - (home-page "https://gitlab.linphone.org/BC/public/belle-sip") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/belle-sip") + (license license:gpl3+))) =20 (define-public mediastreamer2 (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-mediastreamer2-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0030-gnu-mediastreamer2-Update-to-4.4.34.patch" =46rom c9e23524c79159f78e4c4738cad9544cfe3ac1ce Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 15:51:11 -0400 Subject: [PATCH 30/53] gnu: mediastreamer2: Update to 4.4.34. * gnu/packages/linphone.scm (mediastreamer2) [source]: Switch to git repo= sitory. [version]: Update to 4.4.34. [patches]: Remove field. [outputs]: Rename "tester" to "test". [arguments]<#:configure-flags>[-DENABLE_STRICT]: Remove flag. [-DENABLE_BV16]: Remove flag. [-DCMAKE_C_FLAGS]: Remove flag. [-DCMAKE_CXX_FLAGS]: Remove flag. <#:phases>['separate-outputs]: Modify. [native-inputs]: Replace python with python-wrapper. * gnu/packages/patches/mediastreamer2-srtp2.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linphone.scm | 62 ++++--- .../patches/mediastreamer2-srtp2.patch | 155 ------------------ 3 files changed, 28 insertions(+), 190 deletions(-) delete mode 100644 gnu/packages/patches/mediastreamer2-srtp2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d4147a879..5a69518923 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1391,7 +1391,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ - %D%/packages/patches/mediastreamer2-srtp2.patch \ %D%/packages/patches/mesa-skip-tests.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e573e71932..025fd90c46 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -569,56 +569,50 @@ API. It also comprises a simple HTTP/HTTPS client = implementation.") (define-public mediastreamer2 (package (name "mediastreamer2") - (version "2.16.1") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" - "mediastreamer/mediastreamer-" version ".tar.gz")= ) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/mediastreamer2") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))= - (patches (search-patches "mediastreamer2-srtp2.patch")))) - (outputs '("out" "doc" "tester")) + (base32 "0989h3d0h7qrx4kjx8gg09j8c5hvvi3h8qi1iq1dqbppwbaxbz8c"))= )) + (outputs '("out" "doc" "test")) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DENABLE_STATIC=3DNO" ; Not required - "-DENABLE_STRICT=3DNO" ; Would otherwise treat warning= s as err - "-DENABLE_BV16=3DNO" ; Not available - "-DCMAKE_C_FLAGS=3D-DMS2_GIT_VERSION=3D\\\"unknown\\\"" - "-DCMAKE_CXX_FLAGS=3D-DMS2_GIT_VERSION=3D\\\"unknown\\\"") + (list + "-DENABLE_STATIC=3DNO") #:phases (modify-phases %standard-phases (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (test (assoc-ref outputs "test")) + (test-name (string-append ,name "_tester")) (doc (assoc-ref outputs "doc")) - (tester (assoc-ref outputs "tester")) - (tester-name (string-append ,name "_tester"))) - ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) - (rename-file (string-append out "/bin/" tester-name) - (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. - (copy-recursively (string-append out "/share/" tester-nam= e) - (string-append tester "/share/" tester-= name)) - (delete-file-recursively (string-append out "/share/" - tester-name)) - ;; Copy the HTML documentation. - (copy-recursively (string-append out "/share/doc/" - ,name "-" ,version "/htm= l") - (string-append doc "/share/doc/" - ,name "-" ,version "/htm= l")) - (delete-file-recursively (string-append out "/share/doc/"= - ,name "-" ,versio= n - "/html")) - #t)))))) + (doc-name (string-append ,name "-4.4.0"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share") + ,(string-append doc "/share/doc"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/" test-name) + (string-append test "/share/" test-name)) + (rename-file + (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name))) + #t))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python))) + ("python" ,python-wrapper))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) diff --git a/gnu/packages/patches/mediastreamer2-srtp2.patch b/gnu/packag= es/patches/mediastreamer2-srtp2.patch deleted file mode 100644 index f6d494facb..0000000000 --- a/gnu/packages/patches/mediastreamer2-srtp2.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 97903498364ae2596e790cb2c2ce9ac76c04d64a Mon Sep 17 00:00:00 2001 -From: Danmei Chen -Date: Fri, 19 Jan 2018 10:04:07 +0100 -Subject: [PATCH] add compability with srtp2 - ---- - cmake/FindSRTP.cmake | 24 ++++++++++++++++++++---- - src/CMakeLists.txt | 1 + - src/crypto/ms_srtp.c | 10 ++-------- - src/utils/srtp_prefix.h | 41 +++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 64 insertions(+), 12 deletions(-) - create mode 100644 src/utils/srtp_prefix.h - -diff --git a/cmake/FindSRTP.cmake b/cmake/FindSRTP.cmake -index 988b846a..f720ce7e 100644 ---- a/cmake/FindSRTP.cmake -+++ b/cmake/FindSRTP.cmake -@@ -31,20 +31,36 @@ set(_SRTP_ROOT_PATHS - ) -=20 - find_path(SRTP_INCLUDE_DIRS -- NAMES srtp/srtp.h -+ NAMES srtp2/srtp.h - HINTS _SRTP_ROOT_PATHS - PATH_SUFFIXES include - ) -=20 - if(SRTP_INCLUDE_DIRS) - set(HAVE_SRTP_SRTP_H 1) --endif() -- --find_library(SRTP_LIBRARIES -+ set(SRTP_VERSION 2) -+ find_library(SRTP_LIBRARIES -+ NAMES srtp2 -+ HINTS ${_SRTP_ROOT_PATHS} -+ PATH_SUFFIXES bin lib -+ ) -+else() -+ find_path(SRTP_INCLUDE_DIRS -+ NAMES srtp/srtp.h -+ HINTS _SRTP_ROOT_PATHS -+ PATH_SUFFIXES include -+ ) -+ if(SRTP_INCLUDE_DIRS) -+ set(HAVE_SRTP_SRTP_H 1) -+ set(SRTP_VERSION 1) -+ endif() -+ find_library(SRTP_LIBRARIES - NAMES srtp - HINTS ${_SRTP_ROOT_PATHS} - PATH_SUFFIXES bin lib - ) -+endif() -+ -=20 - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SRTP -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index da429764..c46faa62 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -183,6 +183,7 @@ set(VOIP_SOURCE_FILES_C - utils/pcap_sender.c - utils/pcap_sender.h - utils/stream_regulator.c -+ utils/srtp_prefix.h - voip/audioconference.c - voip/audiostream.c - voip/bandwidthcontroller.c -diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c -index 5a510c99..67810316 100644 ---- a/src/crypto/ms_srtp.c -+++ b/src/crypto/ms_srtp.c -@@ -25,6 +25,7 @@ - #include "mediastreamer2/ms_srtp.h" - #include "mediastreamer2/mediastream.h" -=20 -+ - #ifdef HAVE_SRTP -=20 - /*srtp defines all this stuff*/ -@@ -34,13 +35,7 @@ - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION -=20 --#if defined(MS2_WINDOWS_PHONE) --// Windows phone doesn't use make install --#include --#else --#include --#endif -- -+#include "srtp_prefix.h" -=20 - #include "ortp/b64.h" -=20 -@@ -352,7 +347,6 @@ int ms_srtp_init(void) - srtp_init_done++; - }else{ - ms_fatal("Couldn't initialize SRTP library: %d.", st); -- err_reporting_init("mediastreamer2"); - } - }else srtp_init_done++; - return (int)st; -diff --git a/src/utils/srtp_prefix.h b/src/utils/srtp_prefix.h -new file mode 100644 -index 00000000..68bde496 ---- /dev/null -+++ b/src/utils/srtp_prefix.h -@@ -0,0 +1,41 @@ -+/* -+ mediastreamer2 library - modular sound and video processing and strea= ming -+ Copyright (C) 2006-2014 Belledonne Communications, Grenoble -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 = USA -+*/ -+#ifndef __SRTP2_H__ -+#define __SRTP2_H__ -+ -+#if defined(MS2_WINDOWS_PHONE) -+// Windows phone doesn't use make install -+#include -+#elif SRTP_VERSION=3D=3D1 -+#include -+#else -+#include -+#define err_status_t srtp_err_status_t -+#define err_status_ok srtp_err_status_ok -+#define crypto_policy_t srtp_crypto_policy_t -+#define crypto_policy_set_aes_cm_256_hmac_sha1_80 srtp_crypto_policy_se= t_aes_cm_256_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_se= t_aes_cm_128_hmac_sha1_32 -+#define crypto_policy_set_aes_cm_128_null_auth srtp_crypto_policy_set_a= es_cm_128_null_auth -+#define crypto_policy_set_null_cipher_hmac_sha1_80 srtp_crypto_policy_s= et_null_cipher_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_se= t_aes_cm_128_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_256_hmac_sha1_32 srtp_crypto_policy_se= t_aes_cm_256_hmac_sha1_32 -+#define ssrc_t srtp_ssrc_t -+#endif -+ -+#endif ---=20 -2.21.0 - --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-mediastreamer2-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0031-gnu-mediastreamer2-Enable-tests.patch" =46rom d957a35ae7bc2ee750f3e47e243d1cbbb6972826 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:56:25 -0400 Subject: [PATCH 31/53] gnu: mediastreamer2: Enable tests. * gnu/packages/linphone.scm (mediastreamer2) [arguments]<#:tests?>: Remov= e argument. <#:phases>['pre-check]: New phase. ['check]: Replace with custom phase. [native-inputs]: Add xorg-server-for-tests. --- gnu/packages/linphone.scm | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 025fd90c46..661a9ea779 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -582,12 +582,39 @@ API. It also comprises a simple HTTP/HTTPS client = implementation.") (outputs '("out" "doc" "test")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags + `(#:configure-flags (list "-DENABLE_STATIC=3DNO") #:phases (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getenv "TEMP")) + #t)) + (replace 'check + (lambda _ + (copy-file + "tester/mediastreamer2_tester" + "../source/tester/mediastreamer2_tester") + (with-directory-excursion "../source/tester" + (for-each + (lambda (suite-name) + (invoke "./mediastreamer2_tester" "--suite" suite-name= )) + (list + "Basic Audio" + ;; "Sound Card" + ;; "AdaptiveAlgorithm" + ;; "AudioStream" + ;; "VideoStream" + "H26x Tools" + "Framework" + ;; "Player" + "TextStream"))) + #t)) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -612,7 +639,8 @@ API. It also comprises a simple HTTP/HTTPS client im= plementation.") (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-mediastreamer2-Enable-PCAP-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-mediastreamer2-Enable-PCAP-support.patch" =46rom bb31d74bfb61ae3bcbf4509258ed19be9be4b0a0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 18:43:55 -0400 Subject: [PATCH 32/53] gnu: mediastreamer2: Enable PCAP support. * gnu/packages/linphone.scm (mediastreamer2) [arguments]<#:configure-flag= s> [-DENABLE_PCAP]: New flag. <#:phases>['patch-source]: New phase. --- gnu/packages/linphone.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 661a9ea779..adf2a357ea 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -584,9 +584,15 @@ API. It also comprises a simple HTTP/HTTPS client i= mplementation.") (arguments `(#:configure-flags (list - "-DENABLE_STATIC=3DNO") + "-DENABLE_STATIC=3DNO" + "-DENABLE_PCAP=3DYES") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "src/otherfilters/mspcapfileplayer.c" + (("O_BINARY") "L_INCR")) + #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-mediastreamer2-Enable-port-audio-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-mediastreamer2-Enable-port-audio-support.patch" =46rom c2d99242acc55c50d5433c1068a45f7e2ec55d3d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 20:32:40 -0400 Subject: [PATCH 33/53] gnu: mediastreamer2: Enable port-audio support. * gnu/packages/linphone.scm (mediastreamer2) [arguments]<#:configure-flag= s> [-DENABLE_STRICT]: New flag. [-DENABLE_PORTAUDIO]: New flag. --- gnu/packages/linphone.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index adf2a357ea..1a11cc5c46 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -585,7 +585,9 @@ API. It also comprises a simple HTTP/HTTPS client im= plementation.") `(#:configure-flags (list "-DENABLE_STATIC=3DNO" - "-DENABLE_PCAP=3DYES") + "-DENABLE_PCAP=3DYES" + "-DENABLE_STRICT=3DNO" ; To disable strict compile options= + "-DENABLE_PORTAUDIO=3DYES") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-mediastreamer2-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0034-gnu-mediastreamer2-Update-home-page-and-license.patch" =46rom 2b36386872adf9547229d581649a96b440047098 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 20:41:23 -0400 Subject: [PATCH 34/53] gnu: mediastreamer2: Update home-page and license.= * gnu/packages/linphone.scm (mediastreamer2) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 1a11cc5c46..836ca7c079 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -681,8 +681,8 @@ API. It also comprises a simple HTTP/HTTPS client im= plementation.") for telephony applications. This media processing and streaming toolkit= is responsible for receiving and sending all multimedia streams in Linphone= , including media capture, encoding and decoding, and rendering.") - (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/mediastreamer2") + (license license:gpl3+))) =20 (define-public liblinphone (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-mediastreamer2-Enable-G729B-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0035-gnu-mediastreamer2-Enable-G729B-support.patch" =46rom 74b1c2811dc3918630418c230748712c6fa31402 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:03:16 -0400 Subject: [PATCH 35/53] gnu: mediastreamer2: Enable G729B support. * gnu/packages/linphone.scm (mediastreamer2) [arguments]<#:configure-flag= s> [-DENABLE_G729B_CNG]: New flag. --- gnu/packages/linphone.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 836ca7c079..79cb35fc07 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -587,7 +587,8 @@ API. It also comprises a simple HTTP/HTTPS client im= plementation.") "-DENABLE_STATIC=3DNO" "-DENABLE_PCAP=3DYES" "-DENABLE_STRICT=3DNO" ; To disable strict compile options= - "-DENABLE_PORTAUDIO=3DYES") + "-DENABLE_PORTAUDIO=3DYES" + "-DENABLE_G729B_CNG=3DYES") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-soci-Propagate-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0036-gnu-soci-Propagate-inputs.patch" =46rom 41a8f916504fde059793d0c428512ef6c928da5c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:57:10 -0400 Subject: [PATCH 36/53] gnu: soci: Propagate inputs. Headers of soci has include-references to headers of these inputs. * gnu/packages/databases.scm (soci) [inputs]: Move to ... [propagated-inputs]: ... here. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8be83f5cbe..76eb2357ef 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3777,7 +3777,7 @@ The drivers officially supported by @code{libdbi} a= re: (base32 "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp"))= )) (build-system cmake-build-system) - (inputs + (propagated-inputs `(("firebird" ,firebird) ("postgresql" ,postgresql) ("sqlite" ,sqlite) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-Add-lime.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0037-gnu-Add-lime.patch" =46rom 30c0515c5ec80da84a4e0e7ecbf8dff19fc16066 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 23:08:41 -0400 Subject: [PATCH 37/53] gnu: Add lime. * gnu/packages/linphone.scm (lime): New variable. --- gnu/packages/linphone.scm | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 79cb35fc07..80349ac426 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -685,6 +686,62 @@ including media capture, encoding and decoding, and = rendering.") (home-page "https://linphone.org/technical-corner/mediastreamer2") (license license:gpl3+))) =20 +(define-public lime + (package + (name "lime") + (version "4.4.34") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/lime") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"))= )) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "-DENABLE_STATIC=3DNO" + "-DENABLE_C_INTERFACE=3DYES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Disable tests that require networking. + (substitute* "tester/CMakeLists.txt" + (("add_test\\(?.*\"Hello World\"\\)") "") + (("add_test\\(?.*\"lime\"\\)") "") + (("add_test\\(?.*\"FFI\"\\)") "")) + #t)) + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "doc") + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (assoc-ref outputs "doc")) + (dir (string-append doc "/share/doc")) + (dest (string-append dir "/" ,name "-" ,version))) + (mkdir-p dest) + (copy-recursively "doc" dest)) + #t))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("belle-sip" ,belle-sip) + ("soci" ,soci))) + (synopsis "Belledonne Communications Encryption Library") + (description "LIME is an encryption library for one-to-one and group= instant +messaging, allowing users to exchange messages privately and asynchronou= sly. +It supports multiple devices per user and multiple users per device.") + (home-page "https://linphone.org/technical-corner/lime") + (license license:gpl3+))) + (define-public liblinphone (package (name "liblinphone") --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-Add-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0038-gnu-Add-build.patch" =46rom a532e6049dbc80a54194c83b68373d8cbd4e0378 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 13:53:40 -0400 Subject: [PATCH 38/53] gnu: Add build. * gnu/packages/codesynthesis.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/codesythesis.scm (build): New variable. --- gnu/local.mk | 1 + gnu/packages/codesynthesis.scm | 55 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/codesynthesis.scm diff --git a/gnu/local.mk b/gnu/local.mk index 5a69518923..b2b64f19fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -134,6 +134,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/cmake.scm \ %D%/packages/cobol.scm \ %D%/packages/code.scm \ + %D%/packages/codesynthesis.scm \ %D%/packages/commencement.scm \ %D%/packages/compression.scm \ %D%/packages/compton.scm \ diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm new file mode 100644 index 0000000000..7cb9a427a5 --- /dev/null +++ b/gnu/packages/codesynthesis.scm @@ -0,0 +1,55 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; Copyright =C2=A9 2020 Raghav Gururajan +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (a= t +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages codesynthesis) + #:use-module (gnu packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (guix build-system gnu)) + +(define-public build + (package + (name "build") + (version "0.3.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "build/" (version-major+minor version) + "/build-" version ".tar.bz2")) + (sha256 + (base32 "1lx5rpnmsbip43zpp0a57sl5rm7pjb0y6i2si6rfglfp4p9d3z76"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:make-flags + (list + (string-append "install_prefix=3D" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build)))) + (synopsis "Software Build System") + (description "@package{build} is a massively-parallel software build= system +implemented on top of GNU make.") + (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/"= ) + (license license:gpl2+))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-Add-libcutl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-Add-libcutl.patch" =46rom c6e27b74e1f90985513167b52cd0e0f9cc54aa73 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 13:57:53 -0400 Subject: [PATCH 39/53] gnu: Add libcutl. * gnu/packages/codesynthesis.scm (libcutl): New variable. --- gnu/packages/codesynthesis.scm | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm index 7cb9a427a5..a264692c19 100644 --- a/gnu/packages/codesynthesis.scm +++ b/gnu/packages/codesynthesis.scm @@ -19,6 +19,8 @@ =20 (define-module (gnu packages codesynthesis) #:use-module (gnu packages) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -53,3 +55,45 @@ implemented on top of GNU make.") (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/"= ) (license license:gpl2+))) + +(define-public libcutl + (package + (name "libcutl") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/libcu= tl/" + (version-major+minor version) + "/libcutl-" version ".tar.bz2")) + (sha256 + (base32 "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"))= + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bundled sources. + (with-directory-excursion "cutl/details" + (for-each delete-file-recursively + ;; FIXME: Boost_RegEx isn't being detected. + (list + ;; "boost" + "expat"))) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static" + ;; "--with-external-boost" + "--with-external-expat"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(;; ("boost" ,boost) + ("expat" ,expat))) + (synopsis "C++ utility library") + (description "@package{libcutl} is a C++ utility library. It contai= ns a +collection of generic and independent components such as meta-programmin= g tests, +smart pointers, containers, compiler building blocks, etc.") + (home-page "https://www.codesynthesis.com/projects/libcutl/") + (license license:expat))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-Add-libxsd-frontend.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-Add-libxsd-frontend.patch" =46rom e3abe6dbfcbd6bfb352694fd5efcb9db9da6dce6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 14:00:13 -0400 Subject: [PATCH 40/53] gnu: Add libxsd-frontend. * gnu/packages/codesynthesis.scm (libxsd-frontend): New variable. --- gnu/packages/codesynthesis.scm | 54 ++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm index a264692c19..f24fb760de 100644 --- a/gnu/packages/codesynthesis.scm +++ b/gnu/packages/codesynthesis.scm @@ -97,3 +97,57 @@ collection of generic and independent components such = as meta-programming tests, smart pointers, containers, compiler building blocks, etc.") (home-page "https://www.codesynthesis.com/projects/libcutl/") (license license:expat))) + +(define-public libxsd-frontend + (package + (name "libxsd-frontend") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "libxsd-frontend/" (version-major+minor versi= on) + "/libxsd-frontend-" version ".tar.bz2")) + (sha256 + (base32 "1nmzchsvwvn66jpmcx18anzyl1a3l309x1ld4zllrg37ijc31fim"))= )) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* (find-files "." "\\.make$") + (("build-0\\.3") + (string-append (assoc-ref %build-inputs "build") "/inclu= de/build-0.3"))) + #t)) + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("xsd-frontend" "include/xsd-frontend" + #:include-regexp ("\\.?xx$")) + ("xsd-frontend" "lib" + #:include-regexp ("\\.so$"))) + args)))))) + (native-inputs + `(("build" ,build) + ("pkg-config" ,pkg-config))) + (inputs + `(("libcutl" ,libcutl) + ("libxerces-c" ,xerces-c))) + (synopsis "XSD Front-end") + (description "@package{libxsd-frontend} is a compiler frontend for t= he W3C +XML Schema definition language. It includes a parser, semantic graph ty= pes and +a traversal mechanism.") + (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/"= ) + (license license:gpl2+))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-Add-cli.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-Add-cli.patch" =46rom 2c1e262e549b928a624513e2c91b059b88b8e822 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 14:33:34 -0400 Subject: [PATCH 41/53] gnu: Add cli. * gnu/packages/codesynthesis.scm (cli): New variable. --- gnu/packages/codesynthesis.scm | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm index f24fb760de..b70e53cd7c 100644 --- a/gnu/packages/codesynthesis.scm +++ b/gnu/packages/codesynthesis.scm @@ -151,3 +151,48 @@ XML Schema definition language. It includes a parse= r, semantic graph types and a traversal mechanism.") (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/"= ) (license license:gpl2+))) + +(define-public cli + (package + (name "cli") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "cli/" (version-major+minor version) + "/cli-" version ".tar.bz2")) + (sha256 + (base32 "0bg0nsai2q4h3mldpnj0jz4iy4svs0bcfvmq0v0c9cdyknny606g"))= )) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list + (string-append "install_prefix=3D" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* (find-files "." "\\.make$") + (("build-0\\.3") + (string-append (assoc-ref %build-inputs "build") + "/include/build-0.3"))) + (substitute* (find-files "." "\\.?xx$") + (("add \\(typeid \\(type\\), \\*this\\);") + "traverser_map::add (typeid (type), *this);") + (("iterate_and_dispatch \\(s\\.names_begin \\(\\), s\\.na= mes_end \\(\\), d\\);") + "edge_dispatcher::iterate_and_dispatch (s.names_begin ()= , s.names_end (), d);")) + #t)) + (delete 'configure)))) + (native-inputs + `(("build" ,build) + ("pkg-config" ,pkg-config))) + (inputs + `(("libcutl" ,libcutl))) + (synopsis "Command Line Interface (CLI) definition language") + (description "@package{cli} is a domain-specific language (DSL) for = defining +command line interfaces of C++ programs. It allows you to describe the = options +that your program supports, their types, default values, and documentati= on.") + (home-page "https://codesynthesis.com/projects/cli/") + (license license:expat))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-Add-xsd.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-Add-xsd.patch" =46rom d46ed1d4bd1d85ad5c89d2c713f387714f152358 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 15:51:18 -0400 Subject: [PATCH 42/53] gnu: Add xsd. * gnu/packages/codesynthesis.scm (xsd): New variable. --- gnu/packages/codesynthesis.scm | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm index b70e53cd7c..58f4fa9301 100644 --- a/gnu/packages/codesynthesis.scm +++ b/gnu/packages/codesynthesis.scm @@ -19,6 +19,7 @@ =20 (define-module (gnu packages codesynthesis) #:use-module (gnu packages) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) @@ -196,3 +197,50 @@ command line interfaces of C++ programs. It allows = you to describe the options that your program supports, their types, default values, and documentati= on.") (home-page "https://codesynthesis.com/projects/cli/") (license license:expat))) + +(define-public xsd + (package + (name "xsd") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "xsd/" (version-major+minor version) + "/xsd-" version ".tar.bz2")) + (sha256 + (base32 "1hi9ppxd34np8ydv1h0vgc2qpdmgcd1cdzgk30aidv670xjg91fx"))= )) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list + (string-append "install_prefix=3D" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* (find-files "." "\\.make$") + (("build-0\\.3") + (string-append (assoc-ref %build-inputs "build") + "/include/build-0.3"))) + #t)) + (delete 'configure)))) + (native-inputs + `(("build" ,build) + ("cli" ,cli) + ("pkg-config" ,pkg-config))) + (inputs + `(("libcutl" ,libcutl) + ("libnsl" ,libnsl) + ("libxsd-frontend" ,libxsd-frontend))) + (propagated-inputs + `(("libexpat" ,expat) + ("libxerces-c" ,xerces-c))) + (synopsis "XML Schema to C++ translator") + (description "@package{xsd} is a W3C XML Schema to C++ translator. = It +generates vocabulary-specific, statically-typed C++ mappings/bindings fr= om XML +Schema definitions. It supports two C++ mappings: in-memory C++/Tree an= d +event-driven C++/Parser.") + (home-page "https://codesynthesis.com/projects/xsd/") + (license license:gpl2+))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-liblinphone-Update-to-4.4.34.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-liblinphone-Update-to-4.4.34.patch" =46rom 60de07aa98dbe450d5f4cc9873e04fbe52b8c05a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 17 Mar 2021 23:36:02 -0400 Subject: [PATCH 43/53] gnu: liblinphone: Update to 4.4.34. * gnu/packages/linphone.scm (liblinphone) [source]: Switch to git reposit= ory. [version]: Update to 4.4.34. [outputs]: Remove "doc" and rename "tester" to "test". [arguments]<#:imported-modules>: Remove argument. <#:modules>: Remove argument. <#:configure-flags>[-DGTK2_GDKCONFIG_INCLUDE_DIR]: Remove flag. [-DGTK2_GLIBCONFIG_INCLUDE_DIR]: Remove flag. [-DENABLE_STRICT]: Remove flag. [-DENABLE_GTK_UI]: Remove flag. <#:phases>['patch]: Remove phase. ['install-man-pages]: Remove phase. ['separate-outputs]: Modify. ['glib-or-gtk-compile-schemas]: Remove phase. ['glib-or-gtk-wrap]: Remove phase. [native-inputs]: Add perl. Replace python with python-wrapper. [inputs]: Add belr, lime, soci and xsd. Remove glib and gtk+-2. --- gnu/packages/linphone.scm | 100 +++++++++++++------------------------- 1 file changed, 34 insertions(+), 66 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 80349ac426..7158c093b3 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages codesynthesis) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -745,95 +746,62 @@ It supports multiple devices per user and multiple = users per device.") (define-public liblinphone (package (name "liblinphone") - (version "3.12.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/linpho= ne" - "/linphone-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/liblinphone") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))= )) - (outputs '("out" "doc" "tester")) + (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9"))= )) + (outputs '("out" "test")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target + `(#:tests? #f ; Tests require networking #:configure-flags - (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=3D" - (string-append (assoc-ref %build-inputs "gtk= 2") - "/lib/gtk-2.0/include")) - (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=3D" - (string-append (assoc-ref %build-inputs "gli= b") - "/lib/glib-2.0/include")) - "-DENABLE_STATIC=3DNO" ; Not required - "-DENABLE_STRICT=3DNO" - "-DENABLE_GTK_UI=3DYES") ; for legacy UI - #:imported-modules (,@%cmake-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-o= r-gtk:) - (guix build utils)) + (list + "-DENABLE_STATIC=3DNO") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "gtk/main.c" - (("#include \"liblinphone_gitversion.h\"") - "")) - #t)) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (tester (assoc-ref outputs "tester")) - (tester-name (string-append ,name "_tester"))) - ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) - (rename-file (string-append out "/bin/" tester-name) - (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. - (mkdir-p (string-append tester "/share/")) - (rename-file (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)= ) - ;; Copy the HTML and XML documentation. - (copy-recursively - (string-append out "/share/doc/linphone-" ,version) - (string-append doc "/share/doc/" ,name "-" ,version)) - (delete-file-recursively - (string-append out "/share/doc/linphone-" ,version)) - #t))) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1"))) - (for-each (lambda (file) - (install-file file man)) - (find-files ".." ".*.1$")) - #t))) - (add-after 'separate-outputs 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-= schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))= ) + (test (assoc-ref outputs "test")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/" test-name) + (string-append test "/share/" test-name))) + #t))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("udev" ,eudev) ;for libudev.h - ;; For generating the C++ wrappers. - ("dot" ,graphviz) + `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python) + ("gettext" ,gettext-minimal) + ("perl" ,perl) + ("python" ,python-wrapper) ("pystache" ,python-pystache) - ("six" ,python-six))) + ("six" ,python-six) + ("udev" ,eudev))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) ("bellesip" ,belle-sip) + ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) - ("glib" ,glib) - ("gtk2" ,gtk+-2) + ("libxsd" ,xsd) + ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) ("notify" ,libnotify) ("ortp" ,ortp) + ("soci" ,soci) ("sqlite" ,sqlite) ("xml2" ,libxml2) ("zlib" ,zlib))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-liblinphone-Enable-LDAP-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-liblinphone-Enable-LDAP-support.patch" =46rom e99d0c95c27a21decf387e906d64a1b5f296302b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 04:08:06 -0400 Subject: [PATCH 44/53] gnu: liblinphone: Enable LDAP support. * gnu/packages/linphone.scm (liblinphone) [arguments]<#:configure-flags> [-DENABLE_LDAP]: New flag. [inputs]: Add openldap. --- gnu/packages/linphone.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7158c093b3..0e9d1376bb 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -762,7 +763,8 @@ It supports multiple devices per user and multiple us= ers per device.") `(#:tests? #f ; Tests require networking #:configure-flags (list - "-DENABLE_STATIC=3DNO") + "-DENABLE_STATIC=3DNO" + "-DENABLE_LDAP=3DYES") #:phases (modify-phases %standard-phases (add-after 'install 'separate-outputs @@ -796,6 +798,7 @@ It supports multiple devices per user and multiple us= ers per device.") ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) + ("ldap" ,openldap) ("libxsd" ,xsd) ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-liblinphone-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-liblinphone-Update-home-page-and-license.patch" =46rom c9b7e475956ce93022d47d4978a8b3acd4a1ac60 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 22:05:22 -0400 Subject: [PATCH 45/53] gnu: liblinphone: Update home-page and license. * gnu/packages/linphone.scm (liblinphone) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0e9d1376bb..a7cf785f93 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -814,8 +814,8 @@ all calling and instant messaging features into an un= ified easy-to-use API. It is the cross-platform VoIP library on which the Linphone application is based on, and that anyone can use to add audio and video calls or instant messaging capabilities to an application.") - (home-page "https://gitlab.linphone.org/BC/public/liblinphone") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/liblinphone") + (license license:gpl3+))) =20 (define-public linphoneqt (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-linphoneqt-Update-to-4.2.5.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0046-gnu-linphoneqt-Update-to-4.2.5.patch" =46rom 8a21b5864bba6027d4ff34c5e017d1ea50fcb0ca Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 20:58:20 -0400 Subject: [PATCH 46/53] gnu: linphoneqt: Update to 4.2.5. * gnu/packages/linphone.scm (linphoneqt) [name]: Rename to linphone-deskt= op. [source]: Switch to git repository. [patches]: Remove linphoneqt-tabbutton.patch and add linphone-desktop-wit= hout-sdk.patch. [arguments]<#:configure-flags>[-DENABLE_UPDATE_CHECK]: New flag. <#:phases>['pre-configure]: New phase. ['fix-cmake-error]: Remove phase. ['set-version-string]: Remove phase. ['extend-shared-resources]: Rename to 'post-install and modify. [native-inputs]: Add pkg-config. [inputs]: Add belr, ortp, qtmultimedia, qtscript, qtsensors, qtserialport= , qtspeech, qtwebchannel, qtwebengine, qtwebkit, qtx11extras and qtxmlpatterns. * gnu/packages/patches/linphoneqt-tabbutton.patch: Remove file. linphone-desktop-without-sdk.patch: New file. * gnu/local.mk (dist_patch_DATA): Update. --- gnu/local.mk | 2 +- gnu/packages/linphone.scm | 74 +++--- .../linphone-desktop-without-sdk.patch | 236 ++++++++++++++++++ .../patches/linphoneqt-tabbutton.patch | 96 ------- 4 files changed, 281 insertions(+), 127 deletions(-) create mode 100644 gnu/packages/patches/linphone-desktop-without-sdk.pat= ch delete mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch diff --git a/gnu/local.mk b/gnu/local.mk index b2b64f19fc..9e063a784c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1358,7 +1358,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ - %D%/packages/patches/linphoneqt-tabbutton.patch \ + %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index a7cf785f93..3ca05d2477 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -817,61 +818,74 @@ and video calls or instant messaging capabilities t= o an application.") (home-page "https://linphone.org/technical-corner/liblinphone") (license license:gpl3+))) =20 -(define-public linphoneqt +(define-public linphone-desktop (package - (name "linphoneqt") - (version "4.1.1") + (name "linphone-desktop") + (version "4.2.5") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name= - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/linphone-deskto= p") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))= - (patches (search-patches "linphoneqt-tabbutton.patch")))) + (base32 "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz"))= + (patches (search-patches "linphone-desktop-without-sdk.patch"))))= (build-system qt-build-system) (arguments `(#:tests? #f ; No test target + #:configure-flags + (list + "-DENABLE_UPDATE_CHECK=3DNO") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cmake-error - (lambda _ - ;; This is fixed in commit efed2fd8 of the master branch. - (substitute* "CMakeLists.txt" - (("js)\\$\"") - "js$\"")) - #t)) - (add-after 'unpack 'set-version-string + (add-after 'unpack 'pre-configure (lambda _ - (substitute* "src/app/AppController.cpp" - (("LINPHONE_QT_GIT_VERSION") - (format #f "~s" ,version))) + (for-each make-file-writable (find-files ".")) + (substitute* "linphone-app/linphoneqt_version.cmake" + (("\\$\\{GUIX-SET-VERSION\\}") ,version)) #t)) - (add-after 'install 'extend-shared-resources - ;; Not using the FHS exposes an issue where the client refers= to - ;; its own "share" directory, which lacks sound files install= ed by - ;; liblinphone. + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((liblinphone (assoc-ref inputs "linphone")) + (let* ((liblinphone (assoc-ref inputs "liblinphone")) (out (assoc-ref outputs "out"))) - (symlink (string-append liblinphone "/share/sounds") - (string-append out "/share/sounds")) + ;; Remove unnecessary Qt configuration file. + (delete-file (string-append out "/bin/qt.conf")) + ;; Not using the FHS exposes an issue where the client + ;; refers to its own "share" directory, which lacks sound= + ;; files installed by liblinphone. + (symlink + (string-append liblinphone "/share/sounds") + (string-append out "/share/sounds")) #t)))))) (native-inputs - `(("qttools" ,qttools))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) ("bellesip" ,belle-sip) - ("linphone" ,liblinphone) + ("belr" ,belr) + ("liblinphone" ,liblinphone) ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg))) + ("qtscript" ,qtscript) + ("qtsensors" ,qtsensors) + ("qtserialport" ,qtserialport) + ("qtspeech" ,qtspeech) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns))) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over I= P calling (VoIP) and instant messaging. Amongst its features are: diff --git a/gnu/packages/patches/linphone-desktop-without-sdk.patch b/gn= u/packages/patches/linphone-desktop-without-sdk.patch new file mode 100644 index 0000000000..e7c4d42dfb --- /dev/null +++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch @@ -0,0 +1,236 @@ +From aac8d31e94a71d03730e5c27f9ffe9d91f90a305 Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sun, 21 Mar 2021 00:42:42 -0400 +Subject: [PATCH] [PATCH]: Fix building from git. + +--- + CMakeLists.txt | 72 ++----------------- + linphone-app/CMakeLists.txt | 12 +--- + .../cmake_builder/additional_steps.cmake | 2 +- + .../linphone_package/CMakeLists.txt | 35 +-------- + linphone-app/linphoneqt_version.cmake | 1 + + linphone-app/src/config.h.cmake | 1 + + 6 files changed, 10 insertions(+), 113 deletions(-) + create mode 100644 linphone-app/linphoneqt_version.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..ca93d3b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,15 +48,11 @@ project(linphoneqt) + include(GNUInstallDirs) + include(CheckCXXCompilerFlag) +=20 +-# Prepare gobal CMAKE configuration specific to the current project +-set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK= =2E Keep all in it. +-set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +- + set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") +=20 +-set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}= ${PREFIX_PATH}") ++set(CMAKE_PREFIX_PATH "${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") + string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +-#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PRE= FIX_PATH}") ++#set(PREFIX_PATH "${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +=20 + # Avoid cmake warning if CMP0071 is not set. + if (POLICY CMP0071) +@@ -116,9 +112,6 @@ if(ENABLE_V4L) + endif() + list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=3D${ENABLE_RELATIVE_P= REFIX}") +=20 +-list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=3D${LINPHONE_OUTPUT_DIR}= ") +- +-include(ExternalProject) + set(PROJECT_BUILD_COMMAND "") + if(CMAKE_BUILD_PARALLEL_LEVEL) + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=3D${CMAKE_BUILD_= PARALLEL_LEVEL}") +@@ -133,32 +126,11 @@ if(CMAKE_VERBOSE_MAKEFILE) + endif() + endif() + if(UNIX AND NOT APPLE) +- set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGI= N/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") ++ set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGI= N/lib:$ORIGIN/../lib") + list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=3D${CMAKE_INSTALL_RPATH= }") + endif() +-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already d= one at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=3D= -DCMAKE_PREFIX_PATH=3D${PREFIX_PATH} +- #BUILD_ALWAYS NO #${DO_BUILD} +-) +-ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'desktop'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +-) + include(FindPkgConfig) +=20 +-set(APP_DEPENDS sdk) +- +- + find_package(Qt5 5.12 COMPONENTS Core REQUIRED) +=20 + if ( NOT Qt5_FOUND ) +@@ -173,39 +145,5 @@ find_package(Mediastreamer2 CONFIG QUIET) + find_package(ortp CONFIG QUIET) +=20 +=20 +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FO= UND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FO= UND) OR FORCE_APP_EXTERNAL_PROJECTS) +- message("Projects are set as External projects. You can start building= them by using for example : cmake --build . --target install") +- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-a= pp" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- DEPENDS ${APP_DEPENDS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be do= ne by external project" +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=3D= -DCMAKE_PREFIX_PATH=3D${PREFIX_PATH} +- # ${APP_OPTIONS} +- BUILD_ALWAYS ON +- ) +- install(CODE "message(STATUS Running install)") +- set(AUTO_REGENERATION auto_regeneration) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +-else() +- message("Adding Linphone Desktop in an IDE-friendly state") +- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") +- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- add_dependencies(app-library ${APP_DEPENDS}) +-endif() +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linpho= ne-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already = done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=3D= -DCMAKE_PREFIX_PATH=3D${PREFIX_PATH} +- EXCLUDE_FROM_ALL ON +- BUILD_ALWAYS ON +-) ++message("Adding Linphone Desktop in an IDE-friendly state") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index 3bc9420a..5267cd4a 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -21,17 +21,8 @@ + #######################################################################= ######### + cmake_minimum_required(VERSION 3.1) +=20 ++include(linphoneqt_version.cmake) + find_package(bctoolbox CONFIG) +-set(FULL_VERSION ) +-bc_compute_full_version(FULL_VERSION) +-set(version_major ) +-set(version_minor ) +-set(version_patch ) +-set(identifiers ) +-set(metadata ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor ver= sion_patch identifiers metadata) +- +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version= _patch}") +=20 + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +@@ -49,7 +40,6 @@ if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") +-list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/cmake") +=20 + set(APP_LIBRARY app-library) + include(application_info.cmake) +diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphon= e-app/cmake_builder/additional_steps.cmake +index 7f7fd573..48e3c716 100644 +--- a/linphone-app/cmake_builder/additional_steps.cmake ++++ b/linphone-app/cmake_builder/additional_steps.cmake +@@ -61,7 +61,7 @@ if (ENABLE_PACKAGING) + SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" + DOWNLOAD_COMMAND "" + CMAKE_GENERATOR ${CMAKE_GENERATOR} +- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=3D$= {LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=3D${CMAKE_BINARY_DIR}/pro= grams -DLINPHONE_OUTPUT_DIR=3D${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_= DIR=3D${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=3D${EP_linphone_= SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=3D${L= INPHONE_BUILDER_SIGNING_IDENTITY} ++ CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=3D$= {LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=3D${CMAKE_BINARY_DIR}/pro= grams -DLINPHONE_DESKTOP_DIR=3D${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SO= URCE_DIR=3D${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILD= ER_SIGNING_IDENTITY=3D${LINPHONE_BUILDER_SIGNING_IDENTITY} + ) + endif () + endif () +diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt = b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +index baea03cf..131ebac9 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -202,42 +202,9 @@ elseif (APPLE) + else()# Not Windows and Apple + foreach (LIBRARY ${SHARED_LIBRARIES}) + get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME) +- message("Changing RPATH of ${LIBRARY_FILENAME} from '${LINPHONE_OUTPU= T_DIR}/${CMAKE_INSTALL_LIBDIR}' to '$ORIGIN/../${CMAKE_INSTALL_LIBDIR}'")= +- execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_D= IR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}") ++ execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib" = "${LIBRARY}") + execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib64= " "${LIBRARY}") + endforeach () +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DE= STINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) +-#Just in case. This is useless because we have to use CMAKE_INSTALL_LIB= DIR +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. thi= s codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib") +- endif() +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib64/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib64/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. thi= s codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64") +- endif() +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}= /" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) +- if(ENABLE_BUILD_VERBOSE) +- message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATARO= OTDIR}/" ) +- endif() +- file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR= }/mediastreamer/plugins/*") +- install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" ) + # Install desktop/icon files. + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desk= top.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop"= @ONLY)=09 + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.de= sktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") +diff --git a/linphone-app/linphoneqt_version.cmake b/linphone-app/linpho= neqt_version.cmake +new file mode 100644 +index 00000000..a85d3455 +--- /dev/null ++++ b/linphone-app/linphoneqt_version.cmake +@@ -0,0 +1 @@ ++project(linphoneqt VERSION ${GUIX-SET-VERSION}) +\ No newline at end of file +diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h= =2Ecmake +index 093539e0..5a238c70 100644 +--- a/linphone-app/src/config.h.cmake ++++ b/linphone-app/src/config.h.cmake +@@ -28,3 +28,4 @@ + #cmakedefine ENABLE_UPDATE_CHECK 1 + #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" + #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" ++#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}" +\ No newline at end of file +--=20 +2.31.0 + diff --git a/gnu/packages/patches/linphoneqt-tabbutton.patch b/gnu/packag= es/patches/linphoneqt-tabbutton.patch deleted file mode 100644 index 6b3214026e..0000000000 --- a/gnu/packages/patches/linphoneqt-tabbutton.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 -From: Ronan Abhamon -Date: Fri, 19 Jan 2018 14:42:01 +0100 -Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton = to - iconName (issue with Qt 5.10 and new icon property) - ---- - ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- - ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Commo= n/Form/Tab/TabButton.qml -index ad220ab2..a47bb20b 100644 ---- a/ui/modules/Common/Form/Tab/TabButton.qml -+++ b/ui/modules/Common/Form/Tab/TabButton.qml -@@ -12,8 +12,8 @@ Controls.TabButton { -=20 - // ------------------------------------------------------------------= --------- -=20 -- property string icon - property int iconSize: TabButtonStyle.icon.size -+ property string iconName -=20 - readonly property bool _isSelected: parent.parent.currentItem =3D=3D=3D= button -=20 -@@ -66,9 +66,9 @@ Controls.TabButton { - Layout.leftMargin: TabButtonStyle.text.leftPadding -=20 - icon: { -- var icon =3D button.icon -- return icon.length -- ? (icon + '_' + (button._isSelected ? 'selected' : 'normal'))= -+ var iconName =3D button.iconName -+ return iconName.length -+ ? (iconName + '_' + (button._isSelected ? 'selected' : 'norma= l')) - : '' - } - iconSize: button.iconSize -diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Set= tings/SettingsWindow.qml -index b8f5a80f..58909544 100644 ---- a/ui/views/App/Settings/SettingsWindow.qml -+++ b/ui/views/App/Settings/SettingsWindow.qml -@@ -48,43 +48,43 @@ ApplicationWindow { - id: tabBar -=20 - TabButton { -- icon: 'settings_sip_accounts' -+ iconName: 'settings_sip_accounts' - text: qsTr('sipAccountsTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_audio' -+ iconName: 'settings_audio' - text: qsTr('audioTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_video' -+ iconName: 'settings_video' - text: qsTr('videoTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_call' -+ iconName: 'settings_call' - text: qsTr('callsAndChatTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_network' -+ iconName: 'settings_network' - text: qsTr('networkTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiTab') - width: implicitWidth - } -=20 - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiAdvanced') - width: implicitWidth - } ---=20 -2.21.0 - --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-linphone-desktop-Enable-daemon-interface.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-linphone-desktop-Enable-daemon-interface.patch" =46rom 2b09f2bbaa2ea8f112d32b4fbc6a74319e43a8ee Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 21 Mar 2021 02:03:43 -0400 Subject: [PATCH 47/53] gnu: linphone-desktop: Enable daemon interface. * gnu/packages/linphone.scm (linphone-desktop) [arguments]<#:configure-fl= ags> [-DENABLE_DAEMON]: New flag. --- gnu/packages/linphone.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 3ca05d2477..117611e554 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -837,7 +837,8 @@ and video calls or instant messaging capabilities to = an application.") `(#:tests? #f ; No test target #:configure-flags (list - "-DENABLE_UPDATE_CHECK=3DNO") + "-DENABLE_UPDATE_CHECK=3DNO" + "-DENABLE_DAEMON=3DYES") #:phases (modify-phases %standard-phases (add-after 'unpack 'pre-configure --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-linphone-desktop-Enable-console-interface.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-linphone-desktop-Enable-console-interface.patch" =46rom 116e0664311eebe6746937e5948bed5a5be15471 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 21 Mar 2021 02:05:42 -0400 Subject: [PATCH 48/53] gnu: linphone-desktop: Enable console interface. * gnu/packages/linphone.scm (linphone-desktop) [arguments]<#:configure-fl= ags> [-DENABLE_CONSOLE_UI]: New flag. --- gnu/packages/linphone.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 117611e554..f951fae0d7 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -838,7 +838,8 @@ and video calls or instant messaging capabilities to = an application.") #:configure-flags (list "-DENABLE_UPDATE_CHECK=3DNO" - "-DENABLE_DAEMON=3DYES") + "-DENABLE_DAEMON=3DYES" + "-DENABLE_CONSOLE_UI=3DYES") #:phases (modify-phases %standard-phases (add-after 'unpack 'pre-configure --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-linphone-desktop-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0049-gnu-linphone-desktop-Update-home-page-and-license.patch" =46rom 95809d3b4007f7e88c3757d2ae01a28ee1d73292 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 21:00:37 -0400 Subject: [PATCH 49/53] gnu: linphone-desktop: Update home-page and licens= e. * gnu/packages/linphone.scm (linphone-desktop) [home-page]: Modify. [license]: Update to gpl3+. --- gnu/packages/linphone.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f951fae0d7..4402723102 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -906,8 +906,8 @@ and video calls or instant messaging capabilities to = an application.") @item Audio codecs: opus, speex, g711, g729, gsm, iLBC, g722, SILK, etc.= @item Video codecs: VP8, H.264 and H.265 with resolutions up to 1080P, M= PEG4 @end itemize") - (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")= - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/linphone") + (license license:gpl3+))) =20 (define-public msopenh264 (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-msopenh264-Update-to-1.2.1-21.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0050-gnu-msopenh264-Update-to-1.2.1-21.patch" =46rom 534e5284a0a92c8005f9e161f83f64453cb7670a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:21:12 -0400 Subject: [PATCH 50/53] gnu: msopenh264: Update to 1.2.1-21. * gnu/packages/linphone.scm (msopenh264) [source]: Switch to git reposito= ry. [version]: Update to 1.2.1. [patches]: Remove field. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 65 +++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 4402723102..7911a5f72c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -910,44 +910,35 @@ and video calls or instant messaging capabilities t= o an application.") (license license:gpl3+))) =20 (define-public msopenh264 - (package - (name "msopenh264") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugin= s/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))= - (patches - (list - ;; For support for OpenH264 version >=3D 2. - (origin - (method url-fetch) - (uri - (string-append "https://gitlab.linphone.org/BC/public/msopen= h264/" - "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf= 326" - ".diff")) - (file-name "msopenh264-openh264.patch") - (sha256 - (base32 - "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))= )) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("openh264" ,openh264) - ("ortp" ,ortp))) - (synopsis "Media Streamer H.264 Codec") - (description "MsOpenH264 is an H.264 encoder/decoder plugin for + (let ((commit "88697cc95140017760d6da408cb0efdc5e86e40a") + (revision "21")) + (package + (name "msopenh264") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/msopenh264") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10y3b6s934f2wbsf60b3p0g6hffizjqrj5in8l4sida2fjdxlwwy"= )))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=3DNO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("openh264" ,openh264) + ("ortp" ,ortp))) + (synopsis "Media Streamer H.264 Codec") + (description "MsOpenH264 is an H.264 encoder/decoder plugin for mediastreamer2 based on the openh264 library.") - (home-page "https://gitlab.linphone.org/BC/public/msopenh264") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/msopenh264") + (license license:gpl2+)))) =20 (define-public mssilk (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-mssilk-Update-to-1.1.1-8.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0051-gnu-mssilk-Update-to-1.1.1-8.patch" =46rom 64bfd92703f25dc3cc14ffd1aaf193dee70c18de Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:33:38 -0400 Subject: [PATCH 51/53] gnu: mssilk: Update to 1.1.1-8. * gnu/packages/linphone.scm (mssilk) [source]: Switch to git repository. [version]: Update to 1.1.1-8. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 50 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7911a5f72c..a0985e03ef 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -941,30 +941,34 @@ mediastreamer2 based on the openh264 library.") (license license:gpl2+)))) =20 (define-public mssilk - (package - (name "mssilk") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugin= s/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))= )) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DNO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer SILK Codec") - (description "MSSILK is a plugin of MediaStreamer, adding support fo= r AMR + (let ((commit "dd0f31ee795faa7ea89e601b072dae4cd1df7e3f") + (revision "8")) + (package + (name "mssilk") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/mssilk") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dann5fnzqp6wjlwc6bl2k9b6rvn6bznqb3qsi1kgv9dnq44cbr0"= )))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=3DNO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer SILK Codec") + (description "MSSILK is a plugin of MediaStreamer, adding support = for AMR codec. It is based on the Skype's SILK implementation.") - (home-page "https://gitlab.linphone.org/BC/public/mssilk") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mssilk") + (license license:gpl2+)))) =20 (define-public mswebrtc (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-mswebrtc-Update-to-1.1.1-23.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-mswebrtc-Update-to-1.1.1-23.patch" =46rom 7cf15f7d3024d3e6a38d534328c48283aa16a2ce Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 23:51:32 -0400 Subject: [PATCH 52/53] gnu: mswebrtc: Update to 1.1.1-23. * gnu/packages/linphone.scm (mswebrtc) [source]: Switch to git repository= =2E [version]: Update to 1.1.1-23. [arguments]<#:phases>['copy-inputs]: New phase. [native-inputs]: Add webrtc and python-wrapper. --- gnu/packages/linphone.scm | 75 ++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index a0985e03ef..fe69cf64d5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -971,32 +971,57 @@ codec. It is based on the Skype's SILK implementat= ion.") (license license:gpl2+)))) =20 (define-public mswebrtc - (package - (name "mswebrtc") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugin= s/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))= )) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=3DNO"))) ; Not required - (inputs - `(("bctoolbox" ,bctoolbox) - ("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer WebRTC Codec") - (description "MSWebRTC is a plugin of MediaStreamer, adding support = for + (let ((commit "946ca706733f36a6b4923f04e569531125462d1d") + (revision "23")) + (package + (name "mswebrtc") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/mswebrtc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pfg9m6bpbv0f53nx72rdxhlyriax9pg4yj0gpwq8ha6lqnpwg1x"= )))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list + "-DENABLE_STATIC=3DNO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((webrtc-from (assoc-ref inputs "webrtc")) + (webrtc-to (string-append (getcwd) "/webrtc"))) + (copy-recursively webrtc-from webrtc-to)) + #t))))) + (native-inputs + `(("webrtc" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.linphone.org/BC/public/external/webr= tc") + (commit "583acd27665cfadef8ab03eb85a768d308bd29dd"))) + (file-name + (git-file-name "webrtc-for-mswebrtc" version)) + (sha256 + (base32 + "1maqychrgwy0z4zypa03qp726l2finw64z6cymdzhd58ql3p1lvm")))= ) + ("python" ,python-wrapper))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer WebRTC Codec") + (description "MSWebRTC is a plugin of MediaStreamer, adding suppor= t for WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.= ") - (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") + (license license:gpl2+)))) =20 (define-public msamr (package --=20 2.31.0 --------------24DC7399EE6447761D3A762B Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-msamr-Update-to-1.1.3-11.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-msamr-Update-to-1.1.3-11.patch" =46rom b9b85fe1dedc5c4efb48252a0cd8fbd4fa31b36c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 00:01:26 -0400 Subject: [PATCH 53/53] gnu: msamr: Update to 1.1.3-11. * gnu/packages/linphone.scm (msamr) [source]: Switch to git repository. [version]: Update to 1.1.3-11. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 56 +++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index fe69cf64d5..b3a3399f6c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1024,30 +1024,34 @@ WebRTC codec. It includes features from WebRTC, = such as, iSAC and AECM.") (license license:gpl2+)))) =20 (define-public msamr - (package - (name "msamr") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugin= s/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))= )) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=3DNO" ; Not required - "-DENABLE_WIDEBAND=3DYES"))) - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("opencoreamr" ,opencore-amr) - ("ortp" ,ortp) - ("voamrwbenc" ,vo-amrwbenc))) - (synopsis "Media Streamer AMR Codec") - (description "MSAMR is a plugin of MediaStreamer, adding support for= AMR + (let ((commit "5ab5c098299107048dfcbfc741f7392faef167bd") + (revision "11")) + (package + (name "msamr") + (version (git-version "1.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/msamr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g79lw1qi1mlw3v1b0cixmqiwjql81gz9naakb15n8pvaag9aaqm"= )))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=3DNO" ; Not required + "-DENABLE_WIDEBAND=3DYES"))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("opencoreamr" ,opencore-amr) + ("ortp" ,ortp) + ("voamrwbenc" ,vo-amrwbenc))) + (synopsis "Media Streamer AMR Codec") + (description "MSAMR is a plugin of MediaStreamer, adding support f= or AMR codec. It is based on the opencore-amr implementation.") - (home-page "https://gitlab.linphone.org/BC/public/msamr") - (license license:gpl3+))) + (home-page "https://gitlab.linphone.org/BC/public/msamr") + (license license:gpl3+)))) --=20 2.31.0 --------------24DC7399EE6447761D3A762B-- --NQwWqNN14fWXe7poR4vsVPbwrlqpRQeTj-- --PGJFeONrb0FSlIEfnhWDrMjA7gmXnLAJs Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFbkAwUDAAAAAAAKCRBfWBZkf4vlUSpt AP42C2/eSKGBwljz71zehtNz93TJoEB0zxn0boh3TcZj6QEAj9ac4RaG/LOiUBGU0V+TbsJwboo1 Fzd71srhwTGT5w0= =0Th+ -----END PGP SIGNATURE----- --PGJFeONrb0FSlIEfnhWDrMjA7gmXnLAJs--