From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iEikOsTtW2BofgEAgWs5BA (envelope-from ) for ; Thu, 25 Mar 2021 02:56:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +BI3NsTtW2AnOQAAbx9fmQ (envelope-from ) for ; Thu, 25 Mar 2021 01:56:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 731A81BE58 for ; Thu, 25 Mar 2021 02:56:20 +0100 (CET) Received: from localhost ([::1]:49214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPFEP-000361-BC for larch@yhetil.org; Wed, 24 Mar 2021 21:56:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPFEA-00035q-L7 for guix-patches@gnu.org; Wed, 24 Mar 2021 21:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPFEA-0000ub-DV for guix-patches@gnu.org; Wed, 24 Mar 2021 21:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPFEA-0001tF-Bs for guix-patches@gnu.org; Wed, 24 Mar 2021 21:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47274] Linphone Packages Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Mar 2021 01:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 47274@debbugs.gnu.org Received: via spool by 47274-submit@debbugs.gnu.org id=B47274.16166373407237 (code B ref 47274); Thu, 25 Mar 2021 01:56:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616637380; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=+97eqwiD63t6cvmmsGxyJeJbKN4Ibq+OBd9RgY5YONg=; b=CC1hCVp8cprDpYcmerlrN8g+MoeNI8ogc+XE3cg93gpWToQ8POjdjGOHXQcLpejcBfYWcd 0tD1fChw6x+q8VlEbXAeCT365dZ+CRQvxmJL+HNAyz/XPKp2ZBvTtVYeI5Qep/owN8M3ML uA2EFocIHqVg0lWOAZbGbpx8JsaO+c0/RN+grs0Qt82W0V1OG9E5QSi2v/ygT42Xb+uwem nGVOHx0X2BMUFmfKxjjzwRGdKuWat3+yzQ2VcJsvZXYJ2sgEhfC1ypCozqejZZV0SmPouh 287zM5y2hBSTP2lxh/KEdtEkpWBbC8dl2OcK5SxoToIWl3Nh7XqJFTkPpYlWtg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616637380; a=rsa-sha256; cv=none; b=XIWKjP73DzElvIbwH2106BxrqQ0xW+jm54s+UUrvLtDC37xSZVe1a1lwgpVji/IoetmIEo v1Buw1gK/qgTGPlisQzD2f0jxF5Xe24dltptwZsb94Z3/vhx6VAvCVGHRjhyxXnHSIqWjr s5eMQfT546jB+SPM9mqqxSI/8mrKGtcri4Mseh7K4GVHLOHYbfeTcc2pUuilfN9Jkdr00I xeFRS0Zd+QUA70zv+bOelDnB1XfaVxK32ynio/PgfjmqiTfQxvcdQsNaQYtawawP5hGasp 3jnc/u0TlC423RPV0mGty+sdK7lZn5pbMMWj1adxA/HqZDs3xkOCfMJBRp8c1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="KWusw/uX"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.18 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="KWusw/uX"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 731A81BE58 X-Spam-Score: 0.18 X-Migadu-Scanner: scn0.migadu.com X-TUID: Ab//Kb0dm/CK 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