From unknown Fri Jun 20 18:20:59 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#47274 <47274@debbugs.gnu.org> To: bug#47274 <47274@debbugs.gnu.org> Subject: Status: Linphone Packages Reply-To: bug#47274 <47274@debbugs.gnu.org> Date: Sat, 21 Jun 2025 01:20:59 +0000 retitle 47274 Linphone Packages reassign 47274 guix-patches submitter 47274 Raghav Gururajan severity 47274 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 00:27:06 2021 Received: (at submit) by debbugs.gnu.org; 20 Mar 2021 04:27:06 +0000 Received: from localhost ([127.0.0.1]:51311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNTCc-0003Q6-L6 for submit@debbugs.gnu.org; Sat, 20 Mar 2021 00:27:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:38166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNTCa-0003Py-MR for submit@debbugs.gnu.org; Sat, 20 Mar 2021 00:27:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNTCZ-0005ug-R8 for guix-patches@gnu.org; Sat, 20 Mar 2021 00:27:04 -0400 Received: from out0.migadu.com ([94.23.1.103]:46028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNTCO-0006fN-SL for guix-patches@gnu.org; Sat, 20 Mar 2021 00:27:03 -0400 To: guix-patches@gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616214406; 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; bh=mmG/Pvqq+jrIImsRZEXgnpkER2nL4yknrF3XaslD7vo=; b=l7Lr3Z5sn9BB1OdI98GKuRY970XbZSobu1ZB+cbL6AeWO2b68d/lTb6c9uo3IpMv/PIS5r NH3u9ku1kafU+mmCH/EHTRjZV9O9pWPnmi831LlV0LkQRFjj/YK7LEczREPPJLcRgf5fnk cr1o5sSjJFCIYj+9W5s2KmtunkgevqFBKqO1/J4ki9/ozIVyeXmRBqUXyM9z6b4n3Uv2tQ JewrizShbDkYI/5d2zd5Kv4N+fOHKqvhmjeAXgVXoMQo6u7QmesdfOQ9t3MIVoytK0yZ+M paT2l5QpdGcjxqWDx9NVCSTT7KuPAV3/3XYFrg2Pq1fXMQXYT7bVCd+Jmh1N2A== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Linphone Packages Message-ID: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Date: Sat, 20 Mar 2021 00:26:42 -0400 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Gn6aIFUCo55a8jlfcnJbbFukUwYPPUtqH" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=94.23.1.103; envelope-from=rg@raghavgururajan.name; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Gn6aIFUCo55a8jlfcnJbbFukUwYPPUtqH Content-Type: multipart/mixed; boundary="8rLsg8fLQCRZfnhqnKPBY2NwckmdNGOIX"; protected-headers="v1" From: Raghav Gururajan To: guix-patches@gnu.org Cc: Maxim Cournoyer , Danny Milosavljevic Message-ID: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Subject: Linphone Packages --8rLsg8fLQCRZfnhqnKPBY2NwckmdNGOIX Content-Type: multipart/mixed; boundary="------------895EEA993EFABBDD81204726" Content-Language: en-US This is a multi-part message in MIME format. --------------895EEA993EFABBDD81204726 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, = as upstream even removed the tarballs. So I have re-worked all the=20 packages in linphone.scm, as fast as I could. @Maxim: Thanks so much for offering to review. Please find the attached patch-set. 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. Regards, RG. --------------895EEA993EFABBDD81204726 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 81750f3c1b2d25ff116aa8effd4f760ce715474d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 17:08:57 -0500 Subject: [PATCH 01/50] 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 --------------895EEA993EFABBDD81204726 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 c267e6cd6b7cb1756bc42dde95cb27f75691ce72 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 12:04:37 -0500 Subject: [PATCH 02/50] 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 --------------895EEA993EFABBDD81204726 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 e40e9a4636ad478e78a1158a4892cd3286c36215 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 12:17:47 -0500 Subject: [PATCH 03/50] 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 --------------895EEA993EFABBDD81204726 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 b3ad963f671cb96899f83010c34cd2267efd98d8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 13:02:42 -0500 Subject: [PATCH 04/50] 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 --------------895EEA993EFABBDD81204726 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 ef50d146f39a00f5d2cc37dffaecf676865e1822 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:11:32 -0400 Subject: [PATCH 05/50] 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 --------------895EEA993EFABBDD81204726 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 ef6de16159ec2a71e9b55bce24c27031e4bad39c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:17:15 -0400 Subject: [PATCH 06/50] 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 --------------895EEA993EFABBDD81204726 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 db547a116b990665dbdf19d4f1c93c6970739f59 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 18:18:44 -0400 Subject: [PATCH 07/50] 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 --------------895EEA993EFABBDD81204726 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 b9b239f47780ab3382370c02b5595881d0922202 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:00:48 -0500 Subject: [PATCH 08/50] 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 --------------895EEA993EFABBDD81204726 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 fc95b7f892f57cdc6af37befd5f39d69f6bb210f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:55:03 -0500 Subject: [PATCH 09/50] 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 --------------895EEA993EFABBDD81204726 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 b1041213be6ee2b93427b9713fa0883ace5b619b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 19:32:01 -0500 Subject: [PATCH 10/50] 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 --------------895EEA993EFABBDD81204726 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 b3e167f7f52e51e08375801bb76512e9b38302be Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 14 Mar 2021 23:40:02 -0400 Subject: [PATCH 11/50] 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 --------------895EEA993EFABBDD81204726 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 1d4928910b504984498bd432faadc8a91471fc29 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 01:57:33 -0400 Subject: [PATCH 12/50] 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 --------------895EEA993EFABBDD81204726 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 112a52cff24b678e8fd3e41f54d48e47f18fbc23 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 16:24:20 -0400 Subject: [PATCH 13/50] 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 --------------895EEA993EFABBDD81204726 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 9442099b5d232b558bcef0a2e7382882416c4b86 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 17:11:06 -0400 Subject: [PATCH 14/50] 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 --------------895EEA993EFABBDD81204726 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 19fd34634b418fcd178d655c3dd8445810a32756 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 20:30:21 -0400 Subject: [PATCH 15/50] 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 --------------895EEA993EFABBDD81204726 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 d0d45bb75ba46bd5b68d9a07eaea118d16710912 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:11:02 -0400 Subject: [PATCH 16/50] 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 --------------895EEA993EFABBDD81204726 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 b5f3e5d0684fbb19e19533e29f06879c0fb3c0f1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 21:30:54 -0400 Subject: [PATCH 17/50] 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 --------------895EEA993EFABBDD81204726 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 30885ba367c7dde9aead93f4a0956133f9434fea Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 21:38:07 -0400 Subject: [PATCH 18/50] 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 --------------895EEA993EFABBDD81204726 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 b86edac67e0c971ad0101f238cb6612fac987060 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:09:07 -0400 Subject: [PATCH 19/50] 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 --------------895EEA993EFABBDD81204726 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 68d0598e93baa654e8fe751122568fa3f2026600 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:19:47 -0400 Subject: [PATCH 20/50] 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 --------------895EEA993EFABBDD81204726 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 62d8a115dde670a186dba96603bd7f4f1c1ced6c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:08:52 -0400 Subject: [PATCH 21/50] 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 --------------895EEA993EFABBDD81204726 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 cabddb4d5e2388d00daf14e6a133c5673f7b3f4c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:52:10 -0400 Subject: [PATCH 22/50] 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 --------------895EEA993EFABBDD81204726 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 3b32b9a8f2cd1eca6397c77fd80e54a6c0790908 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:22:31 -0400 Subject: [PATCH 23/50] 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 --------------895EEA993EFABBDD81204726 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 bc1c717b578ca10042dea6ba06376e44ac51a220 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:29:07 -0400 Subject: [PATCH 24/50] 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 --------------895EEA993EFABBDD81204726 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 3ea7cfd928407230199619bebcec83d40fa07d58 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:30:58 -0400 Subject: [PATCH 25/50] 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 --------------895EEA993EFABBDD81204726 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 bdc8398ef86d45f1ab41582c2c4915debe3faf6f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:40:05 -0400 Subject: [PATCH 26/50] 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 --------------895EEA993EFABBDD81204726 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 506bcbdd204924a6067adbb969af4ef9f92df4d2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 13:25:14 -0400 Subject: [PATCH 27/50] 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 --------------895EEA993EFABBDD81204726 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 019329536ce79d261eae4e9ea1ac1710c9cd2487 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:28:56 -0400 Subject: [PATCH 28/50] 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 --------------895EEA993EFABBDD81204726 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 67fc684d976e4e1264374aa1156d4d574eff63df Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:32:16 -0400 Subject: [PATCH 29/50] 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 --------------895EEA993EFABBDD81204726 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 5e823993cc46d6d80a3be140b82c8449b499d6c3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 15:51:11 -0400 Subject: [PATCH 30/50] 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 a68981e48d..2f8ffeed3c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1360,7 +1360,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 --------------895EEA993EFABBDD81204726 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 7e62a8fdd6e9c3ed685b20a443dd8e04ea00e32a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:56:25 -0400 Subject: [PATCH 31/50] 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 --------------895EEA993EFABBDD81204726 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 eda3b77ac469e07b5836fdf9f7c9e7cc76be2872 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 18:43:55 -0400 Subject: [PATCH 32/50] 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 --------------895EEA993EFABBDD81204726 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 67e9cc3baaf0f2596331db6c0cbede1869f3edeb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 20:32:40 -0400 Subject: [PATCH 33/50] 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 --------------895EEA993EFABBDD81204726 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 4e5747cae0f037afa67ff0af2c8fd23005bdd132 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 20:41:23 -0400 Subject: [PATCH 34/50] 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 --------------895EEA993EFABBDD81204726 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 1cce8d7ac16c9d755e39b8a74c8a07e0427ae850 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:03:16 -0400 Subject: [PATCH 35/50] 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 --------------895EEA993EFABBDD81204726 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 cc44a81d0d991775bbfdbc3ca29e22c8e4f34e9b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:57:10 -0400 Subject: [PATCH 36/50] 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 03d01b582a..076ff85e7d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4087,7 +4087,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 --------------895EEA993EFABBDD81204726 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 1eee63bec9152aa9b8d718244d4a474ef04434b9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 23:08:41 -0400 Subject: [PATCH 37/50] 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 --------------895EEA993EFABBDD81204726 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 ac11c46c21836a0696ec927c411c974207162885 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 13:53:40 -0400 Subject: [PATCH 38/50] 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 2f8ffeed3c..1351c81330 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 --------------895EEA993EFABBDD81204726 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 09c07f2b6b36d91ced2c3b41aa39e0b2710f5306 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 13:57:53 -0400 Subject: [PATCH 39/50] 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 --------------895EEA993EFABBDD81204726 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 077cd7512fb13ba35b3a6e4901201181bb8abdb4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 14:00:13 -0400 Subject: [PATCH 40/50] 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 --------------895EEA993EFABBDD81204726 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 9ab80d0b6568b7677bd002d89794e5517a9f005d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 14:33:34 -0400 Subject: [PATCH 41/50] 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 --------------895EEA993EFABBDD81204726 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 c2064aea0a3de692b02475070d6aa0306f20eccd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 15:51:18 -0400 Subject: [PATCH 42/50] 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 --------------895EEA993EFABBDD81204726 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 5630f5c43bd677b42069a73f3e3d3cbe085a69ad Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 17 Mar 2021 23:36:02 -0400 Subject: [PATCH 43/50] 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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-liblinphone-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-liblinphone-Update-home-page-and-license.patch" =46rom a3d94f9cd3d74bda0200b8f6f9ce645a749dad35 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Mar 2021 22:05:22 -0400 Subject: [PATCH 44/50] 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 7158c093b3..73d0121180 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -811,8 +811,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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-linphoneqt-Rename-to-linphone-desktop-and-change.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0045-gnu-linphoneqt-Rename-to-linphone-desktop-and-change.pa"; filename*1="tch" =46rom 8388861e7727da3c5b2b79f6b8524bd585fbfaa9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 20:58:20 -0400 Subject: [PATCH 45/50] gnu: linphoneqt: Rename to linphone-desktop and ch= ange source. * gnu/packages/linphone.scm (linphoneqt) [name]: Rename to linphone-deskt= op. [source]: Switch to git repository. --- 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 73d0121180..9d3f8bec95 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -814,18 +814,19 @@ 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") + (name "linphone-desktop") (version "4.1.1") (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"))= + (base32 "1a639s7grbbwmp65iyvi86265jjp9ljxiamnbmpqa99y7v3jc4z7"))= (patches (search-patches "linphoneqt-tabbutton.patch")))) (build-system qt-build-system) (arguments --=20 2.31.0 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-linphone-desktop-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0046-gnu-linphone-desktop-Update-home-page-and-license.patch" =46rom 6624206706b99446711f318c4db49e56acc25a5d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 21:00:37 -0400 Subject: [PATCH 46/50] 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 9d3f8bec95..231da2cab2 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -888,8 +888,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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-msopenh264-Update-to-1.2.1-21.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-msopenh264-Update-to-1.2.1-21.patch" =46rom de4de606f274b95d0171782bffc7ddb23e3fadc9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:21:12 -0400 Subject: [PATCH 47/50] 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 231da2cab2..984d460bf6 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -892,44 +892,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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-mssilk-Update-to-1.1.1-8.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-mssilk-Update-to-1.1.1-8.patch" =46rom 341a3c7d0624c8dae467e36b411509e3a2bf0f7b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:33:38 -0400 Subject: [PATCH 48/50] 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 984d460bf6..a87b1758cd 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -923,30 +923,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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-mswebrtc-Update-to-1.1.1-23.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-mswebrtc-Update-to-1.1.1-23.patch" =46rom 443ebbdc59ba62dd3f97fe14d09fdabe3213fe8a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 23:51:32 -0400 Subject: [PATCH 49/50] 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 a87b1758cd..c24069a948 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -953,32 +953,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 --------------895EEA993EFABBDD81204726 Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-msamr-Update-to-1.1.3-11.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0050-gnu-msamr-Update-to-1.1.3-11.patch" =46rom aa2ec33ae2b0f554a366da55908b97e6df8a1830 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 00:01:26 -0400 Subject: [PATCH 50/50] 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 c24069a948..2b19fb9e56 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1006,30 +1006,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 --------------895EEA993EFABBDD81204726-- --8rLsg8fLQCRZfnhqnKPBY2NwckmdNGOIX-- --Gn6aIFUCo55a8jlfcnJbbFukUwYPPUtqH Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFV5gwUDAAAAAAAKCRBfWBZkf4vlUXxD AP0WAkwADhMXi4XMrMOfbmsfwaWOv9olpBb5YXh2vhStkQD7BpcB+p68/KIV9E8eMOX4bDTD4EIj dc6563JEkeIM0QQ= =sENz -----END PGP SIGNATURE----- --Gn6aIFUCo55a8jlfcnJbbFukUwYPPUtqH-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 21 02:13:44 2021 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== From: Raghav Gururajan To: guix-patches@gnu.org References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Subject: Re: Linphone Packages 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-Flow: FLOW_OUT 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-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 21 21:49:28 2021 Received: (at submit) by debbugs.gnu.org; 22 Mar 2021 01:49:28 +0000 Received: from localhost ([127.0.0.1]:55771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO9hA-0002Dp-NV for submit@debbugs.gnu.org; Sun, 21 Mar 2021 21:49:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:34742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO9h9-0002Di-9d for submit@debbugs.gnu.org; Sun, 21 Mar 2021 21:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO9h5-0001FK-Uh for guix-patches@gnu.org; Sun, 21 Mar 2021 21:49:25 -0400 Received: from out2.migadu.com ([2001:41d0:2:aacc::]:31681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO9go-00006C-N5 for guix-patches@gnu.org; Sun, 21 Mar 2021 21:49:23 -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=1616377742; 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=+W5x4uZLTUDnl99HbXdiGTYaLKNstaYBnQ6KdbqaOqI=; b=mUFrMAfSBrF48GflHBUq58fZon7DgdjjlMNzADeKEOpFTk4ssLA8bDER9sjZgUFjb0B+O5 WgE3s4GXh3jjYV91bakFucUBFk8J30s5KnIBl7JxSe+DqBOSg3MGs5yHHVOVtEn67EStBX FlwS3JTifWVbpwDgKI2LKHaV3ckSpsBNtmlHOAtjYW80/XwIaAwBixUPfVShluZsa7Cqff EVReKm8SpfH5wEwgD/ApaZuKYst7UPQTZmBsr/WX3Tgi2+MZmpeeh+oPstXAebx3J1jTDG VfPAiRQb5tGmigGblVNp2ZOGizqLIHkJF+NTODuprehcMSSzYOPmkw8K1pvkJA== From: Raghav Gururajan To: guix-patches@gnu.org References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> Subject: Re: Linphone Packages Message-ID: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sun, 21 Mar 2021 21:48:59 -0400 MIME-Version: 1.0 In-Reply-To: <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="DZlAJqgBQ2NvaJzMBXzRpU9SQJr5e5zfQ" X-Migadu-Flow: FLOW_OUT 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-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DZlAJqgBQ2NvaJzMBXzRpU9SQJr5e5zfQ Content-Type: multipart/mixed; boundary="34oLWHTpbp5WgjZJeVYRui969Y3vCwVjL"; 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: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Subject: Re: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> In-Reply-To: <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> --34oLWHTpbp5WgjZJeVYRui969Y3vCwVjL Content-Type: multipart/mixed; boundary="------------A775556A247C8B5909D77D15" Content-Language: en-US This is a multi-part message in MIME format. --------------A775556A247C8B5909D77D15 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! Please find the attached patch-set, which contains modifications in=20 0046-gnu-linphoneqt-Update-to-4.2.5.patch w.r.t to previous patch-set. HELP! The app crashes upon launch. I tried creating symlink "{out}/lib" --> "{liblinphone}/lib", which=20 didn't work. Regards, RG. --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 --------------A775556A247C8B5909D77D15 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 aca8f7070d0c52e0dc8849e26f22f05d3f7243be 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 and ortp. * 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 | 62 ++--- .../linphone-desktop-without-sdk.patch | 235 ++++++++++++++++++ .../patches/linphoneqt-tabbutton.patch | 96 ------- 4 files changed, 269 insertions(+), 126 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..5b34442be3 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,55 +818,58 @@ 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) 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..63e9808bf4 --- /dev/null +++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch @@ -0,0 +1,235 @@ +From cfdf6d1c2051d6a20d0cbb94d81fe398f70dea4d Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sun, 21 Mar 2021 21:13:53 -0400 +Subject: [PATCH] [PATCH]: Fix building from git. + +--- + CMakeLists.txt | 73 +------------------ + linphone-app/CMakeLists.txt | 12 +-- + .../cmake_builder/additional_steps.cmake | 2 +- + .../linphone_package/CMakeLists.txt | 38 ---------- + linphone-app/linphoneqt_version.cmake | 1 + + linphone-app/src/config.h.cmake | 1 + + 6 files changed, 6 insertions(+), 121 deletions(-) + create mode 100644 linphone-app/linphoneqt_version.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..3e853bdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,16 +48,6 @@ 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") +- +-set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}= ${PREFIX_PATH}") +-string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +-#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PRE= FIX_PATH}") +- + # Avoid cmake warning if CMP0071 is not set. + if (POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +@@ -116,9 +106,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 +120,10 @@ 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}") + 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 +138,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..d06dcb74 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -200,44 +200,6 @@ elseif (APPLE) + endif () + # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.a= pp" DESTINATION "." USE_SOURCE_PERMISSIONS) + 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/../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 --------------A775556A247C8B5909D77D15 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 38d6d306cc865cf3c322ce2489a7626ca2562219 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 5b34442be3..8ddee72b5f 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 --------------A775556A247C8B5909D77D15 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 c481fc3cb56f07e0c61266fd78635d02aa062e25 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 8ddee72b5f..2bf3f35de4 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 --------------A775556A247C8B5909D77D15 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 859c5c00a283bf37732d31f339cc21311ba9a050 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 2bf3f35de4..8415b02d0d 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -896,8 +896,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 --------------A775556A247C8B5909D77D15 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 7120ab7a0d8348183c18e144cfbbddf1a7449949 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 8415b02d0d..49c6901e1f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -900,44 +900,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 --------------A775556A247C8B5909D77D15 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 7cb8a299ba78efe5c1f222da1ef2b0c77b0c7003 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 49c6901e1f..5cc23e6c02 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -931,30 +931,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 --------------A775556A247C8B5909D77D15 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 297168c9448af4cb31a190f37e6074dbca8e0c7f 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 5cc23e6c02..4fdf4c0125 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -961,32 +961,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 --------------A775556A247C8B5909D77D15 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 badbc3847d58c36525539b263ed9197265e94c62 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 4fdf4c0125..e0aabbf7a0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1014,30 +1014,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 --------------A775556A247C8B5909D77D15-- --34oLWHTpbp5WgjZJeVYRui969Y3vCwVjL-- --DZlAJqgBQ2NvaJzMBXzRpU9SQJr5e5zfQ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFf3iwUDAAAAAAAKCRBfWBZkf4vlUWjp AQDxgE63VCpCFZh7ZLok30by4tEXSuMwZtTqxsT0CJwtbwD/WuY7e9GKJAXucVOiKX3xTASj3Hsn 78cl+IUU2nichAU= =U8sr -----END PGP SIGNATURE----- --DZlAJqgBQ2NvaJzMBXzRpU9SQJr5e5zfQ-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 22 00:44:34 2021 Received: (at submit) by debbugs.gnu.org; 22 Mar 2021 04:44:34 +0000 Received: from localhost ([127.0.0.1]:55857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOCQc-0006Tr-Qp for submit@debbugs.gnu.org; Mon, 22 Mar 2021 00:44:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:59422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOCQb-0006Tk-UB for submit@debbugs.gnu.org; Mon, 22 Mar 2021 00:44:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOCQX-0001qW-Jb for guix-patches@gnu.org; Mon, 22 Mar 2021 00:44:30 -0400 Received: from out2.migadu.com ([188.165.223.204]:22608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOCQJ-0005KZ-En for guix-patches@gnu.org; Mon, 22 Mar 2021 00:44:28 -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=1616388249; 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=GgCXV0+AKD7oCamEyRjkTH8B9877fJ7JWuEvCtnQDKA=; b=nABVD4pv2iDQCWQJD7xXC1Rkfov1cEsekm13k6tSlqsItOZ4l2zT+cjM4HBWLq910mM8Bj QxrWoHaAA7kz6/s403KDJfJ7Ap8RxP289T2Cc8UOhx0EdUX+0WgXFiXAx+rPCi6md38dJr 54//qeLA7LL8xROg79o3SlkCJqNdUp6Xtrpvm8RUk5PNw4pCIWk9n3likFdEkmk2aghsJh kbn7WjyLZ+gAkP3G9vvPGN/KPWNxXRDYH3k9g1EEHZppj2nQbIllaLmjflXKq4O6WYSjJP Az2RARGJk9cgCiC9Wf5Z7Tktxda1o604lk4Z7YyNt1TmWPS/ciZ3spGhH7ogrg== From: Raghav Gururajan To: guix-patches@gnu.org References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Subject: Re: Linphone Packages Message-ID: Date: Mon, 22 Mar 2021 00:44:06 -0400 MIME-Version: 1.0 In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0qOh56gYjOcbGopkeMm5crm9hATIqcNWd" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=188.165.223.204; 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-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0qOh56gYjOcbGopkeMm5crm9hATIqcNWd Content-Type: multipart/mixed; boundary="4BtKeto8GHYuQYmmPiYWZLnmKUuBxz2gr"; 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: Subject: Re: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> --4BtKeto8GHYuQYmmPiYWZLnmKUuBxz2gr Content-Type: multipart/mixed; boundary="------------F3632A24415071FF50A6F033" Content-Language: en-US This is a multi-part message in MIME format. --------------F3632A24415071FF50A6F033 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! > HELP! The app crashes upon launch. Fixed it in the attached patch-set. The app works now. \o/ Anyway, I think we can do something for the following, w.r.t=20 linphone-desktop: [1] Warnings. Fixing them might prevent them to become errors. [2] Better solution than symlinks in 'post-install phase. Because=20 linphone-desktop should be able to read files in /lib and /share of=20 *all* of its dependencies. Not just for those we made symlinks for,=20 which is a temporary fix. Regarding [1], for one of the warnings, I tried creating symlink=20 "{linphone-desktop}/lib" --> "{liblinphone}/lib", which worked. But is=20 it the correct way? Regarding [2], I tried wrapping the program with XDG_DATA_DIRS, but=20 didn't work. Regards, RG. --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 --------------F3632A24415071FF50A6F033 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 cecc55c9100d5fd169975e059041fb5ddbcbb739 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 and ortp. * 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 | 68 ++--- .../linphone-desktop-without-sdk.patch | 235 ++++++++++++++++++ .../patches/linphoneqt-tabbutton.patch | 96 ------- 4 files changed, 274 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..981ff1f276 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,55 +818,62 @@ 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")) - (out (assoc-ref outputs "out"))) - (symlink (string-append liblinphone "/share/sounds") - (string-append out "/share/sounds")) + (let* ((out (assoc-ref outputs "out")) + (liblinphone (assoc-ref inputs "liblinphone")) + (belcard (assoc-ref inputs "belcard"))) + ;; 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 files= + ;; installed by the dependencies. + (symlink + (string-append liblinphone "/share/sounds") + (string-append out "/share/sounds")) + (symlink + (string-append belcard "/share/belr") + (string-append out "/share/belr")) #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) 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..63e9808bf4 --- /dev/null +++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch @@ -0,0 +1,235 @@ +From cfdf6d1c2051d6a20d0cbb94d81fe398f70dea4d Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sun, 21 Mar 2021 21:13:53 -0400 +Subject: [PATCH] [PATCH]: Fix building from git. + +--- + CMakeLists.txt | 73 +------------------ + linphone-app/CMakeLists.txt | 12 +-- + .../cmake_builder/additional_steps.cmake | 2 +- + .../linphone_package/CMakeLists.txt | 38 ---------- + linphone-app/linphoneqt_version.cmake | 1 + + linphone-app/src/config.h.cmake | 1 + + 6 files changed, 6 insertions(+), 121 deletions(-) + create mode 100644 linphone-app/linphoneqt_version.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..3e853bdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,16 +48,6 @@ 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") +- +-set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}= ${PREFIX_PATH}") +-string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +-#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PRE= FIX_PATH}") +- + # Avoid cmake warning if CMP0071 is not set. + if (POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +@@ -116,9 +106,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 +120,10 @@ 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}") + 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 +138,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..d06dcb74 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -200,44 +200,6 @@ elseif (APPLE) + endif () + # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.a= pp" DESTINATION "." USE_SOURCE_PERMISSIONS) + 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/../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 --------------F3632A24415071FF50A6F033 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 c0401a1978c3ef43b7b546750f865d949e38efd5 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 981ff1f276..b6cc35a494 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 --------------F3632A24415071FF50A6F033 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 bfe6a2341710491ab4fec48c0e059627410bbee1 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 b6cc35a494..6fd74bd878 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 --------------F3632A24415071FF50A6F033 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 7fbfc1506f601f8e26f35522b37b4ff5fe4d0b54 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 6fd74bd878..d14de08fc5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -900,8 +900,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 --------------F3632A24415071FF50A6F033 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 fa533c2d4ea4b0b5de9e602f411633433a58e808 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 d14de08fc5..28c914923c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -904,44 +904,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 --------------F3632A24415071FF50A6F033 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 5f17c2132cd7d36ebea030fe5a71aaf96ceb57d0 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 28c914923c..458825cc5e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -935,30 +935,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 --------------F3632A24415071FF50A6F033 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 5bd300da4840ee3acec507c78d06666b3e88e93f 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 458825cc5e..11d4a3343e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -965,32 +965,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 --------------F3632A24415071FF50A6F033 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 ff594dc1c83cdb6dd5661b03fbefe890d82b3e44 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 11d4a3343e..042cbec601 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1018,30 +1018,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 --------------F3632A24415071FF50A6F033-- --4BtKeto8GHYuQYmmPiYWZLnmKUuBxz2gr-- --0qOh56gYjOcbGopkeMm5crm9hATIqcNWd Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFgglwUDAAAAAAAKCRBfWBZkf4vlUWKf AQDFqD5AvLbPBy8IkqYqtQ2C7SQ2o6TCfhGVrwGJRBuanQD/Sof+D2WWMq2woH0oo/5YaoZE5STs zCIU8evDO3zRwA8= =z5Gs -----END PGP SIGNATURE----- --0qOh56gYjOcbGopkeMm5crm9hATIqcNWd-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 22 01:00:00 2021 Received: (at submit) by debbugs.gnu.org; 22 Mar 2021 05:00:00 +0000 Received: from localhost ([127.0.0.1]:55861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOCfY-0006pi-2V for submit@debbugs.gnu.org; Mon, 22 Mar 2021 01:00:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:40322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOCfV-0006pa-FG for submit@debbugs.gnu.org; Mon, 22 Mar 2021 00:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOCfV-0006Gf-5u for guix-patches@gnu.org; Mon, 22 Mar 2021 00:59:57 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:35489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOCfR-0005Jz-Sb for guix-patches@gnu.org; Mon, 22 Mar 2021 00:59:56 -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=1616389188; 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=qXEyiG6OAfrWYv5DEQ/+UMGHFIIVFOqLvJ9DMJWblC8=; b=BzBZwt3BdNdRK52yS/zoC+Kyy39vWdSyNPUe55LddOwL39Gm0yIIv45LDu05JpFXTYhuoA 5acUlGErcIWvP/4fLOoCq9lF+54vzuFBH4AyyDoZnBi52uOyxgTZZk1HKk50795xHbmuXv ug6jFNHb4Jexpgzzr0uELhe0bKNGpm/YESe+1I/n56JGqf0eAjNzsTNHyeAlFewFXvuK9n oUzw3KJQQgwYFBZe4+0gzwHjSHgsSFHecUmaT86ExzSgVM9uegbkUPg454+IoOUS3dg90/ MfwC86pE649CUe9pys5rMzkPVV0xh/zVMRxJeLM0KF9QfVnaD+re3GvH0CWTBA== From: Raghav Gururajan To: guix-patches@gnu.org References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Subject: Re: Linphone Packages Message-ID: <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> Date: Mon, 22 Mar 2021 00:59:46 -0400 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Il6rjJfJ4ZzmkfVpFum7ylsLACcChpQ6U" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=rg@raghavgururajan.name; helo=out0.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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Il6rjJfJ4ZzmkfVpFum7ylsLACcChpQ6U Content-Type: multipart/mixed; boundary="8i7boXQEstJDUDb4dGfcZMmp62b63yZww"; 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: <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> Subject: Re: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> In-Reply-To: --8i7boXQEstJDUDb4dGfcZMmp62b63yZww Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hello Guix! > Fixed it in the attached patch-set. The app works now. \o/ Spoke too soon. :/ New error now. > Anyway, I think we can do something for the following, w.r.t=20 > linphone-desktop: > [1] Warnings. Fixing them might prevent them to become errors. > [2] Better solution than symlinks in 'post-install phase. Because=20 > linphone-desktop should be able to read files in /lib and /share of=20 > *all* of its dependencies. Not just for those we made symlinks for,=20 > which is a temporary fix. >=20 > Regarding [1], for one of the warnings, I tried creating symlink=20 > "{linphone-desktop}/lib" --> "{liblinphone}/lib", which worked. But is = > it the correct way? > Regarding [2], I tried wrapping the program with XDG_DATA_DIRS, but=20 > didn't work. Looks like we need to do something about the [2]. The new error is=20 because of that. I can fix this new error with another symlink, but new=20 ones will keep happening. Context: The old error that I mentioned and fixed in my previous email is,=20 "[Error]Core:linphone: Could not load grammar vcard_grammar because the=20 file could not be located.". The new error I am mentioning in this email is, "[Error]Core:linphone:=20 Could not load grammar identity_grammar because the file could not be=20 located." Regards, RG. --8i7boXQEstJDUDb4dGfcZMmp62b63yZww-- --Il6rjJfJ4ZzmkfVpFum7ylsLACcChpQ6U Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFgkQgUDAAAAAAAKCRBfWBZkf4vlUQBr AQCeBC8mMLa4/bgHmjZq2/BdBRn1y+R1ghRO/BU3ff8oEQEAhkR7IJkDKe2KCYylLYEaWx/CJYIc RjvC6fyjhw0Zwgk= =W0fd -----END PGP SIGNATURE----- --Il6rjJfJ4ZzmkfVpFum7ylsLACcChpQ6U-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 23 22:25:44 2021 Received: (at 47274) by debbugs.gnu.org; 24 Mar 2021 02:25:44 +0000 Received: from localhost ([127.0.0.1]:33533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOtDM-0007Tm-2w for submit@debbugs.gnu.org; Tue, 23 Mar 2021 22:25:44 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:38640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOtDK-0007TU-Bt for 47274@debbugs.gnu.org; Tue, 23 Mar 2021 22:25:42 -0400 Received: by mail-qt1-f180.google.com with SMTP id j7so16553442qtx.5 for <47274@debbugs.gnu.org>; Tue, 23 Mar 2021 19:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=7UOneg1NK673RkmakvQ6bCzAR/JEOhzuDGHa4sBOb9A=; b=B1vG0Zpv21A9gxx+pw4qnQWn2enwi+5me7OvDoGW7G8wRlpDWaPi4IL7jC3bDe3WfL UN+SVonn8zk+pc9Mt4laqunRk4tvTGk4p4R4v3N4GisVYtkBf97jI8OafTuAOugSELp8 tAFY97l7tPxrN2257IBTTzawqQHWs1ik4LNLj0ZOzTRVL2j8Ik/8NnCBUqX9Gd7CKzkM zsi4DPIkPiEQE/2lKBhPC02BF5ZWA/GZuA9noap7npFCuWnv7KWOBgWRVJYyolvYTVO2 r6yr7wcmqkBHXvX43mkH0QyAaR2hd7/L9FDSVzuwcNUXofPDpZ+vpSEI3OhjcHC9q/X7 w5Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=7UOneg1NK673RkmakvQ6bCzAR/JEOhzuDGHa4sBOb9A=; b=EkMe4Jv65nuqejSE0PNSh+Pg8hE0SB+IMxXE3/VN/MuO5DZmCO4DDkp4L7ANh3Rwhk ILK6Cbmfa+GjqVzuD2KVkVURrW/p88xjFW7qSOT7E97ZVz8ufNkG4eXR8MfqGowd+jIy XeZcwYxnW6n7LXwmNb1UbKZfyAzKTx5Cmen5J4nQ7w1TpxswBuM+lyZgYCLhLIxXaK3Q KatAt4uEuKVy93qAs6UxWwt9C1xKUHakPnmy3dX9gP97L7Tq2fE+PsSOhhHmPxAVdpsQ EcHqHjv/bsyYNjUZZwJCg9HWqH78VyMvZZ3SRAI16RFqPNNXNmr/cRTp70/wa0N38SqU tV4g== X-Gm-Message-State: AOAM531vTbSA8zLLXcTkS0K10T8LrNzcr2JkmyMue0Skz1f8sR8+PBDs jJyTjknK7+rBcxKB+nvpseQ= X-Google-Smtp-Source: ABdhPJxTF0d4NprU4xzACRyodvxYuYqcvlaNhYeAofMfkclgS55+58E/cx3Y9mqEuii2E3bhtFuTzg== X-Received: by 2002:ac8:4e10:: with SMTP id c16mr1183476qtw.268.1616552736764; Tue, 23 Mar 2021 19:25:36 -0700 (PDT) Received: from hurd (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id d84sm704612qke.53.2021.03.23.19.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 19:25:36 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Date: Tue, 23 Mar 2021 22:25:35 -0400 In-Reply-To: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> (Raghav Gururajan's message of "Sat, 20 Mar 2021 00:26:42 -0400") Message-ID: <871rc5uw2o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Raghav Gururajan writes: > * 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)) > > +(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 "1ajgmyvc6a4m1h2hg1g4wz7ibx10x1xys9m6ancnmmf1f2srlfly")))) > + (build-system cmake-build-system) > + (outputs '("out" "python" "doc")) > + (arguments > + `(#:configure-flags '("-DENABLE_STATIC=OFF") > + #: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)) Ending phases with #t is no longer required on core-updates, and we can stop doing it on master and staging already too, to save us the hassle of editing them out at some later point in time :-) > + (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=" (assoc-ref outputs "python")) > + "--root=/")) > + #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))) This inputs field seems unnecessary, especially we don't want to add a dependency to Python 2, which is slowly being carved out of Guix. > + (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)))) I personally prefer the more compact (and common?) indentation of the licenses list as: (license (list license:expat ;library license:bsd-2)))) ;python bindings It's down to personal preferences, but I tend to value compactness in thousand lines long modules :-). I've made the following changes: --8<---------------cut here---------------start------------->8--- 1 file changed, 5 insertions(+), 15 deletions(-) gnu/packages/crypto.scm | 20 +++++--------------- modified gnu/packages/crypto.scm @@ -116,40 +116,30 @@ (("gmake") "make") (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") - "'..', '..', 'build', 'src', 'libdecaf.so'")) - #t)) + "'..', '..', 'build', 'src', 'libdecaf.so'")))) (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=" (assoc-ref outputs "python")) - "--root=/")) - #t)) + "--root=/")))) (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))))) + (copy-recursively "doc" dest))))))) (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)))) + (license (list license:expat ;library + license:bsd-2)))) ;python bindings (define-public libsodium (package --8<---------------cut here---------------end--------------->8--- And pushed as commit c221d49510. Thank you! Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 24 00:12:29 2021 Received: (at 47274) by debbugs.gnu.org; 24 Mar 2021 04:12:29 +0000 Received: from localhost ([127.0.0.1]:33713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOuse-0005uu-Kz for submit@debbugs.gnu.org; Wed, 24 Mar 2021 00:12:29 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:37702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOusc-0005ug-2P for 47274@debbugs.gnu.org; Wed, 24 Mar 2021 00:12:26 -0400 Received: by mail-qt1-f176.google.com with SMTP id f12so16698324qtq.4 for <47274@debbugs.gnu.org>; Tue, 23 Mar 2021 21:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=aRFAvTTVOem2J76QRKZtg+Mjboa6IaI0+d2K1Wrq1C4=; b=VGflbqMk7T8zkwINJ1lqPhyKbBCo+o3EOmnedKyz8tWPc7FUwMyaqX/Ykgp5ho3Xcb GrmYskc/8GL7yTTfW6PGcUbqQSNHLgmRZ6fFcnXRZHS4yPeCleZdRwWZTi6obJpWX+T1 gaI9WhlnAVdao6IeWPpNonnsWqlyfUKlGYrNq5HVWR2sC4tz3rkLJ712TdW7FnPVrJlZ Tmd0SBbpMGElZOj4pg8RhRuICASSgVu8HbBdNPVpQiBkViC6crI8vMCGppqwxXS6o2CJ alW5Xa6s2eMH1jRDKIIQSxOPq7T5RZ5p1UDv4xKXLXDx+8U/hDLXW8FthUBlqJm+9XAk hsTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=aRFAvTTVOem2J76QRKZtg+Mjboa6IaI0+d2K1Wrq1C4=; b=UNwUpLBhdv9ieZyH6ZAy0HxeogeNMwlVzO5q36AeCg7KGOLN7BKhh1GxIB8mQ37E2j r41i4Sup8Jl0psJu7VWqP/nUUnJeB4UebqTthFtyK/fOzAYGLKMPvbf38pHpWb94Q7+f MBTj2NLqxn2rf63AA6zJ32l+KWTqKz2eVTHGSXUne5D63N+i8piYzVkKXNMFNw7XKEFm M4LNhZABZTVWMxayNuM7EX+y6CyLczXpV8cdtrUnxDIX3ydTL26zouNfQO5ITI4GXpTC DbhZiMZLW7QdVrSmtaF9fIEg5afZQUR+5l+A75YdMJgG8FmLkFOVljwWxJtDJpslTpSQ IjSQ== X-Gm-Message-State: AOAM533oa6RhLoFKgTG3KMCRFzmlweyG+7og4Gsurct/Hycm8qy79zyG rXACSTchk0+GEbmHnvE6I2g= X-Google-Smtp-Source: ABdhPJxRQHLjHreLGYhOIfXWcfZ2eUIzIbvQGnGOV05v794RLK5xlM6EmYIeSqNGu4HQh60cavEcCA== X-Received: by 2002:ac8:7747:: with SMTP id g7mr1400047qtu.144.1616559140733; Tue, 23 Mar 2021 21:12:20 -0700 (PDT) Received: from hurd (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id k138sm825202qke.60.2021.03.23.21.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 21:12:20 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Wed, 24 Mar 2021 00:12:19 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87tup1tckc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, =?utf-8?Q?L=C3=A9o?= Le Bouter , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi again, Raghav Gururajan writes: > From 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. Nitpick: there should be no space between (bcunit) and [source]. > [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)) > > (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")) When not using an official release, a comment is in order to mention the reason; in this case something like: "Use the latest commit as there hasn't been a release in nearly 4 years." :-). Also, why start the revision number at 13? Perhaps the number of commits since the last tagged release? It's a detail, but since there was no revision used before for this package, I'd expect it to start at 0. > + (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=NO"))) ; Not required > + (native-inputs > + `(("perl" ,perl))) Seems Perl is not actually needed. > (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, ^ a > administering, and running unit tests in C.") > (home-page "https://gitlab.linphone.org/BC/public/bcunit") > - (license license:lgpl2.0+))) > + (license license:lgpl2.0+)))) > > (define-public bctoolbox > (package I ended up squashing all the bcunit changes in one, as I found it a bit too micro to manage. I've edited the result slightly, mostly taking out #t, the examples output (examples are doc after all): --8<---------------cut here---------------start------------->8--- 1 file changed, 18 insertions(+), 26 deletions(-) gnu/packages/linphone.scm | 44 ++++++++++++++++++-------------------------- modified gnu/packages/linphone.scm @@ -60,7 +60,7 @@ (define-public bcunit (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") - (revision "13")) + (revision "0")) (package (name "bcunit") (version (git-version "3.0.2" revision commit)) @@ -74,16 +74,14 @@ (sha256 (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b")))) (build-system cmake-build-system) - (outputs '("out" "doc" "example")) + (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_CURSES=ON" - "-DENABLE_DOC=ON" - "-DENABLE_EXAMPLES=ON" - "-DENABLE_TEST=ON" - "-DENABLE_MEMTRACE=ON") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_CURSES=ON" + "-DENABLE_DOC=ON" + "-DENABLE_EXAMPLES=ON" + "-DENABLE_TEST=ON" + "-DENABLE_MEMTRACE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -99,36 +97,30 @@ (("target_include_directories\\(bcunit_test PUBLIC Test\\)") (string-append "target_include_directories(bcunit_test PUBLIC Test)\n" - "target_link_libraries(bcunit_test bcunit)"))) - #t)) + "target_link_libraries(bcunit_test bcunit)"))))) (replace 'check (lambda _ (with-directory-excursion "BCUnit/Sources/Test" - (invoke "./test_bcunit")) - #t)) - (add-after 'install 'seperate-outputs + (invoke "./test_bcunit")))) + (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (example (assoc-ref outputs "example"))) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) (for-each mkdir-p `(,(string-append doc "/share/doc") - ,(string-append example "/share/BCUnit"))) + ,(string-append doc "/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))) + (string-append doc "/share/BCUnit/Examples")))))))) (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.") + (description "BCUnit is a fork of the defunct project CUnit, with +several fixes and patches applied. It is a 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+)))) --8<---------------cut here---------------end--------------->8--- I've also "normalized" the commit message in a way that I think is more typical. Arguments such as phases, configure-flags, and such are typically enclosed in a conditional marker (square brakets); e.g.: --8<---------------cut here---------------start------------->8--- gnu: bcunit: Update to 3.0.2-0.74021cc and enable more features. * gnu/packages/linphone.scm (bcunit)[source]: Switch to git repository. [version]: Update to 3.0.2-0.74021cc. [outputs]: Add a "doc" output. [arguments]: Remove the tests? argument, enabling tests. [configure-flags]: Enable curses, doc, examples, tests and memtrace. [phases]{patch-source, move-doc}: New phases. {check}: Override phase. [inputs]: Add ncurses. [description]: Fix typo. --8<---------------cut here---------------end--------------->8--- That's all very subjective, but hoping you get a feel :-). After having verified that bcunit's dependent packages could still be built fine and testing the resulting linphoneqt, I've pushed the squashed bcunit series as commit c2a9b05f02. Thank you! Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 24 21:55:40 2021 Received: (at 47274) by debbugs.gnu.org; 25 Mar 2021 01:55:40 +0000 Received: from localhost ([127.0.0.1]:36705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPFDn-0001se-NY for submit@debbugs.gnu.org; Wed, 24 Mar 2021 21:55:40 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:44578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPFDl-0001sR-OH for 47274@debbugs.gnu.org; Wed, 24 Mar 2021 21:55:38 -0400 Received: by mail-qt1-f175.google.com with SMTP id m7so596031qtq.11 for <47274@debbugs.gnu.org>; Wed, 24 Mar 2021 18:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=+97eqwiD63t6cvmmsGxyJeJbKN4Ibq+OBd9RgY5YONg=; b=KWusw/uX5AwsyZzeTxOf3unSHRyINcDVajvttbrYOEROMEntI5tOG1wHURyIe8Smlw oDWE2LsIzGxjO6AF0IqbnN9YhugD8tES0xCgC45zaNgJcJA0B4mhMCn250QHU4HoRVoO L3Q1VejalNgT8cB7y3K1FEoT+c3OdYctSq/Czfu1RWwa/XqAjRU8Vfd46qHfpY/gtibR 3ItolzEefC/RRiaLC2gu3ZyKClaG75HL1y4T37XDphSZQmf/nr+5uSwg29qDba148RJv zHnRr0XO+b2YjlIeiqMVrnRgBSHDGQDamHIv8n9Gq3NN5AFbsXD4vlvvtccM5o5MVgqe dSzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=+97eqwiD63t6cvmmsGxyJeJbKN4Ibq+OBd9RgY5YONg=; b=RTsv9G1R+anmvDRQMFpnmBWtX0AvH2ItvgK4BRE/39Wb0uKT9JLPITb2RSLqqN7xKU ep6eF8MgBc3kJRh9MbHCTEuTzIDrKVMI/MtjYyGGNrXj98z2rhdYzYxboFmdMTP6IGbp JZm1w/zUIjZ31/0X+19Xa8vAUwrJ4L1JqNIVuo3oLDFVkeFrxAbiblb3ntdHyYkhMhTB pBdeFycI/fR1Mrau1vEI0a2eOM3Jk1dNVgagzGLvaXFd2BlK0LSqYCtbkZN0dCk7/pmw J3HKqOTtdAwbgYYoGxIi6ucXq2gkMqzGsK3QWQ1jGs4u7DDFjZCYB9ReXojE/YEko/fG Jzuw== X-Gm-Message-State: AOAM533zWH6cXWkqoQWe4C3eiIwMNohWeD1AfAvTL71AS5oWLNg5h4r8 lgZc5IzR4UNOpPzRZP2mOT/wO/dmEbo= X-Google-Smtp-Source: ABdhPJzoEvPu4Ju8sXtxUhYq0zBpQmf2swIg2VJXJUZxxIupxHirGBFH0448OFKfu7FrcDIffXXRpA== X-Received: by 2002:ac8:7fc1:: with SMTP id b1mr5767617qtk.363.1616637331734; Wed, 24 Mar 2021 18:55:31 -0700 (PDT) Received: from hurd (dsl-156-46.b2b2c.ca. [66.158.156.46]) by smtp.gmail.com with ESMTPSA id r133sm3273787qke.20.2021.03.24.18.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 18:55:31 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Wed, 24 Mar 2021 21:55:30 -0400 In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> (Raghav Gururajan's message of "Sun, 21 Mar 2021 21:48:59 -0400") Message-ID: <87pmzot2st.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Raghav Gururajan writes: > * gnu/packages/linphone.scm (bctoolbox) [arguments]<#:phases>['patch-source]: 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 I've squashed the 3 bctoolbox commits together, adjusted the commit message as below: gnu: bctoolbox: Update to 4.4.34 and enable libdecaf, tests. * gnu/packages/linphone.scm (bctoolbox)[version]: Update to 4.4.34. [source]: Switch to git repository. [arguments]: Remove tests? argument, enabling tests. [phases]{patch-source}: New phase. {check}: Override phase. [inputs]: Add libdecaf. [license]: Update to GPLv3+. Signed-off-by: Maxim Cournoyer 1 file changed, 33 insertions(+), 10 deletions(-) gnu/packages/linphone.scm | 43 +++++++++++++++++++++++++++++++++---------- modified 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) @@ -127,28 +128,50 @@ writing, 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 "https://gitlab.linphone.org/BC/public/bctoolbox.git") + (commit version))) Used their HTTPS GitLab git here as its browsable; + (file-name (git-file-name name version)) (sha256 - (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6")))) + (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix decaf dependency (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/3). Added an issue upstream for the problem worked around here. + (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"))) + ;; The following test relies on networking; disable it. Mentioned this had to do with networking, which is inherent to the absence of networking in the Guix build container (otherwise it'd had been good to report the test failure upstream). + (substitute* "tester/port.c" + (("[ \t]*TEST_NO_TAG.*bctbx_addrinfo_sort_test\\)") Used .* to shorten the line below 80 chars ;-) + "")))) + (replace 'check + (lambda _ + (with-directory-excursion "tester" + (invoke "./bctoolbox_tester"))))))) (inputs `(("bcunit" ,bcunit) + ("decaf" ,libdecaf) ("mbedtls" ,mbedtls-apache))) (synopsis "Belledonne Communications Tool Box") (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+))) Can't be pushed yet as it breaks stuff. Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 25 09:07:25 2021 Received: (at 47274) by debbugs.gnu.org; 25 Mar 2021 13:07:25 +0000 Received: from localhost ([127.0.0.1]:37476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPPht-0006ip-8h for submit@debbugs.gnu.org; Thu, 25 Mar 2021 09:07:25 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:40640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPPhr-0006ib-44 for 47274@debbugs.gnu.org; Thu, 25 Mar 2021 09:07:23 -0400 Received: by mail-qk1-f176.google.com with SMTP id 7so1603138qka.7 for <47274@debbugs.gnu.org>; Thu, 25 Mar 2021 06:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=qAL09ZPp3L0nqOf74tIDpmZ2mHifXspog5706dRU5VA=; b=mq+xjtr9HHOjK/K48gSJn9WMCV5hNhoOZyUXL47Mh5QAGqWo+snD7WLvRdZrTVLxNl gzigAHaQcnJhximnv5s83qQye8/BWfmExqp598B0v9dtoWDrKBooAe0g8DocgXajvpVN iDWUdqmPzxQE8g6/mxMAEGNueRCy0ts/CatJ2dunaoDo/D4GWdn4oywf6vRold7IUsc9 FK3FU08UFJQr1bFbByHZ4p7gC9opvXMVvLswZNd9JDyvmQIvq7c7nE1bRA4+07tzD3CO IHo60HLCDESaYbLBa3AbgtZ7qApbYmURfJ6eecRg9sEcYZZU1F23GZRYNK2EaVB84nGx N8tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=qAL09ZPp3L0nqOf74tIDpmZ2mHifXspog5706dRU5VA=; b=gJ/szpwAKr3dBj0n0Ycpz6zakdqrQfCXK+3RpReUU8tu6FQEvT2vFIRIiX6QN4UlJg 7I7u5Mm7PLO6G9jZgbrhgJmUe2bPPtjLR+L6haYw5I8Fz9SCBQ6fEyOGR/7C49aVzkJL jc7GnizAVR4sL7plqf2mtQOLXTlO7nFP/i2Si7E6F6LfmE7b1ECOcmWjjZST/8pKvos7 bN9kvbGarL4kCve03DqgN4CAlGoL6vDRe1X54TITSbg9EpJ7cSb+BNT7RyGL8wK7ryoS 5kNREmXcCDb+CXR8WV/wb1SMmNIT2jJmQn0bK+7RinYhhOCfGEGcMYkFro9DJL/KTgK1 ubxQ== X-Gm-Message-State: AOAM533QBGVj7dU/eg4S9+YCGv4+pJSjRy1KGNLbhJxN50NsW9bEInId TKHh7y1Uc/whzOgA7kaJnXo= X-Google-Smtp-Source: ABdhPJzH4pSvemOqmgd2ZUsxVAOsEipuVAVtoThvIJFrUnXJE+NVpGG1xQqhop0VrbaM55Pn2HwM1A== X-Received: by 2002:a05:620a:13ec:: with SMTP id h12mr7742344qkl.460.1616677637576; Thu, 25 Mar 2021 06:07:17 -0700 (PDT) Received: from hurd (dsl-156-46.b2b2c.ca. [66.158.156.46]) by smtp.gmail.com with ESMTPSA id y19sm4055050qky.111.2021.03.25.06.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 06:07:16 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Thu, 25 Mar 2021 09:07:15 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87ft0js7p8.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, =?utf-8?Q?L=C3=A9o?= Le Bouter , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Raghav, Raghav Gururajan writes: > * 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=NO") > + "-DENABLE_STATIC=NO" > + "-DENABLE_TESTS=YES") > #: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) > -- > 2.31.0 > > From 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=NO"))) ; Not required > + (list > + "-DENABLE_STATIC=NO") > + #: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))) > -- > 2.31.0 > > From 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 I suggest squashing these into one patch like this: --8<---------------cut here---------------start------------->8--- 1 file changed, 13 insertions(+), 17 deletions(-) gnu/packages/linphone.scm | 30 +++++++++++++----------------- modified gnu/packages/linphone.scm @@ -363,15 +363,15 @@ such as conferencing.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/ortp") + (url "https://gitlab.linphone.org/BC/public/ortp") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) (build-system cmake-build-system) - (outputs '("out" "doc" "test")) + (outputs '("out" "doc" "tester")) (arguments - `(#:tests? #f ; Require networking + `(#:tests? #f ;requires networking #:configure-flags (list "-DENABLE_STATIC=NO" @@ -380,20 +380,16 @@ such as conferencing.") (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")) - (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)) - (rename-file - (string-append out "/bin") - (string-append test "/bin"))) - #t))))) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-4.4.0")) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p (list (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)) + (rename-file (string-append out "/bin") + (string-append tester "/bin")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) --8<---------------cut here---------------end--------------->8--- Was there a reason to version the doc using the hard-coded 4.4.0 version string rather than the package version? Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 26 22:13:12 2021 Received: (at 47274) by debbugs.gnu.org; 27 Mar 2021 02:13:12 +0000 Received: from localhost ([127.0.0.1]:43066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPyRr-00029D-VJ for submit@debbugs.gnu.org; Fri, 26 Mar 2021 22:13:12 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:44985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPyRp-00028z-ML for 47274@debbugs.gnu.org; Fri, 26 Mar 2021 22:13:10 -0400 Received: by mail-qt1-f179.google.com with SMTP id m7so5598075qtq.11 for <47274@debbugs.gnu.org>; Fri, 26 Mar 2021 19:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version; bh=GPXXp+sJHelArayMl+L/u7BnDsc9YQ7zdh7nTJ/3uHc=; b=NuF1tpzSl1SmJwKMwS8zrKvQ7/ecLbiVjE5+2NrzeB9IF9+PAh9YzZ3wDQWSczQlS6 AGI9GfHNDpes1AWS5wfiPfMsMMtZQ8kg2YreGIoNiJMCaL/wd6OO9OttKSeCD31DX8AP +fxx7cG/7jSftg10ENj8MKFmS9FA9FHcXXAPiyY4zGOMiFa6jpRlre2/45K5gIUVKWMs xa02gLi1x/nOQe38xSJAkwONFfw7OWBzV9oD9275fGkONPqd771yHU8ISDZmwBTGPGMw U2MWwrw1BfTH3CjHwsB1NkytEd9Zro8VnEX3wzkcZ3OZeLXxfvR86Kf8E8chXxkil5n2 xCTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=GPXXp+sJHelArayMl+L/u7BnDsc9YQ7zdh7nTJ/3uHc=; b=rAg6ZP1wD1JgYtP2cI9YitrKqXlT+10kWU6IQbi6cS3SPgxZEmLIrlrcEx1GiOGWgy 5k9wTTfq6sb3m70hWUengNb4jMgWH7lkrsRV3CzLQzGRkP15hJFHrfFR6Tgtjjj5IQyI YqSxNBhDR+4uaJAXwohZjRfNTO5hJbhCLkTYNUt5y9o42dAHCqnkz6gDP3EywUrU1Rls 0TLcM+Musgw3lfGw1cNiO/BVlbtE0kloVlqEKj/QmEYjTTBnIHOMul1EMyD9MOr5MXjz qkWEH/Ui6bUxy2f/xO7u0/jWDz8DOIViax1uaicext6sO3764KReU/Z5szZNhOgahJ76 Cj6Q== X-Gm-Message-State: AOAM530xhfqSfTv8HczObEQj8Np7LNZmBOMV2wWZggP3JQfBacNhKiFP CoBhHFE7/7llaF01xb/CSiWa20M8ky4= X-Google-Smtp-Source: ABdhPJyeW1Q3ZccjQ+DC4htXyYrkeum7d3YfbkkBBi5wffid7AHKXYRDbsI3mj7E+gOZitKLZ/R/oA== X-Received: by 2002:ac8:72c5:: with SMTP id o5mr1855937qtp.279.1616811183837; Fri, 26 Mar 2021 19:13:03 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id 124sm8057455qke.107.2021.03.26.19.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 19:13:03 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Date: Fri, 26 Mar 2021 22:13:01 -0400 Message-ID: <874kgxs5si.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, > From 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 repository. > [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 = \ > %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")) The change of the output name from tester to test seems arbitrary :-). I'd argue that "tester" makes more sense as this outputs contains a tester binary or command rather than a test suite. > (build-system cmake-build-system) > (arguments > `(#:tests? #f ; No test target > #:configure-flags > - (list "-DENABLE_STATIC=NO" ; Not required > - "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err > - "-DENABLE_BV16=NO" ; Not available > - "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" > - "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") > + (list > + "-DENABLE_STATIC=NO") > #: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. While it may seem obvious, I believe the comments helped the human brain keep track of the process flow more cheaply; please don't remove them. > - (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-name) > - (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 "/html") > - (string-append doc "/share/doc/" > - ,name "-" ,version "/html")) > - (delete-file-recursively (string-append out "/share/doc/" > - ,name "-" ,version > - "/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) I've squashed this one with the home page update and license change, as they are small and are related to the update. I still there's still stuff depending on this to be reviewed before it can be pushed, so I'm amassing a stack here... please be patient :-) Thank you, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 27 01:05:09 2021 Received: (at 47274) by debbugs.gnu.org; 27 Mar 2021 05:05:09 +0000 Received: from localhost ([127.0.0.1]:43149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQ18H-0006CP-9v for submit@debbugs.gnu.org; Sat, 27 Mar 2021 01:05:09 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:33344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQ18F-0006C8-P1 for 47274@debbugs.gnu.org; Sat, 27 Mar 2021 01:05:08 -0400 Received: by mail-qk1-f172.google.com with SMTP id o5so7516459qkb.0 for <47274@debbugs.gnu.org>; Fri, 26 Mar 2021 22:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=9HOMwzhOeaC/mesJuXlrUMsyusigzlbAQG7N/fh7D5E=; b=BDrlg0g7dFJuYsb9dGjnahvh69aEam66ofHzlfTs8UC7tp+JhKRVyGCCEN37EWcNfN ArXLCGSmpVREkUIRhAkN7XnNzdnGiBRFjbnjSp9AhDkuPCJr1UdYkFqEp1Rk7ElrbOlx Jjh1S3InA5r8kqjvFw9BC5IePAeFOZcOJ+OJScr/AnP8RQ0KNNcrU0qIM3tUZ77PJDXl OWAm0aC4CerdJogAZrczkRz39kjiInqXnbZmkZPU8ni1+7OLMw/1Qy6b6tGGUKGgZ/3n HSXOHU05KruIKaCV4qMCUsL01mkEY3yzYx9gq23HUwu5RwnCZ7V0B3aIyfc2+m26urTQ QonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=9HOMwzhOeaC/mesJuXlrUMsyusigzlbAQG7N/fh7D5E=; b=qo2EBh/yTaojkIjGFui4tVcPrHHG+sx/S8KrwfTc6ic/k5BNiB+4O2YUUdEYxyuAxS Bdac+7RDGAnSP547EYLxiVJSf0FW1Dsc4QYFSsNypk6sOZGfoqrIlwVVTEaj3r5w6u8U P+J92GNG6VbRBqpWhvZBCuwEzH3fiohIQUp7g1ePnz/16AI8LOIqn01JaspNUy6X7jHg QnFihUKbPf+OMTocVjxvlsq3RATzutPNSgDo4FmqC8s2wGEbA31RwpN206Ep+bHZ/BCe wsx8epJjFQYQ/acXb9CDUQCWG8eG36mEXjrj4vh18ZCmtBOD1q9H50Kg7v1//WcIZLET /vZg== X-Gm-Message-State: AOAM533wsrr/tygwt0Xoz9G4R+V7I86QDUXz1vkmHFfHKz6WfTjBv95o SOjrGP8+US+GPAsAzzRkuEYjsW/5VBY= X-Google-Smtp-Source: ABdhPJz9XWOVjyPA7AVywa5jdDc6uW2gmcBxNVezbFxeO7JdIkCYG7ZcrkOa98gv0pSMZ+vkH6kKVQ== X-Received: by 2002:a05:620a:14ae:: with SMTP id x14mr16267575qkj.237.1616821502172; Fri, 26 Mar 2021 22:05:02 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id z188sm8423735qkb.40.2021.03.26.22.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 22:05:01 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sat, 27 Mar 2021 01:05:00 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87zgypqj9f.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Raghav Gururajan writes: > Headers of soci has include-references to headers of these inputs. This explanation would be better kept as a comment in the code :-). > * 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} are: > (base32 > "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) > (build-system cmake-build-system) > - (inputs > + (propagated-inputs > `(("firebird" ,firebird) > ("postgresql" ,postgresql) > ("sqlite" ,sqlite) Otherwise LGTM. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 27 01:11:37 2021 Received: (at 47274) by debbugs.gnu.org; 27 Mar 2021 05:11:37 +0000 Received: from localhost ([127.0.0.1]:43153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQ1EX-0006Tf-0d for submit@debbugs.gnu.org; Sat, 27 Mar 2021 01:11:37 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:33728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQ1EU-0006TS-MO for 47274@debbugs.gnu.org; Sat, 27 Mar 2021 01:11:35 -0400 Received: by mail-qt1-f171.google.com with SMTP id 1so5133796qtb.0 for <47274@debbugs.gnu.org>; Fri, 26 Mar 2021 22:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=3ZaGWOZ2EOZbe1BLBcsaBRr/8ylM7AxyawBO/D1e1Vg=; b=a7HbB0xjCIrzV6hLedHYPtsztUVbyGGgESGB3U+6BqMj/bEpybXHFi68SAmFJZ6Z1h /fzbmkkJ2nit9EUaLY6AYWGtngqCp5WvAzh1OjUzFFKoRbxVycVWZrsR5ulz6eu5pwe8 CijvVAWvmdQ5Nfr1z8bu0bBGUHVeuhiNkLInr6Igr9IqKP0R9kaOh17syzUyG772Q1wU mQLDrwlXaNDxjd4qX/sq0yVBPypSdq///poxUbpg4bfl5xV3rC/KsC0YZGflweC7Mijv S2ADgZ1Yex9yOhGWf/a1kUWP66xl5eONM9xDNRu/cTr851/1KMIk76XnkrOozw2C3WCn MVAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=3ZaGWOZ2EOZbe1BLBcsaBRr/8ylM7AxyawBO/D1e1Vg=; b=nbi2Anjtci4CbebygIhbAkDQ0ZWVnhZ85TgvG0IEnopJ6af99VkfLSbNnGVZ5+3EOU /mCoY+sfp9fXOrzwZBIcjU/n3+KO/c0a34ZQY2+ELNte1A4nGAHIGQzHzEu0BHAWlGrc l5wx5FS2GNBQ1R0q+Jn0pB0q/34nIdh2sWvrz7eFtdP4fJp5VOH8MhzaIx9vK8i5tReu XCPw3DPb1QTWlNS0OzolsEGJRur27YKFtwoplcT0AYC0ckw/yCkAedBcJGp+pL5pls7O SlLUMJaAkTNtbIPn4q4cTWZH382/lvUkrvk3FXMvjgro/l4LvZA2ozuqFXJemVgsB9ls rcUQ== X-Gm-Message-State: AOAM532V/JPsrMa0A//RxDvhP8UTTC2VOfDifmT7a//UIZQuv/+sAU23 FINNClAt/Xg1TAvb0osFsHoz+tVdOVY= X-Google-Smtp-Source: ABdhPJwsb5WuvgGomSwrogfOV/AbDQAj/cTcDkywt6g3r+JOi/vkNtWL18gLtULpAqH+KdseDcLedg== X-Received: by 2002:ac8:5510:: with SMTP id j16mr14787942qtq.339.1616821889133; Fri, 26 Mar 2021 22:11:29 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id f9sm8221327qkk.115.2021.03.26.22.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 22:11:28 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sat, 27 Mar 2021 01:11:28 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87v99dqiyn.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Raghav Gururajan writes: > * gnu/packages/codesynthesis.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > * gnu/packages/codesythesis.scm (build): New variable. Why create a new module for this? We already have (gnu packages build-tools), which seem a good home. Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 27 20:52:47 2021 Received: (at 47274) by debbugs.gnu.org; 28 Mar 2021 00:52:47 +0000 Received: from localhost ([127.0.0.1]:45165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQJfb-0006kS-GJ for submit@debbugs.gnu.org; Sat, 27 Mar 2021 20:52:47 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:43698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQJfX-0006kD-D1 for 47274@debbugs.gnu.org; Sat, 27 Mar 2021 20:52:45 -0400 Received: by mail-qt1-f182.google.com with SMTP id s2so6958678qtx.10 for <47274@debbugs.gnu.org>; Sat, 27 Mar 2021 17:52:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=WGqSa8Z9acQfqJD7a6joGjc3RcbFqHBN1E3hNYuQoYk=; b=DGYXvIMQFa1L8z1lNqLF5iPoM12QtZkprVR2YGGcMnAuNubcEwRO5NEFPKtHbQsrvI z2nIDNJ8g0EXlFDqI/wYYsqCe+308sgsMbhijfYttkeMdls7f/GkpfGh2iLJm1ZXmO3+ R0jOfg3wwYtG6sCobUxgTShTUc6+w77QH/NOlNoUxqSwofjRiHkFSlK0fug55v27YGcG W4VuiFEyD9OIjzw2iQK43jILdLZdEiCrAP+5o+/pdHQURbM9S8mvspAgMlWFLJOgYRPu vLIk/q7uKv63rch1fHCi8hZIsMk2JdK0SrQxMhqGRN72LG/BqawD+3sdxXKTOmmR3A4z j5kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=WGqSa8Z9acQfqJD7a6joGjc3RcbFqHBN1E3hNYuQoYk=; b=i2/fo+0MYMq8OM6wD+5VQlWU/MFBWA6J6lkaDEDjkcCNSpSR4RBCJxyeXCYRLrxVdE zziRVthzUyBHf3jDVMBZRgc9tshFVgKK6x/NvQmtbmibwLJ6WI1EyfbQb9HOxVUA16iB jYwM3eYUYzxOme8atMy7K+DvYl/gdElb5FWTuuStNqBO1DbTsGJw4PFhtJwkqDBTt5Tr Yb2g5HKtVyp3bN6uhwvGeO/nmXLRtGTk4px6qwGgyYlg7zHyPZY7H+ZptgcI4yvEWwNk 8ZeZ3NHlIKR6ulB77nAmPL5OGsnE71Wb++XhFN6ZrTh+SyybuJh0NB656FfgsYfwbM8D Olgw== X-Gm-Message-State: AOAM5300HljgJurq4r25e0o2OrThAvqGVwVy9CApHrT7xh1GNQiv/5nI dLXzXx1Kdls8/ZEahT5tmNg= X-Google-Smtp-Source: ABdhPJwQr1/3YcvI3xDOmcXwVh2j3BegRZgFCg8Nm1ASLPd/YMDVYHHRPOqzeXODTTYlPsYWXCyyFg== X-Received: by 2002:ac8:519a:: with SMTP id c26mr17575349qtn.342.1616892757618; Sat, 27 Mar 2021 17:52:37 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id j13sm8272546qth.57.2021.03.27.17.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Mar 2021 17:52:37 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sat, 27 Mar 2021 20:52:36 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87o8f4qeuj.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, =?utf-8?Q?L=C3=A9o?= Le Bouter , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Raghav Gururajan writes: > From 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 parser, 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=" (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\\.names_end \\(\\), d\\);") > + "edge_dispatcher::iterate_and_dispatch (s.names_begin (), s.names_end (), d);")) > + #t)) What is the above substitution for? A comment would be helpful! Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 28 00:01:45 2021 Received: (at 47274) by debbugs.gnu.org; 28 Mar 2021 04:01:45 +0000 Received: from localhost ([127.0.0.1]:45276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMcS-0002r6-Pq for submit@debbugs.gnu.org; Sun, 28 Mar 2021 00:01:45 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:33723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMcO-0002qp-DX for 47274@debbugs.gnu.org; Sun, 28 Mar 2021 00:01:43 -0400 Received: by mail-qk1-f180.google.com with SMTP id o5so9381408qkb.0 for <47274@debbugs.gnu.org>; Sat, 27 Mar 2021 21:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=WzxIPr55cL9iZuJOFmuak1RkezZGF+y42Hw86jAfBR8=; b=ne0j/LRc3pXLS0JbDhHIPJQKUfo51iORM/RazD8B8S9GOaCM1j7849pLv6k5zXM0a5 t2CEss8Jwx1kdTiWdL2IQBMGfrqFPaJGFB5Kyt67IFboXpgUCiKbdqi4pZLVzrlQ1uri C9QLjq8S/inLtZDqC9WZSr0rj72SB1uQORCmoYO0yJAHrPNVNPYzYCWtNBzYmJA4D27o Plj1hfpva2TfwtJ3IgS7ziwlWW25nOdkrhCDGjUGFSeA4O3APeRYjOL9xy0sdzTmVdgy dp9/53PNBTp/m5oZIFJUxmJedpr1NwEUW0f44qFGXfzKSn70cJ8nlDfmvRFv33GRfJTV 5+gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=WzxIPr55cL9iZuJOFmuak1RkezZGF+y42Hw86jAfBR8=; b=lLBpAt8Ncz91KQlENRnTHAlHx99OPUDccDBkX1q5B3EOuO0KVhweAep1C68oxycxz6 RIk+1DngXJP6KZyptOWaZbbY8RoVPgPkPtggVBSzF4yWUGzZZn+eofOD3/smXVq3TiPn 8UR2cT7Zr2EBnctwdbJGOX4zRph8E79wiP4eDCq9d5qfEVh8hyFQ6MkpE4JSm/OZ4eRp OGkI0I9od0mH+EHuDXO5RqevlPz4dnxZ1pKA1dVGzGBVfW++pX5PhCxm7k7Jxy+C/voE 31RUfbp0ehCqPT9K9SYmSfMd4TFvw4bm9JHtackWY7qekpRHwTkIm53BcKZoSuq40LAP VuRw== X-Gm-Message-State: AOAM530/ZMkGmOEMLEdFVz+AfktwA8CHTyaL/4lmdDtgCrYrinHHQJER AkExL0HHuo7/s/hGfmKi7SFM1vYscUU= X-Google-Smtp-Source: ABdhPJxVGVj5WfEzS1TO1J6tAVFkgJ2zYQ8scZyRG+3qSyoEU7ozIc3jn0oyjfmeWSA/RwqbqHwYCw== X-Received: by 2002:a05:620a:1206:: with SMTP id u6mr19155319qkj.173.1616904094558; Sat, 27 Mar 2021 21:01:34 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id q2sm10279359qkq.59.2021.03.27.21.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Mar 2021 21:01:34 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sun, 28 Mar 2021 00:01:33 -0400 In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> (Raghav Gururajan's message of "Sun, 21 Mar 2021 21:48:59 -0400") Message-ID: <87czvkq63m.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Raghav Gururajan writes: > [39. text/x-patch; 0038-gnu-Add-build.patch]... I had an old package of build from 2020 with a more fleshed out description, so I've pushed that version instead as commit 65719505b8. > From 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 @@ > > (define-module (gnu packages codesynthesis) > #:use-module (gnu packages) > + #:use-module (gnu packages pkg-config) pkg-config turned out not to be needed. > + #: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)))) I removed the trailing #t. > + (build-system gnu-build-system) > + (arguments > + `(#:configure-flags > + (list > + "--disable-static" > + ;; "--with-external-boost" > + "--with-external-expat"))) > + (native-inputs > + `(("pkg-config" ,pkg-config))) Removed the native-inputs field. > + (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))) > -- > 2.31.0 And pushed as ae479f1834. > From 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)) I could turn this patch phase into a make flag: --8<---------------cut here---------------start------------->8--- #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils)) + #:make-flags (list (string-append "--include-dir=3D" + (assoc-ref %build-inputs "build") + "/include/")) #: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"))))) (delete 'configure) (replace 'install --8<---------------cut here---------------end--------------->8--- > + (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))) Removed pkg-config, which was not needed. > + (inputs > + `(("libcutl" ,libcutl) > + ("libxerces-c" ,xerces-c))) > + (synopsis "XSD Front-end") > + (description "@package{libxsd-frontend} is a compiler frontend > for the W3C Replaced @package by @code, as the former is not valid Texinfo markup. > +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+))) > -- > 2.31.0 And pushed as 111004cc58. > > From 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"))) I used the same --include-dir make flag trick here. > + (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)) Dropped the #t, added a comment and added the prefix to the default regexp group bound to 'all', like this: + ;; Add the namespace prefix, to avoid errors such as "error: + ;; =E2=80=98iterate_and_dispatch=E2=80=99 was not declared in= this scope". + (substitute* (find-files "." "\\.?xx$") + (("add \\(typeid \\(type\\), \\*this\\);" all) + (string-append "traverser_map::" all)) + (("iterate_and_dispatch \\(s\\.names_begin.*;" all) + (string-append "edge_dispatcher::" all))))) > + (delete 'configure)))) > + (native-inputs > + `(("build" ,build) > + ("pkg-config" ,pkg-config))) Removed pkg-config, which was not needed. > + (inputs > + `(("libcutl" ,libcutl))) > + (synopsis "Command Line Interface (CLI) definition language") > + (description "@package{cli} is a domain-specific language (DSL) > for defining s/@package/@code/, as for the previous package. > +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))) > -- > 2.31.0 And pushed as commit f649a0a557. > > From 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 @@ > > (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)) I added a doc output to hold the multi-megabyte documentation and examples and used the same make flag trick to allow finding build-0.3 files: + (outputs '("out" "doc")) ;3.8 MiB of doc and examples + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=3D" + (assoc-ref %build-inputs "build") + "/include/") + (string-append "install_prefix=3D" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-doc + (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/xsd") + (string-append doc "/share/doc/xsd-" + ,version))))) + (delete 'configure)))) > + (delete 'configure)))) > + (native-inputs > + `(("build" ,build) > + ("cli" ,cli) > + ("pkg-config" ,pkg-config))) Dropped pkg-config here as well. > + (inputs > + `(("libcutl" ,libcutl) > + ("libnsl" ,libnsl) > + ("libxsd-frontend" ,libxsd-frontend))) > + (propagated-inputs > + `(("libexpat" ,expat) > + ("libxerces-c" ,xerces-c))) I removed expat from propagated-inputs, as the xsd generated code default to using xerces-c. Someone wanting to use expat could add it manually. I've also added a comment like this, as it was not clear to me initially why propagation was useful: (propagated-inputs ;; The code XSD generates requires the following library at run time; ;; propagate it for convenience. `(("xerces-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 and > +event-driven C++/Parser.") > + (home-page "https://codesynthesis.com/projects/xsd/") > + (license license:gpl2+))) For this package, I also had an unfinished version locally; the description was slightly more accurate, with an extra comment for the license: + (synopsis "XML Data Binding for C++") + (description "CodeSynthesis XSD (also known as libxsd or xsdcxx) is an= XML +Schema to C++ data binding compiler. Provided with an XML instance +specification (XML Schema), it generates C++ classes that represent the gi= ven +vocabulary as well as XML parsing and serialization code. The data stored= in +XML can then be accessed using types and functions that semantically +correspond to an application domain rather than dealing with the intricaci= es +of reading and writing XML.") + (home-page "https://codesynthesis.com/projects/xsd/") + ;; Exceptions are made to allow using the generated source files as we= ll + ;; as the libxsd library in free software projects whose license is + ;; incompatible with the GPL v2. Refer to the file named FLOSSE for t= he + ;; details. So I've used those parts and pushed as commit 510e24f973. Phew. I've now reached the core bits of the review, to be continued. Thanks :-) Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 28 00:05:50 2021 Received: (at 47274) by debbugs.gnu.org; 28 Mar 2021 04:05:50 +0000 Received: from localhost ([127.0.0.1]:45281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMgP-0002x4-UB for submit@debbugs.gnu.org; Sun, 28 Mar 2021 00:05:50 -0400 Received: from out1.migadu.com ([91.121.223.63]:59815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMgM-0002wr-Ia for 47274@debbugs.gnu.org; Sun, 28 Mar 2021 00:05:49 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616904345; 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=JS24+LoXY06Z4Sj/T7Pvi7KyszfVGJG6JLJ2IGNdnzQ=; b=Wyb8+3sEoa8JUXXaOGf/ylXZPpT+YxvzMVofVcwrKQBM302yrPFEWPLwKMWAsc/FEtjWoC kmhnNeTe0TMGO6y8T5GfKzReLR+rNfZKWugQxRX+k2FzQvTsrFs0ZcayL5MvfYbj76dj3O /XDqAm+WJi1acFSfXAEHeNExvjLUe/6XOphmXfqGmXBZM17jdrF4RZcPzNa/EadTtzlVle wcBvX/Wytwdoc8nW0Ff+1qXUSlNKQ+8jiVAixenkuK7X+TDL5pDSSeOsCJbTskUOIAQR+t 1A04mckWwYug8hbg3EHKuiwW2gsMC+LkF4JKtYjvoiSAIxJ4RiUwiHMgEHxcug== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Sun, 28 Mar 2021 00:05:42 -0400 MIME-Version: 1.0 In-Reply-To: <87v99dqiyn.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="EXVKK0iz2DuebdC8gLCFmdJ6CB6KtlqmP" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EXVKK0iz2DuebdC8gLCFmdJ6CB6KtlqmP Content-Type: multipart/mixed; boundary="NhT6LT8nJDdpFmzZXeJ5WcVsfBqS4mz2q"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> In-Reply-To: <87v99dqiyn.fsf_-_@gmail.com> --NhT6LT8nJDdpFmzZXeJ5WcVsfBqS4mz2q Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Maxim! > Why create a new module for this? We already have (gnu packages > build-tools), which seem a good home. The idea is similar to suckless.scm and linphone.scm. This project has=20 produce multiple software, which are often inter-connected and/or=20 inter-dependent. So created dedicated module for this project 'Code=20 Synthesis'. Also, I will be adding more of their packages to this module. Regards, RG. --NhT6LT8nJDdpFmzZXeJ5WcVsfBqS4mz2q-- --EXVKK0iz2DuebdC8gLCFmdJ6CB6KtlqmP Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGAAlgUDAAAAAAAKCRBfWBZkf4vlUQIw AQC1ZzGgEYaGK8CGCnGZgwERE6Jwtrc9XYGpw6J4Je7P4QEAz4ve6+MfbwcXU3EhLMYC6T6wDlld aGwpO0eLKUjyMw8= =OXGf -----END PGP SIGNATURE----- --EXVKK0iz2DuebdC8gLCFmdJ6CB6KtlqmP-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 28 00:43:31 2021 Received: (at 47274) by debbugs.gnu.org; 28 Mar 2021 04:43:31 +0000 Received: from localhost ([127.0.0.1]:45307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQNGt-0003pZ-H2 for submit@debbugs.gnu.org; Sun, 28 Mar 2021 00:43:31 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:46079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQNGq-0003pK-G3 for 47274@debbugs.gnu.org; Sun, 28 Mar 2021 00:43:30 -0400 Received: by mail-qt1-f182.google.com with SMTP id u8so7132660qtq.12 for <47274@debbugs.gnu.org>; Sat, 27 Mar 2021 21:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kFZGqUP7Wm8M7AW8s9tCLAPWfDQss3Qli5YV3TGQfu8=; b=d+fulfXmsCh4sx8aDMuwLGscAURNME+w6Gr5NXP93Zrp1fZ8dRzq7SjJtpRdnQb5Hf e3tnfANAFDvE1eVlYNSvSiJiJqhM2FD50FuUXs4d4qqqtCbnMz2eNfeLFd9BPGtjTChx tC3qZ1YWh/c7oT14TWmKdJ+Jo1zKaimqwPOVxrU4aJVEM+G2JZoKF2bh8su2nlG8ib55 qNoZtWcNvpwPYj9y2AV+KAZOoHsqycWtA5WEofhW4faGYEy///HN4csFDWqh3cEXKc1Y dzqcRI1ikuFUwgx10JyGqPOjJ7W4aoQ2+5c+B1mjQdNRc99bhM97rJreK9BtshGKvCqs 8jgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kFZGqUP7Wm8M7AW8s9tCLAPWfDQss3Qli5YV3TGQfu8=; b=HKLGJAxuPQxCHpicQyb3WdKhxpXcQWZUDw7JveRjPtwdwUaFn1lMkXSJzkh9pnSACl KvhkYMbKq/D2JsTQuO3LVNkkc1M2m9Kcy8y9wOPUHCRhkaWVLXefHf/DVixnoM4oPWJT 2crvR/iR62YP3zfLnTm6HrBvlTrXzwaUzNP0WnAGoYiSkdGDfbosZv6nDvAmJ9F4jpIR m00klLOQHeYc7SytBrvLa4RuIGpfbMy95/YX4u4hv5qsjurYzctbySsDqQyNKV4hJyGx /TNnybmnWsQaVJgnmL2J2ygjgsvxu+BapdFpT1VzZkQPoOFBfCfXCCu8QxODuREMYG4i x9LA== X-Gm-Message-State: AOAM532alrcMhMKY8LfDXqDJfGDxXeLGTRPEoDPz0eUP+EPTkfYptHtP 61b4uGkMLem0gw2h7JYQemeTxdjEdvk= X-Google-Smtp-Source: ABdhPJxuh/LXkl3vG2Wx6oOg3jWFBzR/9RGvfdG/BlhUkC0CdTdlH/acKSgBosel+errDaNjshTynA== X-Received: by 2002:ac8:70c5:: with SMTP id g5mr3530712qtp.246.1616906602842; Sat, 27 Mar 2021 21:43:22 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id f12sm8798151qti.63.2021.03.27.21.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Mar 2021 21:43:22 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> Date: Sun, 28 Mar 2021 00:43:21 -0400 In-Reply-To: (Raghav Gururajan's message of "Sun, 28 Mar 2021 00:05:42 -0400") Message-ID: <875z1briqe.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Raghav, Raghav Gururajan writes: > Hi Maxim! > >> Why create a new module for this? We already have (gnu packages >> build-tools), which seem a good home. > > The idea is similar to suckless.scm and linphone.scm. This project has > produce multiple software, which are often inter-connected and/or > inter-dependent. So created dedicated module for this project 'Code > Synthesis'. > > Also, I will be adding more of their packages to this module. > > Regards, > RG. OK, thanks for the answer. As I've answered on IRC, so far, the (gnu packgaes cpp) module seems sufficient; it's a relatively small module itself. The problem I see with having codesynthesis as a module is that it'd be misleading as a module name: not all their tools are about code synthesis (that's their company name, but that's not obvious! I got confused that way when first looking at your patch series). I've merged the codesynthesis packgaes in the cpp module already; if it becomes a problem we can revisit this choice. Thank you, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 00:03:27 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 04:03:27 +0000 Received: from localhost ([127.0.0.1]:47449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQj7e-0006zT-Ve for submit@debbugs.gnu.org; Mon, 29 Mar 2021 00:03:27 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:47095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQj7b-0006z4-Tn for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 00:03:25 -0400 Received: by mail-qk1-f171.google.com with SMTP id z10so11264786qkz.13 for <47274@debbugs.gnu.org>; Sun, 28 Mar 2021 21:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=eSII+/BKXXY3ZF2BwlKh5ZPihF4gRBLAChskRoVLp0k=; b=iQjGvTgrYVPj6npa+I/uEJXUggoHTnSO09MwneKzyeMLdkTgsM9JGt4r1Lv5MF65+0 gNjMjLuXr+Qi+hBHFecjwiq1zblBTZRtVRZHY/h3owNAlUv4WdLapWrR88AGA+HAxCTq x6VdpRrVXrpFikVejgWnnWPjJH3RCuZKE1wU7+WHIrWkRKTvQwQCd31Pr3nBTdn/Haek ws5l+81cAAKEK8S53hcSesA1Hq7TfwpQD/EmuOZlMUURJrMAfaSQ27iQT3R7QtKZjJ2M E3sphlK0oKmu2cANIKWhb/3Ey6sW32hp0YG9nPayU07V+l8fHg47f+7xJhk7wYC4iMAZ Agjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=eSII+/BKXXY3ZF2BwlKh5ZPihF4gRBLAChskRoVLp0k=; b=Nbi5uwP5DymsGEQphF1s9As0xAeboAEI2Q9YbX6JSnpF5JJjMPJ00QLjN7RKI94z3G KOaxNSGbsQhIDODGEA+vn9QcjXUxZHRO9qnZsJ2iy488cNOfq91nA9I699sBD9J/5tLh Iiv1zpwr3kspJ0Fq8zmDi9XwYWou2sJ0nOuoCtjmowJBqQhBt118sWwoly4toaQ6dcts Mt5VU2Bu7/+9WimmZMEQBeZxtvVo6V8tkaa5NPHifGZuIH4klegJq2vRWr0PyonhCE1x VfYJDLkTWvoPFctkjF0JBGeBfrRHQT3r5joZbLN1eTDAedNli7Em1wKQZ7aelN4tOJWU cMcA== X-Gm-Message-State: AOAM53326p3kZfaMFgnYV/G2yFdQov/CWzThmKDm03ZUa/+ileuZkof3 n5KcDPrVHaqfP/04gifBOse84P0kU7o= X-Google-Smtp-Source: ABdhPJwgLeJU3ukEznWFxyRi2arCTBAB9lx/7EMxjrLto2vbyzAGPARgN+PxiceS0tAxeCBjm5POSQ== X-Received: by 2002:ae9:e641:: with SMTP id x1mr23660641qkl.69.1616990598149; Sun, 28 Mar 2021 21:03:18 -0700 (PDT) Received: from hurd (dsl-155-113.b2b2c.ca. [66.158.155.113]) by smtp.gmail.com with ESMTPSA id a10sm12383141qkh.122.2021.03.28.21.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 21:03:17 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> Date: Mon, 29 Mar 2021 00:03:16 -0400 In-Reply-To: <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:59:46 -0400") Message-ID: <871rbyd2t7.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Raghav! Raghav Gururajan writes: > Hello Guix! > >> Fixed it in the attached patch-set. The app works now. \o/ > > Spoke too soon. :/ > > New error now. > >> Anyway, I think we can do something for the following, w.r.t >> linphone-desktop: >> [1] Warnings. Fixing them might prevent them to become errors. >> [2] Better solution than symlinks in 'post-install phase. Because >> linphone-desktop should be able to read files in /lib and /share of >> *all* of its dependencies. Not just for those we made symlinks for, >> which is a temporary fix. >> Regarding [1], for one of the warnings, I tried creating symlink >> "{linphone-desktop}/lib" --> "{liblinphone}/lib", which worked. But >> is it the correct way? >> Regarding [2], I tried wrapping the program with XDG_DATA_DIRS, but >> didn't work. > > Looks like we need to do something about the [2]. The new error is > because of that. I can fix this new error with another symlink, but > new ones will keep happening. > > Context: > The old error that I mentioned and fixed in my previous email is, > "[Error]Core:linphone: Could not load grammar vcard_grammar because > the file could not be located.". > The new error I am mentioning in this email is, "[Error]Core:linphone: > Could not load grammar identity_grammar because the file could not be > located." > > Regards, > RG. I think I've managed to fix the issue, with the following: --8<---------------cut here---------------start------------->8--- (let* ((out (assoc-ref outputs "out")) (liblinphone (assoc-ref inputs "liblinphone")) (grammar-dest (string-append out "/share/belr/grammars"))) [...] (mkdir-p (dirname grammar-dest)) (symlink (string-append liblinphone "/share/belr/grammars") grammar-dest) --8<---------------cut here---------------end--------------->8--- At least it launches now, and everything seems to work. Will submit it soon! Thank you :-) Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:07:30 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:07:30 +0000 Received: from localhost ([127.0.0.1]:47499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQk7d-0000DQ-Oe for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:07:30 -0400 Received: from out2.migadu.com ([188.165.223.204]:42376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQk7b-0000DG-CO for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:07:28 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616994445; 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=Ry/yoBeK2oJrHzOVHWqVGBjOdu+M6JVI2OfSIvDWlRY=; b=egNyxLS6ZSpZn1ThwcW591H0t9zn1LPQaVMidPrF2JS3hWn3e2ypWpAU7SV8fU9meqfpmw AJrn3SHl68u7kBuKsp9kzSd2ovKX7rzT8LaewBwp1byl8jFnx2exu/lb84fbcTi7nTN9T3 SWu12SMPKEnRSLm6uqr7gSTpIFp8ATXkXvgBe594vejyEilmdmeZ/Z2ZdSsr7DhDaV1MYp KJgBPOvFDHxLQ3sc7WhseNrjfZ/t8wwJQF0oocstJUcmDvUMDmFGWbr+w4Iod/A0l00JDN Q1Ir7GZ0VFBaL0YZaBBoUV0/YdkT+71cfc4XI2oI2/2DhSihObTE7X6RomewIw== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <871rc5uw2o.fsf@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Mon, 29 Mar 2021 01:07:23 -0400 MIME-Version: 1.0 In-Reply-To: <871rc5uw2o.fsf@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="1aOorbockfFLyrV5SHfNdU0dQUk7HaA1c" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1aOorbockfFLyrV5SHfNdU0dQUk7HaA1c Content-Type: multipart/mixed; boundary="64Wl4D6JFtSbOv4FjGNnCLbFAZdpBuvKN"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org, Danny Milosavljevic Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <871rc5uw2o.fsf@gmail.com> In-Reply-To: <871rc5uw2o.fsf@gmail.com> --64Wl4D6JFtSbOv4FjGNnCLbFAZdpBuvKN Content-Type: multipart/mixed; boundary="------------73FBA2CBF5133714CABC462F" Content-Language: en-US This is a multi-part message in MIME format. --------------73FBA2CBF5133714CABC462F Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > Ending phases with #t is no longer required on core-updates, and we can= > stop doing it on master and staging already too, to save us the hassle > of editing them out at some later point in time :-) Agreed. > This inputs field seems unnecessary, especially we don't want to add a > dependency to Python 2, which is slowly being carved out of Guix. Makes sense. > I've made the following changes: >=20 > --8<---------------cut here---------------start------------->8--- > 1 file changed, 5 insertions(+), 15 deletions(-) > gnu/packages/crypto.scm | 20 +++++--------------- >=20 > modified gnu/packages/crypto.scm > @@ -116,40 +116,30 @@ > (("gmake") > "make") > (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") > - "'..', '..', 'build', 'src', 'libdecaf.so'")) > - #t)) > + "'..', '..', 'build', 'src', 'libdecaf.so'")))) > (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 output= s "python")) > - "--root=3D/")) > - #t)) > + "--root=3D/")))) > (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))))) > + (copy-recursively "doc" dest))))))) > (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 ellipt= ic curve > cryptography using the Montgomery and Edwards curves Curve25519, Ed25= 519, > Ed448-Goldilocks and Curve448, using the Decaf encoding.") > (home-page "http://ed448goldilocks.sourceforge.net/") > - (license > - (list > - ;; Library. > - license:expat > - ;; Binding. > - license:bsd-2)))) > + (license (list license:expat ;library > + license:bsd-2)))) ;python bindings > =20 > (define-public libsodium > (package > --8<---------------cut here---------------end--------------->8--- >=20 > And pushed as commit c221d49510. Thank you! Regards, RG. --------------73FBA2CBF5133714CABC462F Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------73FBA2CBF5133714CABC462F-- --64Wl4D6JFtSbOv4FjGNnCLbFAZdpBuvKN-- --1aOorbockfFLyrV5SHfNdU0dQUk7HaA1c Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFgiwUDAAAAAAAKCRBfWBZkf4vlURt+ AQDlkn2+4eSx85ACsdUSVWcX8m8P4FRlHFJKhkTXkmgN9QEA3kU5CkfecemSE1oIPABsgHGwrBzO SuCcs7Kh14DevA4= =EZ51 -----END PGP SIGNATURE----- --1aOorbockfFLyrV5SHfNdU0dQUk7HaA1c-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:14:01 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:14:02 +0000 Received: from localhost ([127.0.0.1]:47504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkDx-0000PL-Hr for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:14:01 -0400 Received: from out0.migadu.com ([94.23.1.103]:55935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkDv-0000Oy-6n for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:14:00 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616994837; 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=kdpsdYvQxUDN2c7irYMKcoLpwksJn3AU1KdWPqlhHr0=; b=ImzsjDyXCb1BiljEjwah5x5aD2RIh9Bv71vgvNQ7TRikiHEfKimQqIhVNP/u7545J4hGo8 hK0fyGFixUKpUkL8uHwmMgSYGSvd8H2ASf3wx8kTTf71ZpbSO0MIl0vmr0+TtvDpVpiRfo p8GTC1i2hLRC0dyYy4GiiFfghXI218sTa7ybjrSUder26fqtyEQ3wWbZ66rH9gTo2MfUCw zySKlxwrLgIZcSDQK4qMjvNsDvREer43Qgadf9Ql/i3pz/i3ZNyGr1ch82rqu2+mlS1uNx IU2hRoAFqu9cRPUbV6IEtHbrqQwEr+2bYF4VCiMLVHJAYGN02uL8dObk/wK7yA== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87pmzot2st.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Mon, 29 Mar 2021 01:13:55 -0400 MIME-Version: 1.0 In-Reply-To: <87pmzot2st.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="i8d8sJJ40hOlUBMfCW37iAwsIt6ZGcB5b" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --i8d8sJJ40hOlUBMfCW37iAwsIt6ZGcB5b Content-Type: multipart/mixed; boundary="iiVz8uuaLENVyewWxUztcedzLs6CmVaLz"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87pmzot2st.fsf_-_@gmail.com> In-Reply-To: <87pmzot2st.fsf_-_@gmail.com> --iiVz8uuaLENVyewWxUztcedzLs6CmVaLz Content-Type: multipart/mixed; boundary="------------9810978D1958BC183E628074" Content-Language: en-US This is a multi-part message in MIME format. --------------9810978D1958BC183E628074 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > I've squashed the 3 bctoolbox commits together, adjusted the commit > message as below: Thanks. > Used their HTTPS GitLab git here as its browsable; Okay. I prefer git://git.linphone.org, as it is generic and not tied to=20 specific platform and will even work when upstream moves to another=20 platform like gitea etc., but no big deal. > Added an issue upstream for the problem worked around here. Cool. > Mentioned this had to do with networking, which is inherent to the > absence of networking in the Guix build container (otherwise it'd had > been good to report the test failure upstream). Makes sense. Regards, RG. --------------9810978D1958BC183E628074 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------9810978D1958BC183E628074-- --iiVz8uuaLENVyewWxUztcedzLs6CmVaLz-- --i8d8sJJ40hOlUBMfCW37iAwsIt6ZGcB5b Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFiEwUDAAAAAAAKCRBfWBZkf4vlUZ6e AP9gnmHor1rxXZJeQUDbFmaMreIvm2ummkZ2GyMcUXiGkQD6ArToZzxK0YHLo/a6MNF4flmWyH6f adFsAFth5f1Rvgs= =NBPj -----END PGP SIGNATURE----- --i8d8sJJ40hOlUBMfCW37iAwsIt6ZGcB5b-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:16:45 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:16:45 +0000 Received: from localhost ([127.0.0.1]:47511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkGb-0000U2-1l for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:16:45 -0400 Received: from out0.migadu.com ([94.23.1.103]:56345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkGY-0000Tt-OP for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:16:43 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616995002; 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=Jstd6q3aPc4/PPaTQjySYE8aoSz8eqY383PX4J/uidQ=; b=ttKNl7IuonzspDDdMpTRChgwoei5yHAzdpXqKaVYg3FMNRTSd39NhloGVaUM5RaVU6ZDRw cP5uUHXUb8wAFifsVBwCJOUgr8ycnG41hzK5bcz1iZZTTjOmON+BbINdHeX8fcwa7P/CXD a1k7jeRkxQ2phziRGuWn6gOINNbj0R00hSsRIUdgd5Uk+olTF9GoEoUzeUQMhPD41U6bCe QfQVCzBinnFC01jqz3ZLFeBaJN006VGGXyTjSXvAvw841BhOZ4+E0WiiIAdVs2VqG2XC0b yu8QXyXh+1uWrphqHJ78VqbZod7r+VnH/2DoceaGyJIklhyK4sonT563Hk/l2Q== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87ft0js7p8.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: <59826c4e-d036-e667-7172-6560a6cdab9f@raghavgururajan.name> Date: Mon, 29 Mar 2021 01:16:40 -0400 MIME-Version: 1.0 In-Reply-To: <87ft0js7p8.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WsIdT4xAvJFrK01yiTdC8ymnNAIL9jean" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WsIdT4xAvJFrK01yiTdC8ymnNAIL9jean Content-Type: multipart/mixed; boundary="gZMyd8DzDZ2xHy8rbwpvNvRnU96Fozdig"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org, Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: <59826c4e-d036-e667-7172-6560a6cdab9f@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87ft0js7p8.fsf_-_@gmail.com> In-Reply-To: <87ft0js7p8.fsf_-_@gmail.com> --gZMyd8DzDZ2xHy8rbwpvNvRnU96Fozdig Content-Type: multipart/mixed; boundary="------------8E427EC14DB27B539E3E58AC" Content-Language: en-US This is a multi-part message in MIME format. --------------8E427EC14DB27B539E3E58AC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > I suggest squashing these into one patch like this: Cool. > Was there a reason to version the doc using the hard-coded 4.4.0 versio= n > string rather than the package version? This package used the version-series (4.4.0), instead of version-string=20 (4.4.X). Regards, RG. --------------8E427EC14DB27B539E3E58AC Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------8E427EC14DB27B539E3E58AC-- --gZMyd8DzDZ2xHy8rbwpvNvRnU96Fozdig-- --WsIdT4xAvJFrK01yiTdC8ymnNAIL9jean Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFiuAUDAAAAAAAKCRBfWBZkf4vlUU1a AQC1Wv3kLLC5eGTYF5tEnjXsek/Kv06tbVqU+f2h8DRbtQD+KEDgzVfrewf/1YM22/cZTzt53Y2a eXII59rItv8iiQI= =B3o0 -----END PGP SIGNATURE----- --WsIdT4xAvJFrK01yiTdC8ymnNAIL9jean-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:19:17 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:19:17 +0000 Received: from localhost ([127.0.0.1]:47515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkJ2-0000Xz-Es for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:19:17 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:42638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkIz-0000Xi-ST for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:19:15 -0400 Received: by mail-qk1-f170.google.com with SMTP id y5so11375423qkl.9 for <47274@debbugs.gnu.org>; Sun, 28 Mar 2021 22:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=DbPQIidfq0MFM1zgqjSi8gQh2nroWzApfFzUxpmu63U=; b=avc5p54o31rOzDgJj9on3MsNWYKFCKFW5JBj9oH7eUTYsv4gOXbMxpQ/NHgXnp5Gbr 908oqv3y3aP3VeHFso6WnuZ9uFVxp2hZy1ftmiQcbMX/ItXIhQFgK529vR8aEJJrT9Yp Y+vslDJx5+xolzzkQBTLalN7NnGS5xWikPEedxS4t2Tnl6ixNTcKVBvA4kf52xWSU4d0 4aMMq/xo5DFltHXWgni2ro2X0fgEnV1yYimOmu0zvhbc+GS/sWjSdjY61hiTQkKdY/yE D4lPMXQDVsNXFkFGYvpm5JcU9UcN3cxdGwhaKAeWQZxB4ujMrjrKMuL1uV6a+obnqhpK 8ukQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=DbPQIidfq0MFM1zgqjSi8gQh2nroWzApfFzUxpmu63U=; b=Hv6uSPBQfuWnn0tAX5k5aTQEGGgJptkpugVjMcy6yWRV3j9gJmcpSpH81Cyvx4fnaH UlDUkkwKmq1ejS6wo9QAXmV2b+0wUPcWLboy7L8r1mlx76hYcPdIft43MI0JETbz7NEO SW10V2jfbfJwGUzC0UXw54tfcpNWY1ePWGOT3gGk9R0Fu8y2+bEcnrqUsX41T/sp8Vzz L7iqLLLReK0r1s/f00fDz6xDRqTuFEtLN33w+7WlS9goyN+ev7z2LzEDg1mX3JWnLMQV xchA/qFVq3fu2bYoL127tUEzkAqzeO7ND+B+Od3Bi7Bj6DBmok/cnxfkjxBiG2+p0mwM G8JA== X-Gm-Message-State: AOAM533EcLzRDxyJDJw/F9c6kkjFBrVPhcngrPsRfCav9o+f3poTsBeG QetW6yw4CBBpIsW9GNTEu1+E3KIO8SM= X-Google-Smtp-Source: ABdhPJylHChGCWr5+KmPEWT9kuNu7eLPpgm1H46GTaH5rBOQfmZS7ER+ZqWF0W2qKEJGhrbnXx6vDQ== X-Received: by 2002:a37:a996:: with SMTP id s144mr23277080qke.407.1616995147503; Sun, 28 Mar 2021 22:19:07 -0700 (PDT) Received: from hurd (dsl-155-113.b2b2c.ca. [66.158.155.113]) by smtp.gmail.com with ESMTPSA id 4sm12598238qkj.119.2021.03.28.22.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 22:19:07 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Mon, 29 Mar 2021 01:19:05 -0400 In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> (Raghav Gururajan's message of "Sun, 21 Mar 2021 21:48:59 -0400") Message-ID: <87y2e6bkqe.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Raghav! This addresses the review up to linphone-desktop (mostly done with this ticket!). I'm afraid commenting on all the small changes I've done to the original submission would take us through the night; if you don't mind I invite you to consult the changes now merged into master. I'll try to summarize the higher value bits here: 1. bctoolbox @@ -133,19 +138,21 @@ writing, administering, and running unit tests in C.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/bctoolbox") + (url "https://gitlab.linphone.org/BC/public/bctoolbox.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25")))) (build-system cmake-build-system) + (outputs '("out" "debug")) (arguments `(#:configure-flags '("-DENABLE_STATIC=OFF") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source + (add-after 'unpack 'patch-cmake (lambda* (#:key inputs #:allow-other-keys) - ;; Fix decaf dependency. + ;; Fix decaf dependency (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/3). I've reported the issue upstream. (let* ((decaf (assoc-ref inputs "decaf"))) (substitute* (find-files "." "CMakeLists.txt") (("find_package\\(Decaf CONFIG\\)") @@ -153,17 +160,28 @@ writing, administering, and running unit tests in C.") (("\\$\\{DECAF_INCLUDE_DIRS\\}") (string-append decaf "/include/decaf")) (("\\$\\{DECAF_TARGETNAME\\}") - "decaf"))) - ;; Disable failing tests. + "decaf"))))) + (add-after 'unpack 'skip-problematic-tests + (lambda _ + ;; The following test relies on networking; disable it. (substitute* "tester/port.c" - (("[ \t]*TEST_NO_TAG\\(\"Addrinfo sort\", bctbx_addrinfo_sort_test\\)") - "")) - #t)) + (("[ \t]*TEST_NO_TAG.*bctbx_addrinfo_sort_test\\)") + "")))) + (add-after 'unpack 'fix-installed-resource-directory-detection + (lambda _ + ;; There's some broken logic in tester.c that checks if CWD, or + ;; if its parent exist, and if so, sets the prefix where the test + ;; resources are looked up to; disable it (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/4). + (substitute* "src/tester.c" + (("if \\(file_exists\\(\".\"\\)\\)") + "if (NULL)") + (("if \\(file_exists\\(\"..\"\\)\\)") + "if (NULL)")))) I figured a way to have the bctoolbox library refer to its resource directory more correctly, at least for our uses of it. 2. belr @@ -181,41 +200,42 @@ Communications software like belle-sip, mediastreamer2 and linphone.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/belr") + (url "https://gitlab.linphone.org/BC/public/belr.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h")))) (build-system cmake-build-system) - (outputs '("out" "test")) + (outputs '("out" "debug" "tester")) I've settled to keep 'tester', which was already used in the module and which better maps to what this output is (a tester binary to run self tests). (arguments `(#:configure-flags '("-DENABLE_STATIC=OFF") #:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (copy-file "tester/belr_tester" "../source/tester/belr_tester") - (with-directory-excursion "../source/tester" - (invoke "./belr_tester")) - #t)) - (add-after 'install 'seperate-outputs + (delete 'check) ;moved after the install phase + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((tester (assoc-ref outputs "tester")) + (belr_tester (string-append tester "/bin/belr_tester")) + (tester-share (string-append tester "/share/belr_tester"))) + (invoke belr_tester)))) + (add-after 'install 'move-tester (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (test (assoc-ref outputs "test")) - (test-name (string-append ,name "_tester"))) + (tester (assoc-ref outputs "tester"))) (for-each mkdir-p - `(,(string-append test "/bin") - ,(string-append test "/share"))) + (list (string-append tester "/bin") + (string-append tester "/share"))) (rename-file - (string-append out "/bin/" test-name) - (string-append test "/bin/" test-name)) + (string-append out "/bin/belr_tester") + (string-append tester "/bin/belr_tester")) (rename-file (string-append out "/share/belr-tester") - (string-append test "/share/" test-name))) - #t))))) + ;; The detect_res_prefix procedure in bctoolbox's tester.c + ;; resolves the resource path based on the executable path and + ;; name, so have it match. + (string-append tester "/share/belr_tester")))))))) Here I noticed the code relies on the tester file name to resolve its resources, so adapted the resource install directory to match. (inputs - `(("bctoolbox" ,bctoolbox) - ("libudev" ,eudev))) Dropped eudev, apparently unnecessary. + `(("bctoolbox" ,bctoolbox))) (synopsis "Belledonne Communications Language Recognition Library") (description "Belr is Belledonne Communications' language recognition library, written in C++11. It parses text inputs formatted according to a 3. belcard (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/belcard") + (url "https://gitlab.linphone.org/BC/public/belcard.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m")))) (build-system cmake-build-system) - (outputs '("out" "test")) + (outputs '("out" "debug" "tester")) (arguments - `(#:tests? #f ; FIX-ME + `(#:tests? #t #:configure-flags '("-DENABLE_STATIC=OFF") #:phases (modify-phases %standard-phases - (add-after 'install 'seperate-outputs + (add-after 'unpack 'patch-vcard-grammar-location (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (test (assoc-ref outputs "test")) - (test-name (string-append ,name "_tester"))) + (vcard-grammar + (string-append out "/share/belr/grammars/vcard_grammar"))) + (substitute* "include/belcard/vcard_grammar.hpp" + (("define VCARD_GRAMMAR \"vcard_grammar\"") + (format #f "define VCARD_GRAMMAR ~s" vcard-grammar)))))) + (add-after 'install 'install-tester + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester")) + (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))) + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin/" test-name) + (string-append tester "/bin/" test-name)) + (rename-file (string-append out "/share/" test-name) + (string-append tester "/share/" test-name))))) + (delete 'check) + (add-after 'install-tester 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (let* ((tester (assoc-ref outputs "tester")) + (belcard_tester (string-append tester + "/bin/belcard_tester"))) + (invoke belcard_tester)))))))) I've found that moving the check phase after installing, along with the resource fix made for belr allowed the test suite to run, so I enabled it. (inputs `(("bctoolbox" ,bctoolbox) - ("belr" ,belr) - ("libudev" ,eudev))) eudev was here also unnecessary, as well as python. + ("belr" ,belr))) (synopsis "Belledonne Communications VCard Library") (description "Belcard is a C++ library to manipulate VCard standard format.") 4. ortp (define-public ortp (package @@ -363,37 +407,40 @@ such as conferencing.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/ortp") + (url "https://gitlab.linphone.org/BC/public/ortp.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) (build-system cmake-build-system) - (outputs '("out" "doc" "test")) + (outputs '("out""tester" + "doc")) ;1.5 MiB of HTML doc Added a comment about why we are adding a 'doc' output. (arguments - `(#:tests? #f ; Require networking - #:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_TESTS=YES") + `(#:tests? #f ;requires networking + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES") #:phases (modify-phases %standard-phases - (add-after 'install 'seperate-outputs + (add-after 'unpack 'fix-version-strings + ;; See: https://gitlab.linphone.org/BC/public/ortp/-/issues/5. + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") + (string-append "VERSION " ,version)) + (("\\$\\{ORTP_DOC_VERSION\\}") + ,version)))) Here I've found an issue where some CMake variables were not set, causing the doc to be installed in a 'ortp-' named directory. + (add-after 'install 'separate-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")) - (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)) - (rename-file - (string-append out "/bin") - (string-append test "/bin"))) - #t))))) + (doc-src (string-append out "/share/doc/ortp-" ,version)) + (doc-dest (string-append doc "/share/doc/ortp-" ,version)) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p (list (string-append doc "/share/doc") + (string-append tester "/bin"))) + (rename-file doc-src doc-dest) + (rename-file (string-append out "/bin") + (string-append tester "/bin")))))))) Which simplified moving the doc directory. (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) 5: mediastreamer2 (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/mediastreamer2") + (url "https://gitlab.linphone.org/BC/public/mediastreamer2.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0989h3d0h7qrx4kjx8gg09j8c5hvvi3h8qi1iq1dqbppwbaxbz8c")))) - (outputs '("out" "doc" "test")) + (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_PCAP=YES" - "-DENABLE_STRICT=NO" ; To disable strict compile options - "-DENABLE_PORTAUDIO=YES" - "-DENABLE_G729B_CNG=YES") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_PCAP=YES" + ;; Do not fail on compile warnings. + "-DENABLE_STRICT=NO" + "-DENABLE_PORTAUDIO=YES" + "-DENABLE_G729B_CNG=YES") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") + (string-append "VERSION " ,version))))) (add-after 'unpack 'patch-source (lambda _ (substitute* "src/otherfilters/mspcapfileplayer.c" - (("O_BINARY") "L_INCR")) - #t)) + (("O_BINARY") "L_INCR")))) (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)) + (setenv "HOME" (getenv "TEMP")))) + (delete 'check) ;move after install (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")) + (tester (assoc-ref outputs "tester")) + (tester-name (string-append ,name "_tester")) (doc (assoc-ref outputs "doc")) - (doc-name (string-append ,name "-4.4.0"))) + (doc-name (string-append ,name "-" ,version))) (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))))) + (list (string-append tester "/bin") + (string-append tester "/share") + (string-append doc "/share/doc"))) + ;; Move the tester executable. + (rename-file (string-append out "/bin/" tester-name) + (string-append tester "/bin/" tester-name)) + ;; Move the tester data files. + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)) + ;; Move the HTML documentation. + (rename-file (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name))))) I moved the check phase after the installation, which allowed not having to copy the binary or resource files, and reinstated some comments. + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/mediastreamer2_tester"))) + (for-each (lambda (suite-name) + (invoke tester "--suite" suite-name)) + ;; Some tests fail, due to requiring access to the + ;; sound card or the network. Added a comment of why some tests are not enabled. + (list "Basic Audio" + ;; "Sound Card" + ;; "AdaptiveAlgorithm" + ;; "AudioStream" + ;; "VideoStream" + "H26x Tools" + "Framework" + ;; "Player" + "TextStream")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) 6. belle-sip (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/belle-sip") + (url "https://gitlab.linphone.org/BC/public/belle-sip.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z")))) (build-system cmake-build-system) - (outputs '("out" "test")) + (outputs '("out" "tester")) (arguments - `(#:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_MDNS=ON") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_MDNS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch @@ -514,58 +512,44 @@ including both ARM and x86.") (substitute* "src/CMakeLists.txt" ;; 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 + (("-Xmultithreaded ") "")))) + (delete 'check) ;move after install + (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 "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))) Python was not needed. + (tester (assoc-ref outputs "tester")) + (tester-name "belle_sip_tester")) + (for-each mkdir-p (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin") + (string-append tester "/bin")) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name))))) + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/belle_sip_tester"))) + (for-each (lambda (suite-name) + (invoke 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")))))))) This is the same trick as done earlier, moving the check phase after the install phase. (inputs - `(("antlr3" ,antlr3-3.3) - ("antlr3c" ,libantlr3c) - ("avahi" ,avahi) + `(("avahi" ,avahi) ("bctoolbox" ,bctoolbox) - ("java" ,icedtea) ("zlib" ,zlib))) Java was not needed, nor was antlr3 or libantlr3c. (synopsis "Belledonne Communications SIP Library") (description "Belle-sip is a modern library implementing SIP transport, 7. liblinphone --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -25,7 +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 cpp) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -739,36 +739,34 @@ device.") (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.linphone.org/BC/public/liblinphone") + (url "https://gitlab.linphone.org/BC/public/liblinphone.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9")))) - (outputs '("out" "test")) + (outputs '("out" "tester")) (build-system cmake-build-system) (arguments `(#:tests? #f ; Tests require networking - #:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_LDAP=YES") + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_DOC=NO" ;requires unpackaged javasphinx + "-DENABLE_LDAP=YES") #: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"))) + (tester (assoc-ref outputs "tester")) + (tester-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))))) + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin/" tester-name) + (string-append tester "/bin/" tester-name)) + (rename-file (string-append out "/bin/groupchat_benchmark") + (string-append tester "/bin/groupchat_benchmark")) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) Not much else than copying the groupchat_benchmark 500 KiB command with the tester, where it belonged according to the build system. 8. linphone-desktop Finally :-) (base32 "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz")) (patches (search-patches "linphone-desktop-without-sdk.patch")))) (build-system qt-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_UPDATE_CHECK=NO") + #:configure-flags (list "-DENABLE_UPDATE_CHECK=NO" + "-DENABLE_DAEMON=YES" + "-DENABLE_CONSOLE_UI=YES") #:phases (modify-phases %standard-phases (add-after 'unpack 'pre-configure (lambda _ - (for-each make-file-writable (find-files ".")) + (make-file-writable "linphone-app/linphoneqt_version.cmake") (substitute* "linphone-app/linphoneqt_version.cmake" - (("\\$\\{GUIX-SET-VERSION\\}") ,version)) - #t)) + (("\\$\\{GUIX-SET-VERSION\\}") ,version)))) (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (liblinphone (assoc-ref inputs "liblinphone")) - (belcard (assoc-ref inputs "belcard"))) + (grammar-dest (string-append out "/share/belr/grammars"))) ;; 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 files ;; installed by the dependencies. - (symlink - (string-append liblinphone "/share/sounds") - (string-append out "/share/sounds")) - (symlink - (string-append belcard "/share/belr") - (string-append out "/share/belr")) - #t)))))) + (symlink (string-append liblinphone "/share/sounds") + (string-append out "/share/sounds")) + (mkdir-p (dirname grammar-dest)) + (symlink (string-append liblinphone "/share/belr/grammars") + grammar-dest))))))) I've found that only liblinphone resources were necessary to have the application not crash. (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) - ("bellesip" ,belle-sip) Removed this unnecessary input. ("belr" ,belr) ("liblinphone" ,liblinphone) ("mediastreamer2" ,mediastreamer2) @@ -883,8 +880,11 @@ 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, MPEG4 @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+))) + +(define-public linphoneqt + (deprecated-package "linphoneqt" linphone-desktop)) Added this for easing the migration for people having linphoneqt in their profile. Phew! There's just 4 patches left to review, about codec updates. I'll look at them soon. Many thanks for this big effort and fine work! :-) Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:44:37 2021 Received: (at 47274-done) by debbugs.gnu.org; 29 Mar 2021 05:44:37 +0000 Received: from localhost ([127.0.0.1]:47567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkhY-0001GO-QQ for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:44:36 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:37550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkhX-0001GB-G0 for 47274-done@debbugs.gnu.org; Mon, 29 Mar 2021 01:44:35 -0400 Received: by mail-qk1-f182.google.com with SMTP id g15so11418435qkl.4 for <47274-done@debbugs.gnu.org>; Sun, 28 Mar 2021 22:44:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=1iCLnpgVmiIbwLcW1vLgDRhsbItNuTBit0VoDyiDMRM=; b=gDOhmzqlZwxsDN9KFsWjy9uLtwQDpBBbQCCWyw6yVgfOJcj7ZtRXl2Q3D+FTkXqrb3 2S8WXay8Iz/gQE8PFWW6VtMgzzjCYq9rnrV4YVC7gdmv5oYeY1lXJ7zYkx64hm9wOn6E hl0KHG7p1zsw0RdMDA7vOZcnXCcg2XZx2qD/d2Zx6qtfOjxDvfKSuzhKXe7bY8qk7FdX jcb54ToABw8AwbYEUKDG2kfbm7SeLxPYQ/4350WGVSO8W450whrgWW8FVTn7eGtepmUT 9pXlIKVCbrlqN4uFAmKjOKr8My/BBGyKqn7HW/GuBqto0U7qtfQplONhpZ6ZcnRrJ7U0 EXlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=1iCLnpgVmiIbwLcW1vLgDRhsbItNuTBit0VoDyiDMRM=; b=SdzWvcLXeAfiD93Aq6/q0CB/bPYT0A6cmRhxvIhoKi9Ypq10wxgisVhhYYAjZxUYuN QG4cGbFUx3CpBXTGgv4qa6R3t9FLrTAAwQus/onedSwnN5v93gjD3O55sBN+9qm3zmV2 VM57aeIT1dDfyUIDySpO5lKs7cloTaxBiIXbRrGSfWq3BKef8bs2gckyHpogYVWcYcW7 hSb9tcFVcoGYGLyr2wsl3UEL+v58/m7Lya27h4kgN+hdhriwBb7o6+ThyheTt/ozZTdh gdqgtRRq7SOaZ7E7HusVl6VX/unn76FeJQi6mHYaTx8DPb+CU1KNyhNCtEcbNNLmc+XW KifQ== X-Gm-Message-State: AOAM533Gv39OiNj8hnwPu9ZwJb3cUHffSsNTVwi53DI/r9BX1//sDyfI S4bTZ2fq1u7wS+OTH9g3mKob31DOcA0= X-Google-Smtp-Source: ABdhPJxRFcHmYxnv/pZGghdkSB795GIE35VLf30Ff7DDDZ/pWQfx2ioyMy/0H3Afb2SJ5wZc0D08YA== X-Received: by 2002:ae9:d60a:: with SMTP id r10mr23197637qkk.411.1616996669928; Sun, 28 Mar 2021 22:44:29 -0700 (PDT) Received: from hurd (dsl-155-113.b2b2c.ca. [66.158.155.113]) by smtp.gmail.com with ESMTPSA id l129sm12550569qkd.76.2021.03.28.22.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 22:44:29 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Mon, 29 Mar 2021 01:44:28 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87v99abjk3.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274-done Cc: 47274-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Raghav, I've pushed the last 4 commits with a99932503e along the previous reviewed ones to master, after checking that every dependents could build fine. Thanks again! Closing. Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:52:19 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:52:19 +0000 Received: from localhost ([127.0.0.1]:47575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkp1-0001Rw-II for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:52:19 -0400 Received: from out2.migadu.com ([188.165.223.204]:59655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkoy-0001Rm-OI for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:52:18 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997135; 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=x6ZW4Vd1Vge8pXlVrPdd+IzDWF02aTGuZQHhihY1wUk=; b=qPcWxJY8SVWeQ2fPBBBB/sbZPgT4kofqGQUZczpYaOYXUQSKt+D6+8rXIOLU9JTDRFmH6e TPSOYm9wmxsYSPUhXITAO1yf6aFjzLOUR2ybCewlQsPu5+M/bAfbbHZBBDnYCexRoR0G2u fzHGhu/qCsoqTjKQNcW6M0yvo7A26S+WSWQdFY+cL3m2Q+sI5fuohV3rDovwwFAhkRPvQw p7+hprkXy3N4DOTxq+I3lDTtwciTiDJu6b0+y/1Hs2e0XH92j+cnmTWuYuZcLjV9lvA5ua fo7XA0AoRsL4jfiLbPho2KtfrWn3KOmI9PZ8XR0xOh7ggPETT9AesWmhC6Ii7Q== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <874kgxs5si.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Mon, 29 Mar 2021 01:52:13 -0400 MIME-Version: 1.0 In-Reply-To: <874kgxs5si.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FyjbLBLj4n9WLERqE70KGgKg6FFESPImU" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --FyjbLBLj4n9WLERqE70KGgKg6FFESPImU Content-Type: multipart/mixed; boundary="RBBXTJX8a1seFNULb6R6uP5AhQpvOP3hD"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <874kgxs5si.fsf_-_@gmail.com> In-Reply-To: <874kgxs5si.fsf_-_@gmail.com> --RBBXTJX8a1seFNULb6R6uP5AhQpvOP3hD Content-Type: multipart/mixed; boundary="------------6013AD994E46B86065A88491" Content-Language: en-US This is a multi-part message in MIME format. --------------6013AD994E46B86065A88491 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > The change of the output name from tester to test seems arbitrary :-). > I'd argue that "tester" makes more sense as this outputs contains a > tester binary or command rather than a test suite. Agreed, as we discussed this in IRC. > While it may seem obvious, I believe the comments helped the human brai= n > keep track of the process flow more cheaply; please don't remove them. Oops. sorry about that. > I've squashed this one with the home page update and license change, as= > they are small and are related to the update. Thanks! Regards, RG. --------------6013AD994E46B86065A88491 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------6013AD994E46B86065A88491-- --RBBXTJX8a1seFNULb6R6uP5AhQpvOP3hD-- --FyjbLBLj4n9WLERqE70KGgKg6FFESPImU Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFrDQUDAAAAAAAKCRBfWBZkf4vlUYN5 AP0bPmkrLepXqyWI7LuRa2qxmVLDQRoodZ0LqtxKNQpbuwD9FCH+GPCUYlCCzr2vSD4xKhfKKq5B MMPOciqClyM9aA4= =gkHI -----END PGP SIGNATURE----- --FyjbLBLj4n9WLERqE70KGgKg6FFESPImU-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:53:04 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:53:04 +0000 Received: from localhost ([127.0.0.1]:47580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkpj-0001TI-Qw for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:53:03 -0400 Received: from out2.migadu.com ([188.165.223.204]:59807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkpi-0001Sq-3y for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:53:02 -0400 Subject: Re: bug#47274: Linphone Packages DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997181; 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=R9BEbSNPXQgkP1AsVOhrsYAqnZ9L8bLSc4Uc5FGPdPA=; b=YM571P3MVdKHvcUZcIX53oe9mmMOCTW54irOEoR79xkSOaFklt1lPj2urFFQB1OfA5g3vi SQj7qIDIp7l2GA3Eboei9Ag2z7jkJP/fe0dzVTsYaKTpt7f2TjnJ8D7jJ3e01s787U8E9n SLCQ8RPuwHUP0O+5qMUktv8XZ2WGSfWz+eO/uzhVZumRbSTIwK8b/HjX4CEfsWrs4iuj7L 5gKBRBzv+tDWJiF/LjTfAQ8BX65MWn18VS9BPZSiSAOgegq1hojtmO4AXGaTKOBM6JsahK DuasdxeZs7fq6i/DoZaHLE6Faqc2SXV9t12WF6/HH1EKf292pSA0UQ5jxG8AYA== To: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87zgypqj9f.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <73fccd1c-5e04-5aba-f76d-d75fd719e90d@raghavgururajan.name> Date: Mon, 29 Mar 2021 01:53:00 -0400 MIME-Version: 1.0 In-Reply-To: <87zgypqj9f.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Wub23fVyqEe6idHObkCzRUGgtBMCVeupd" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Wub23fVyqEe6idHObkCzRUGgtBMCVeupd Content-Type: multipart/mixed; boundary="VVbb7LlK6eShFZwZjlZtSsy7SzDrQk57d"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: <73fccd1c-5e04-5aba-f76d-d75fd719e90d@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87zgypqj9f.fsf_-_@gmail.com> In-Reply-To: <87zgypqj9f.fsf_-_@gmail.com> --VVbb7LlK6eShFZwZjlZtSsy7SzDrQk57d Content-Type: multipart/mixed; boundary="------------A7DD16A5D30A19E97AE819ED" Content-Language: en-US This is a multi-part message in MIME format. --------------A7DD16A5D30A19E97AE819ED Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! >> Headers of soci has include-references to headers of these inputs. >=20 > This explanation would be better kept as a comment in the code :-). Agreed. Regards, RG. --------------A7DD16A5D30A19E97AE819ED Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------A7DD16A5D30A19E97AE819ED-- --VVbb7LlK6eShFZwZjlZtSsy7SzDrQk57d-- --Wub23fVyqEe6idHObkCzRUGgtBMCVeupd Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFrPAUDAAAAAAAKCRBfWBZkf4vlUb/0 AP9VhujMa/FMyTSbUA7dTtdAzCPmQQnahrGQUslLGErbJAEAkrHwRUm+Hk26fssaSWCcS1skFWBO hochSnt36xT84Q8= =/dTl -----END PGP SIGNATURE----- --Wub23fVyqEe6idHObkCzRUGgtBMCVeupd-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:53:39 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:53:39 +0000 Received: from localhost ([127.0.0.1]:47584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkqJ-0001U7-1H for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:53:39 -0400 Received: from out2.migadu.com ([188.165.223.204]:59923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkqH-0001U0-BN for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:53:37 -0400 Subject: Re: bug#47274: Linphone Packages DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997216; 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=B8WK5bJkfzG3XWOIBzzzd+DPfe1c/iaN//BH15+6foY=; b=K0QB+qHvwT7Gh3YwSZMI9Ttz98t1wN68Wc52rwzm6f3WHgSBjylmhV4x11jsJ1xnmFFGwo 8Xb6H6lXPpKfP0re3LX5LLmFiFlmOBI3vR8gITH84uLCZRy6lgi8+/FBfuS9QHClYZJxLu nlYMYvVOwfpCF2wRmpfhETbNkzaf/6Telf1MhRkoQiprh41kWg6na5RidnaDBrD7Ea8uFP WK5OvjSWp80R+VPtCT3l4qKmysWV1Yop0tlecC+FDCPmG55+pbFOoa5Bzrl9QDZpXFGQzZ PU6/VJfiYtqGjO1AAHqhH+/+tZ48H6vlyZeHZI2YPerkuVls89nI8YFRM3hPKQ== To: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: Date: Mon, 29 Mar 2021 01:53:35 -0400 MIME-Version: 1.0 In-Reply-To: <87v99dqiyn.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mm5wBemoev8shyFfPE7faGrAm0y7XDcmo" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --mm5wBemoev8shyFfPE7faGrAm0y7XDcmo Content-Type: multipart/mixed; boundary="zwyIonSTp9tiw4g1idWAJOMFpMDN4Nmac"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> In-Reply-To: <87v99dqiyn.fsf_-_@gmail.com> --zwyIonSTp9tiw4g1idWAJOMFpMDN4Nmac Content-Type: multipart/mixed; boundary="------------05561C7874C6FA8BEBEEB785" Content-Language: en-US This is a multi-part message in MIME format. --------------05561C7874C6FA8BEBEEB785 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > Why create a new module for this? We already have (gnu packages > build-tools), which seem a good home. Agreed, as we discussed this in IRC. Regards, RG. --------------05561C7874C6FA8BEBEEB785 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------05561C7874C6FA8BEBEEB785-- --zwyIonSTp9tiw4g1idWAJOMFpMDN4Nmac-- --mm5wBemoev8shyFfPE7faGrAm0y7XDcmo Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFrXwUDAAAAAAAKCRBfWBZkf4vlUe16 AQD5q/MpiUaqs4VT4sznP3YL/RDfLTwFE5ZKz0b7KkgvdgEA5d1MJDKOg/Ec+PybcEiTLe3Ef5ab /LVCWg7cGDz4awE= =BTUB -----END PGP SIGNATURE----- --mm5wBemoev8shyFfPE7faGrAm0y7XDcmo-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 01:55:49 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 05:55:49 +0000 Received: from localhost ([127.0.0.1]:47590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQksP-0001XT-Dn for submit@debbugs.gnu.org; Mon, 29 Mar 2021 01:55:49 -0400 Received: from out0.migadu.com ([94.23.1.103]:28802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQksM-0001XJ-Ug for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 01:55:47 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997345; 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=0Q6RmACFJFQBZcpYuOtUbkfb72PicGp9uBbt9fXyqlo=; b=rDS7hT6GSq9Xh7JEnRvX+oKYDikB8/bRkh8NhP6Ioc3NBDj5ZreWKU/Xpw+7PgNf5Ch+qX aIiIxbDLZMrktr6keHf3k9wrpy7JCSIoyYfGQRrTSPGS4re/Bl7VaCwgGomkEjY/YsMBL0 NZU/92jJp52K/UMjsxK+Eaq3/PhMbTwkfwjPbsAva2EDnQu22U+oRIEiFYrNuK89gK9f8e u57HvlYwJ1ekFtxRTbqU1anh3n8YHTp4mQnZDu1TsR9pGBJQBCADCxmUPssMYsFn/kKBYL F9WvcZNquAqrECEgJQAzdMBDPpUX50bAtxjZo4czUeoDgZV+ZfnL5xopuYFqYw== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87o8f4qeuj.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Mon, 29 Mar 2021 01:55:43 -0400 MIME-Version: 1.0 In-Reply-To: <87o8f4qeuj.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JnNaQ77tUZONWCukMWAxhTQs0ls62ZCKM" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org, =?UTF-8?Q?L=c3=a9o_Le_Bouter?= , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JnNaQ77tUZONWCukMWAxhTQs0ls62ZCKM Content-Type: multipart/mixed; boundary="Ce2JsbxE3D85ZLMu3mxP5G1cLFmi04vel"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org, Danny Milosavljevic , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87o8f4qeuj.fsf_-_@gmail.com> In-Reply-To: <87o8f4qeuj.fsf_-_@gmail.com> --Ce2JsbxE3D85ZLMu3mxP5G1cLFmi04vel Content-Type: multipart/mixed; boundary="------------A75D4841653E99CAF9674F89" Content-Language: en-US This is a multi-part message in MIME format. --------------A75D4841653E99CAF9674F89 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > What is the above substitution for? A comment would be helpful! It is for gcc 7+ and its related C++ standard support. The code was=20 initially written for gcc 4. Regards, RG. --------------A75D4841653E99CAF9674F89 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------A75D4841653E99CAF9674F89-- --Ce2JsbxE3D85ZLMu3mxP5G1cLFmi04vel-- --JnNaQ77tUZONWCukMWAxhTQs0ls62ZCKM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFr3wUDAAAAAAAKCRBfWBZkf4vlUXUu AQCJYHb+t4JidvEZ6j9WWert2YHUJEiu9f1TRPn0P+yrUwD/W86RQazq7ljZbQgMrNEF3AxrdjhA ZLJmvqjN+j40Ywk= =Sd3E -----END PGP SIGNATURE----- --JnNaQ77tUZONWCukMWAxhTQs0ls62ZCKM-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 02:01:27 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 06:01:28 +0000 Received: from localhost ([127.0.0.1]:47595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkxo-0001gh-3N for submit@debbugs.gnu.org; Mon, 29 Mar 2021 02:01:27 -0400 Received: from out1.migadu.com ([91.121.223.63]:46864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkxl-0001gX-OZ for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 02:01:22 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997679; 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=X6O7ofshPAner3mcyl/pmI+FQ7bzd16EtSkyNnrlebo=; b=BcxM7xt5EKH1aMcwS3CN+RamIUvol5bsuT+Q74yAjTN49iaT1of454yiNyz5ga15MO2cZD ypN7aHuQX6aaQxzoGDyT8YowPsxL5H0hIKoVMqHHTTTjVNEv2irbhnpXEIyQ2UK2fVhgQX gelTCc0ktwFEyRT8DOhBq4w6Gu2+iI+vEVWmhoeKy5jGk4jq90RhfYCfxdu0OzIVsTx+8C QgC4l49gSmumwHc7hpRxzveA0nFQbtj9/WX/RZ6be4tB3WZ1a0l87ZVwkN8XkMLBi5Koa3 DyM3DEPJkKwacxus5O6Fh+cDJBtJt4vyxT1xnRzdb6sCwCSH1vLwv+pQhhaNzQ== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87czvkq63m.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: <93894c2d-a725-d153-7d3d-73ca6fcc3d6a@raghavgururajan.name> Date: Mon, 29 Mar 2021 02:01:17 -0400 MIME-Version: 1.0 In-Reply-To: <87czvkq63m.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ggs3jG7bCV4el7mvveN7a8vQpT0oZzgr6" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ggs3jG7bCV4el7mvveN7a8vQpT0oZzgr6 Content-Type: multipart/mixed; boundary="5CxsjJMxFQW7mm13TUs8kOpLuAcIBOQ2I"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: <93894c2d-a725-d153-7d3d-73ca6fcc3d6a@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87czvkq63m.fsf_-_@gmail.com> In-Reply-To: <87czvkq63m.fsf_-_@gmail.com> --5CxsjJMxFQW7mm13TUs8kOpLuAcIBOQ2I Content-Type: multipart/mixed; boundary="------------F5F431DD6AEB932CB50B2262" Content-Language: en-US This is a multi-part message in MIME format. --------------F5F431DD6AEB932CB50B2262 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > I had an old package of build from 2020 with a more fleshed out > description, so I've pushed that version instead as commit 65719505b8. Sounds good. > pkg-config turned out not to be needed. >=20 > I removed the trailing #t. >=20 > Removed the native-inputs field. >=20 > And pushed as ae479f1834. >=20 > I could turn this patch phase into a make flag: >=20 > Removed pkg-config, which was not needed. >=20 > Replaced @package by @code, as the former is not valid Texinfo markup. >=20 > And pushed as 111004cc58. >=20 > I used the same --include-dir make flag trick here. >=20 > Removed pkg-config, which was not needed. >=20 > s/@package/@code/, as for the previous package. >=20 > And pushed as commit f649a0a557. >=20 > I added a doc output to hold the multi-megabyte documentation and > examples and used the same make flag trick to allow finding build-0.3 > files: >=20 > Dropped pkg-config here as well. >=20 > I removed expat from propagated-inputs, as the xsd generated code > default to using xerces-c. Someone wanting to use expat could add it > manually. I've also added a comment like this, as it was not clear to > me initially why propagation was useful: Thanks a lot for making the changes. > For this package, I also had an unfinished version locally; the > description was slightly more accurate, with an extra comment for the > license: Sounds good. Regards, RG. --------------F5F431DD6AEB932CB50B2262 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------F5F431DD6AEB932CB50B2262-- --5CxsjJMxFQW7mm13TUs8kOpLuAcIBOQ2I-- --ggs3jG7bCV4el7mvveN7a8vQpT0oZzgr6 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFtLQUDAAAAAAAKCRBfWBZkf4vlUdzL AQDYLERJIoc1D9k7tgngFdw7+/dazMbSq/WlfuF4YvGgawEAvrdfqubX8Toc1bsc8WjAu5F6D2mJ GiSuG1UZnHMP5Q8= =pi6T -----END PGP SIGNATURE----- --ggs3jG7bCV4el7mvveN7a8vQpT0oZzgr6-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 02:02:16 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 06:02:16 +0000 Received: from localhost ([127.0.0.1]:47600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkyd-0001iB-VH for submit@debbugs.gnu.org; Mon, 29 Mar 2021 02:02:16 -0400 Received: from out0.migadu.com ([94.23.1.103]:29845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQkyc-0001i3-5e for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 02:02:15 -0400 Subject: Re: bug#47274: Linphone Packages DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997733; 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=HALAQyKyybP4AIEQrK7ly8pxmKX1Sx+yBKku1LEJqcA=; b=WAk7od5IUnK1kCLI1ORicvANQV1ERxCbj9bM2g0DJTO3GJfuin1elyjxir8FWcbgyNTcbc rpfZlW9w3c759t74NeOGb72F0B1uYFS/9xFRiPHtUJAPWFrUJk9FmBlG9V6sxd/SPSDQW+ JORGGX/RhC1xRKHQdho9KgJahideV7C0zptw737eRJz3nV0owwxa8oWb/de7c0KdoLcZDC Fm3tZWaHUS83U1dqxGTMUv6zCwBiRlag9jDHD61BR9OkvZRkBt0mMrI7pOXdJc4qlimvHf asrU88YC2ZuHx1fsQc4viyRSnidQWbUosvYroePwrsfRHEUqZunG98YgBLgDpw== To: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> <875z1briqe.fsf@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: Date: Mon, 29 Mar 2021 02:02:11 -0400 MIME-Version: 1.0 In-Reply-To: <875z1briqe.fsf@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="z1xxZOy3Il7BYY4U1aYkWQKzr8yAMvorJ" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --z1xxZOy3Il7BYY4U1aYkWQKzr8yAMvorJ Content-Type: multipart/mixed; boundary="1nJcO5j2M3i8UJ9RNJ9VQTMYyP5QXtO5m"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99dqiyn.fsf_-_@gmail.com> <875z1briqe.fsf@gmail.com> In-Reply-To: <875z1briqe.fsf@gmail.com> --1nJcO5j2M3i8UJ9RNJ9VQTMYyP5QXtO5m Content-Type: multipart/mixed; boundary="------------BCCA24CE36F7576F454BC737" Content-Language: en-US This is a multi-part message in MIME format. --------------BCCA24CE36F7576F454BC737 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > As I've answered on IRC, so far, the (gnu packgaes cpp) module seems > sufficient; it's a relatively small module itself. The problem I see > with having codesynthesis as a module is that it'd be misleading as a > module name: not all their tools are about code synthesis (that's their= > company name, but that's not obvious! I got confused that way when > first looking at your patch series). Agreed. > I've merged the codesynthesis packgaes in the cpp module already; if it= > becomes a problem we can revisit this choice. Sounds good. Regards, RG. --------------BCCA24CE36F7576F454BC737 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------BCCA24CE36F7576F454BC737-- --1nJcO5j2M3i8UJ9RNJ9VQTMYyP5QXtO5m-- --z1xxZOy3Il7BYY4U1aYkWQKzr8yAMvorJ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFtYwUDAAAAAAAKCRBfWBZkf4vlUX/X AQDileiNc7j8s/MhMQVO/ZXSb4a6x6s6PLWg0SXmvip/pAEAxxcCEWNzUX1BHWCD5pRlEb1KX+yf baqQlcZSg/GPhw8= =u0I+ -----END PGP SIGNATURE----- --z1xxZOy3Il7BYY4U1aYkWQKzr8yAMvorJ-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 02:05:19 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 06:05:19 +0000 Received: from localhost ([127.0.0.1]:47605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl1b-0001mb-DP for submit@debbugs.gnu.org; Mon, 29 Mar 2021 02:05:19 -0400 Received: from out0.migadu.com ([94.23.1.103]:30346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl1Z-0001mP-4e for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 02:05:18 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616997916; 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=uynFtQEpRtWWFShkcM4j3gcp33DIrWyeMGy8mtaA0iI=; b=ILTb5NKUmRoidp6q862vZ9CbFhmSYWql+88CKtQ/LB/uafREo84ZlE1dny738AV8PxOGwl Wttq3YhQ+rowf1av1VgFliFkouS20xaqw7Ooo+C5fZverclDv6CYRdCgnM6kkfyeaFp4L/ 6uuJZxFFA0cKxrXUAM7cqLf/iZ3byTVCqDQfhOR2SGyYtXhRXizBCQBkQEPeurhFaPe73Y +PnCJPqmCUbNSECuKrYQWGaegXFuJFemj7VOhyjrI6ajsXXoz7pCO3jNjnICiyGaSNubvj EK76bsQAMd+Ko6A72LhQw7xs3oAiLc60eXQjUH4XyUWkGLLWdQzutvqNZYLQOQ== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> <871rbyd2t7.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> Date: Mon, 29 Mar 2021 02:05:14 -0400 MIME-Version: 1.0 In-Reply-To: <871rbyd2t7.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pkILhazw6EgSSag1mameKUHXstjTw4fnf" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --pkILhazw6EgSSag1mameKUHXstjTw4fnf Content-Type: multipart/mixed; boundary="FzizqNfd6WobMw0IRH2XkTyJkcjKl3llX"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> <871rbyd2t7.fsf_-_@gmail.com> In-Reply-To: <871rbyd2t7.fsf_-_@gmail.com> --FzizqNfd6WobMw0IRH2XkTyJkcjKl3llX Content-Type: multipart/mixed; boundary="------------FA7B4992D3CDBDC75466DA69" Content-Language: en-US This is a multi-part message in MIME format. --------------FA7B4992D3CDBDC75466DA69 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > I think I've managed to fix the issue, with the following: >=20 > --8<---------------cut here---------------start------------->8--- > (let* ((out (assoc-ref outputs "out")) > (liblinphone (assoc-ref inputs "liblinphone")) > (grammar-dest (string-append out > "/share/belr/grammars"))) > [...] > (mkdir-p (dirname grammar-dest)) > (symlink (string-append liblinphone "/share/belr/gramma= rs") > grammar-dest) > --8<---------------cut here---------------end--------------->8--- >=20 > At least it launches now, and everything seems to work. Thanks a lot. Btw, did you try restarting the app multiple-times?=20 Different error (missing /share/stuff) popped-up, each time. I also wonder why wrapping XDG_DATA_DIRS doesn't work, as it will give=20 access to {all-inputs}/share/stuff. Regards, RG. --------------FA7B4992D3CDBDC75466DA69 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------FA7B4992D3CDBDC75466DA69-- --FzizqNfd6WobMw0IRH2XkTyJkcjKl3llX-- --pkILhazw6EgSSag1mameKUHXstjTw4fnf Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFuGwUDAAAAAAAKCRBfWBZkf4vlUQbO AP4jZWzK3J4fA2Rycmnjwx3iinsaRJN1+5k5F5G4q5LC6gEAozhFdJGpLz3fvhl9npdOOkQc/NyT WTq8fqoaO2dJtQE= =vpqg -----END PGP SIGNATURE----- --pkILhazw6EgSSag1mameKUHXstjTw4fnf-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 02:12:39 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 06:12:39 +0000 Received: from localhost ([127.0.0.1]:47621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl8h-0001x5-DD for submit@debbugs.gnu.org; Mon, 29 Mar 2021 02:12:39 -0400 Received: from out1.migadu.com ([91.121.223.63]:30689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl8e-0001wu-0v for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 02:12:37 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616998354; 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=OYwgwSKP3WJdFubsTMwgzdiKUlmFdKcWlxSzGPXBfbY=; b=HapMO60c0LAw0argHEOIegUfRWWfTsDfGk98qdk2GKnX2VSqRrK+I65zKrACdAaEOzw7XD 4ReAqnjp0jxwZjz4jVP+J1lvOd3lRoB7Nf++3uaogEvdQgx7JF25KV5gd/l2QHucuBtSEO tac3zv8c4KtAqp1AvTeqC/0JBO1aa6XzEt6y/lqw4VIqRK5aiEPnyWmy/NmABfrZI7yRNX Pu3+ruF+O+Y1QkojgFOLcz6iZiLNqdqIKhg2YdggRVPvKs/v1/KHZA8cCHe2rrKvcuvEKg 4oiGrf9cRjbvUep7+3y7aiWtfxNukkVzcgalHNwfPqw6+Xkuu0ib4SLRX/AjBA== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87y2e6bkqe.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: Date: Mon, 29 Mar 2021 02:12:32 -0400 MIME-Version: 1.0 In-Reply-To: <87y2e6bkqe.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QiVWE2refYAOQirB7xNRiaLRBi86DmVDH" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QiVWE2refYAOQirB7xNRiaLRBi86DmVDH Content-Type: multipart/mixed; boundary="nthicB0Otkel8CjjXl1rshI8TFKZTUvOS"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87y2e6bkqe.fsf_-_@gmail.com> In-Reply-To: <87y2e6bkqe.fsf_-_@gmail.com> --nthicB0Otkel8CjjXl1rshI8TFKZTUvOS Content-Type: multipart/mixed; boundary="------------A982ACADFBC4ACCBBEAF86A2" Content-Language: en-US This is a multi-part message in MIME format. --------------A982ACADFBC4ACCBBEAF86A2 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > I'm afraid commenting on all the small changes I've done to the origina= l > submission would take us through the night; if you don't mind I invite > you to consult the changes now merged into master. No worries! > 1. bctoolbox >=20 > I've reported the issue upstream. >=20 > 2. belr >=20 > I've settled to keep 'tester', which was already used in the module and= > which better maps to what this output is (a tester binary to run self t= ests). >=20 > Here I noticed the code relies on the tester file name to resolve its > resources, so adapted the resource install directory to match. >=20 > 3. belcard >=20 > eudev was here also unnecessary, as well as python. >=20 > 4. ortp >=20 > Added a comment about why we are adding a 'doc' output. >=20 > Here I've found an issue where some CMake variables were not set, > causing the doc to be installed in a 'ortp-' named directory. >=20 > Which simplified moving the doc directory. >=20 > 5: mediastreamer2 >=20 > I moved the check phase after the installation, which allowed not havin= g > to copy the binary or resource files, and reinstated some comments. >=20 > Added a comment of why some tests are not enabled. >=20 > 6. belle-sip >=20 > Python was not needed. >=20 > This is the same trick as done earlier, moving the check phase after th= e > install phase. >=20 > Java was not needed, nor was antlr3 or libantlr3c. >=20 > 7. liblinphone >=20 > Not much else than copying the groupchat_benchmark 500 KiB command with= > the tester, where it belonged according to the build system. >=20 > 8. linphone-desktop >=20 > I've found that only liblinphone resources were necessary to have the > application not crash. >=20 > Removed this unnecessary input. >=20 > Added this for easing the migration for people having linphoneqt in > their profile. Huge thanks! Regards, RG. --------------A982ACADFBC4ACCBBEAF86A2 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------A982ACADFBC4ACCBBEAF86A2-- --nthicB0Otkel8CjjXl1rshI8TFKZTUvOS-- --QiVWE2refYAOQirB7xNRiaLRBi86DmVDH Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFv0AUDAAAAAAAKCRBfWBZkf4vlUXxP AQC9GmjkaqK8z8UyuaSS0y4LdY912FKwnQVagBjF1oPlMAD/cx7swOanuIjIk7YgaGO+fF5iG7Eh iHSSI89a76E9UwY= =kvLp -----END PGP SIGNATURE----- --QiVWE2refYAOQirB7xNRiaLRBi86DmVDH-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 02:13:39 2021 Received: (at 47274-done) by debbugs.gnu.org; 29 Mar 2021 06:13:40 +0000 Received: from localhost ([127.0.0.1]:47626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl9f-0001yk-PP for submit@debbugs.gnu.org; Mon, 29 Mar 2021 02:13:39 -0400 Received: from out0.migadu.com ([94.23.1.103]:15903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQl9e-0001yc-Qv for 47274-done@debbugs.gnu.org; Mon, 29 Mar 2021 02:13:39 -0400 Subject: Re: bug#47274: Linphone Packages DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616998417; 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=Q496scG34cj3YBkHO3QZGY6SIGRHXpP4AEbWwZFHkW8=; b=qSFg6FD6p1DFv6QP8Wn3SRzzV1qg7SyDhjmJAkvpkAgZpOUisHUHKSPDGLRvU19R8Kagmd pP6onaQfOj666TN0tAbt5M0cX/vzFGI5nP9K09tTiqo3ZZcNhZYYkh868EwOIQuPX7w2Hy dnWqVxfqEYoAj4jveNIzJrnzuYm3CtEHNJYGL8tMLNjDny8L1unYDWBWUTuLxTITdVOmZE gHJpEYk14/74+FHOR8tZ5H22rOt5UxIMGnwVJHsz5NBUuXBKJocW9OvNYAiiK+Q7aAIZ4m UIJKTiF9dq3RXbkkzp3Fprcr4fhEvrBcs5py4GZrDm119FTrqptUq+vajyoK7Q== To: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99abjk3.fsf_-_@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <6d766246-9eb0-8bc4-fc29-e4efcc2c482c@raghavgururajan.name> Date: Mon, 29 Mar 2021 02:13:36 -0400 MIME-Version: 1.0 In-Reply-To: <87v99abjk3.fsf_-_@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wvSHsQg3PmasJc7QCi5zdzyeIWLnKRPm6" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274-done Cc: 47274-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wvSHsQg3PmasJc7QCi5zdzyeIWLnKRPm6 Content-Type: multipart/mixed; boundary="dJ9qdsX3qD3ZvMhbIFcVXpYQzfSU7vr3L"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274-done@debbugs.gnu.org Message-ID: <6d766246-9eb0-8bc4-fc29-e4efcc2c482c@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99abjk3.fsf_-_@gmail.com> In-Reply-To: <87v99abjk3.fsf_-_@gmail.com> --dJ9qdsX3qD3ZvMhbIFcVXpYQzfSU7vr3L Content-Type: multipart/mixed; boundary="------------A6B3019BFF9F9B55E3251498" Content-Language: en-US This is a multi-part message in MIME format. --------------A6B3019BFF9F9B55E3251498 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > Thanks again! >=20 > Closing. Couldn't have done it without you. Regards, RG. --------------A6B3019BFF9F9B55E3251498 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------A6B3019BFF9F9B55E3251498-- --dJ9qdsX3qD3ZvMhbIFcVXpYQzfSU7vr3L-- --wvSHsQg3PmasJc7QCi5zdzyeIWLnKRPm6 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnoEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGFwEAUDAAAAAAAKCRBfWBZkf4vlUZBs AP4p3QCAQ4lW5VBNil7ionkKNAPhbFcDzUnth2gpaC8UMQD2NSb7cFaI8CLpYi5u/I+G89mwjZps +zO99slCOYYYDQ== =rpMQ -----END PGP SIGNATURE----- --wvSHsQg3PmasJc7QCi5zdzyeIWLnKRPm6-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 14:38:33 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 18:38:33 +0000 Received: from localhost ([127.0.0.1]:49571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwmX-0000M9-DX for submit@debbugs.gnu.org; Mon, 29 Mar 2021 14:38:33 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:36572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwmT-0000Lu-Tr for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 14:38:31 -0400 Received: by mail-qt1-f172.google.com with SMTP id h7so10054823qtx.3 for <47274@debbugs.gnu.org>; Mon, 29 Mar 2021 11:38:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=AUhpS7Kb2OOe0gnl4yZTM+U9nSot0diKY+ZpdZXMAw8=; b=DKXtUcsfARJmtjxn4tibMUJn+ouOBOcwHUFAVfc1vwfehOq+Ymlf+D3uZ3+RT6S701 jFZOyOxVlpRKZaGU7ilnXAiYefV4ktz+iO9vO91O67gBvnRQnq9c+tSJ8WMbMXM/Hh00 9Op2QUIN7FHwAXlrNM0jvrxs8Tz4tE6vcSDMdErfNdWrVYestQugLtDKKFOiiOeRRqNt /DrFrRCdolmPEBeSa6eiZTpP34oNsWets14kksDNtiM7X6Y+IHGGQY488EBw0merkYE4 yYMCth5Oi952UnanwxvqcfNx89pQt3hJaEnW6BrMBumzQokSSH9ts7DDj37GeLAXaYLt X8vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=AUhpS7Kb2OOe0gnl4yZTM+U9nSot0diKY+ZpdZXMAw8=; b=JP7aCJKBMWzf9sfj3fFjZZ5qSDS4jSWxIcUDkmVzZKPPgMI+5N/7ne0RIl42akCGkn p4b0tAaRPgxO8Z5CJjoAceWr0m1jyMAa86OKbodyvwsT15R47Dddyr6LLqKNvavk39jn R7RnsOxg9/KfWN5q+1zwXGyda8AMXG28sAfnkc1AbzypvhNJcqRQg1HPMVJq967ve58Y Ih1VduIRGJqg2X1eCLVBIe+ljTWlLl2Q/1cTjTiS4zrSguPUKxLGTp7mhlwEW0OaBnqS WkLD3aXofh2v+5wlLrb2ZXDs0OsN5ho39Cb6csTGU4RO/epspRWQiCb+eO0W5235Fk62 9iGg== X-Gm-Message-State: AOAM531nYtneBDZlWd4eY2GrMmCCM/nsAlksb+tZ+WhgEkfJAcRQiizc gZuoCPVO9I35YfOYH8A3dIemaPycq20= X-Google-Smtp-Source: ABdhPJxdEYhvmn6nBcyfGV/S5mUuKqpO8LQ57EtGONCBTpju/wr9AOSVlGvTJMU45bikgs7T798uRg== X-Received: by 2002:ac8:47cf:: with SMTP id d15mr23459457qtr.357.1617043104279; Mon, 29 Mar 2021 11:38:24 -0700 (PDT) Received: from hurd (dsl-155-113.b2b2c.ca. [66.158.155.113]) by smtp.gmail.com with ESMTPSA id o36sm11670380qtd.89.2021.03.29.11.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 11:38:23 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> <871rbyd2t7.fsf_-_@gmail.com> <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> Date: Mon, 29 Mar 2021 14:38:23 -0400 In-Reply-To: <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> (Raghav Gururajan's message of "Mon, 29 Mar 2021 02:05:14 -0400") Message-ID: <87mtulbyao.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Raghav, Raghav Gururajan writes: > Hi Maxim! > >> I think I've managed to fix the issue, with the following: >> --8<---------------cut here---------------start------------->8--- >> (let* ((out (assoc-ref outputs "out")) >> (liblinphone (assoc-ref inputs "liblinphone")) >> (grammar-dest (string-append out >> "/share/belr/grammars"))) >> [...] >> (mkdir-p (dirname grammar-dest)) >> (symlink (string-append liblinphone "/share/belr/grammars") >> grammar-dest) >> --8<---------------cut here---------------end--------------->8--- >> At least it launches now, and everything seems to work. > > Thanks a lot. Btw, did you try restarting the app multiple-times? > Different error (missing /share/stuff) popped-up, each time. Yes! Both running the binary directly from the store or in a pure environment, multiple times have worked after the above change. Do you experience failures still? Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 14:39:40 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 18:39:40 +0000 Received: from localhost ([127.0.0.1]:49575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwnb-0000No-Nb for submit@debbugs.gnu.org; Mon, 29 Mar 2021 14:39:39 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:44989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwnY-0000Nb-So for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 14:39:38 -0400 Received: by mail-qt1-f176.google.com with SMTP id y12so2928233qtx.11 for <47274@debbugs.gnu.org>; Mon, 29 Mar 2021 11:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8PaWGRIw9wg0bV34ZV6L7EiwFj80chVRCdF8PbNLhk0=; b=QZtl1UsAD9RKybemB+Ew4zSJygfnoe8tyu0v0eGJ3TLWFs9rsNKj8Q2A8xhFOST2A5 Z7SpqPfe6r0I5S1qy9i0aDwpN8slSVRXzSjqdRX57o2X8grbL2p8MoBbYv3IUMnxx8Lx wBQwUdohiTPvpu3EuTiBgeChuFBfufbqCClDNiND80095JWC9xMXd2bKFDvF/F+QMpO7 /fFa0x6yTgjUrPYcH4iG4c5aCGIgidnEC6gNmYHsxX2QxNUy2vgvmb6RSqO9/ddpCVTf k/JUyHhSWaNXd19fGwArc9rhuZLsxRwsi+P9CZQCiPrqW/aW/hD0oDihG68qa/GDxz8Q m9JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8PaWGRIw9wg0bV34ZV6L7EiwFj80chVRCdF8PbNLhk0=; b=HqRWujfXMXZhwbMSgTc3Ii4Ekup6exK0AGWZlPC6/JATcDGkdCdHhSjd/MKk6RH3+h 5RL04C8mojLBRG7LFuOaQ/9ozBlo+ELVCzVxNtfut50TqZwRFC0VUscZHageeK2FGJLS mZPyVZX2gk1IMbirGsiDJw/inP8rOH5LdOEaXn4VtMH7h+1pQ6GjTO38NnmSbn2iCjXN vpM3t9p/XyUWHJ/L2WjVY70FUby71O/W2AmoXCOv27+5aF7u6X4cv0knKfXFbIk/ZCWr pXpJFMA/NhuPw5OLqp/aXRtDyRLXbc8lC98LA609EUJzSSiExxGP0Ux6aLlX2HASJezX lnaQ== X-Gm-Message-State: AOAM531vRbDv0FvuVq0vK4O49zVbR7pto2SAS7Ns1k0BAvEUqdKOKJLB Uh6ZI1PDnC95BJZWbBtjB3WnMOQNyEU= X-Google-Smtp-Source: ABdhPJxGbKlS6DhwzKJ36RRlbDsabaO6ij9FeHxXmjgUh2gWb3I9hHhw1wRoBvaMBd3o1qNxXL2qVg== X-Received: by 2002:ac8:44aa:: with SMTP id a10mr25083436qto.146.1617043171383; Mon, 29 Mar 2021 11:39:31 -0700 (PDT) Received: from hurd (dsl-155-113.b2b2c.ca. [66.158.155.113]) by smtp.gmail.com with ESMTPSA id q65sm13869670qkb.51.2021.03.29.11.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 11:39:31 -0700 (PDT) From: Maxim Cournoyer To: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <87v99abjk3.fsf_-_@gmail.com> <6d766246-9eb0-8bc4-fc29-e4efcc2c482c@raghavgururajan.name> Date: Mon, 29 Mar 2021 14:39:30 -0400 In-Reply-To: <6d766246-9eb0-8bc4-fc29-e4efcc2c482c@raghavgururajan.name> (Raghav Gururajan's message of "Mon, 29 Mar 2021 02:13:36 -0400") Message-ID: <87im59by8t.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Raghav, Raghav Gururajan writes: > Hi Maxim! > >> Thanks again! >> Closing. > > Couldn't have done it without you. Thanks for taking the time to reply to each email, eh! Have a great week, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 14:47:22 2021 Received: (at 47274) by debbugs.gnu.org; 29 Mar 2021 18:47:22 +0000 Received: from localhost ([127.0.0.1]:49589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwv4-0000a1-Bk for submit@debbugs.gnu.org; Mon, 29 Mar 2021 14:47:22 -0400 Received: from out1.migadu.com ([91.121.223.63]:51191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQwuz-0000Zp-Px for 47274@debbugs.gnu.org; Mon, 29 Mar 2021 14:47:20 -0400 To: Maxim Cournoyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1617043635; 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=y83J7XOmCdGQkn0hXWZUrMwqFKOKQ/6MWzFmr1uycxw=; b=ckPZk73xBvOHvwR5oUd7ExBvI+OsnKvQQwtSymxqSqATYnCjMu9clN8dH5seLy1xR10yK2 FkUCrh/kxsNIRP5ZU62sBAqFv0DNpb3EnTdSPNHNnD5EwXYApe53taxTIFSDm8MSesDN9M 3YKTBl1w3XSBj19eV6qZZWUl6RUKcXajWqxWjyskeiCLHZ3/Aws3UyTb+S/wHU6hggP9GO oybXdogjMpF77JLTTDZDQR/bC6aRSurCS1Mg9g8U67gbw09zhoe5A9EEI+7qzeQ/iRpnN6 zI5AQu78VVwsIS9UYOtITTKkrj8PiFybGijO4siPa625xxho0iTnknbPlvUlJw== References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> <871rbyd2t7.fsf_-_@gmail.com> <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> <87mtulbyao.fsf@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: bug#47274: Linphone Packages Message-ID: <9944d20f-23f1-6fcf-ac63-34f2b359e750@raghavgururajan.name> Date: Mon, 29 Mar 2021 14:47:13 -0400 MIME-Version: 1.0 In-Reply-To: <87mtulbyao.fsf@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U0buGKPh7idqTdtewmNkqc8b6vcDpZxDO" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47274 Cc: 47274@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --U0buGKPh7idqTdtewmNkqc8b6vcDpZxDO Content-Type: multipart/mixed; boundary="RSN11ZwojXoH2w8TKFAzmSvZFO0tvb3gI"; protected-headers="v1" From: Raghav Gururajan To: Maxim Cournoyer Cc: 47274@debbugs.gnu.org Message-ID: <9944d20f-23f1-6fcf-ac63-34f2b359e750@raghavgururajan.name> Subject: Re: bug#47274: Linphone Packages References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> <26fe14fd-bd97-44fd-5101-26fe608e2e2a@raghavgururajan.name> <871rbyd2t7.fsf_-_@gmail.com> <804f8013-7ceb-77d0-b31b-69e4edd6215b@raghavgururajan.name> <87mtulbyao.fsf@gmail.com> In-Reply-To: <87mtulbyao.fsf@gmail.com> --RSN11ZwojXoH2w8TKFAzmSvZFO0tvb3gI Content-Type: multipart/mixed; boundary="------------A7EDDA018F9EEC776F4604D4" Content-Language: en-US This is a multi-part message in MIME format. --------------A7EDDA018F9EEC776F4604D4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Maxim! > Yes! Both running the binary directly from the store or in a pure > environment, multiple times have worked after the above change. Do you= > experience failures still? Yes! Connection to linphone account fails due to missing=20 /share/linphone/rootca.pem and loading of codecs fails due to missing=20 /lib. I have fixed them in the attached patch. Could you merge it please?= Thank you! Regards, RG. --------------A7EDDA018F9EEC776F4604D4 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-linphone-desktop-Fix-functionality.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-linphone-desktop-Fix-functionality.patch" =46rom a974271757ea113e9b757c2f520273e774134b6a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 29 Mar 2021 03:19:09 -0400 Subject: [PATCH] gnu: linphone-desktop: Fix functionality. * gnu/packages/linphone.scm (linphone-desktop)[phases](post-install): Mod= ify phase. --- gnu/packages/linphone.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 2107560aa0..deda49a4bc 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -839,10 +839,14 @@ and video calls or instant messaging capabilities t= o an application.") ;; 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 files= + ;; refers to its own directories, which lacks files ;; installed by the dependencies. + (symlink (string-append liblinphone "/lib") + (string-append out "/lib")) (symlink (string-append liblinphone "/share/sounds") (string-append out "/share/sounds")) + (symlink (string-append liblinphone "/share/linphone/root= ca.pem") + (string-append out "/share/linphone/rootca.pem")= ) (mkdir-p (dirname grammar-dest)) (symlink (string-append liblinphone "/share/belr/grammars= ") grammar-dest))))))) --=20 2.31.1 --------------A7EDDA018F9EEC776F4604D4-- --RSN11ZwojXoH2w8TKFAzmSvZFO0tvb3gI-- --U0buGKPh7idqTdtewmNkqc8b6vcDpZxDO Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYGIgsQUDAAAAAAAKCRBfWBZkf4vlUQcm AQDR/P3TLdRZD/9gEEyG3CtZWj7quNHGV7szxEzP098IVgD/RFt/14WOGrUNV/gSPBZzn2SkhsBB n8xQ73N3fXC7Hwo= =hX2S -----END PGP SIGNATURE----- --U0buGKPh7idqTdtewmNkqc8b6vcDpZxDO-- From unknown Fri Jun 20 18:20:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 27 Apr 2021 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator