From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id dcCzMPSUXmCs0gAAgWs5BA (envelope-from ) for ; Sat, 27 Mar 2021 03:14:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eH1UKfSUXmAlcQAAB5/wlQ (envelope-from ) for ; Sat, 27 Mar 2021 02:14:12 +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 B70691EB92 for ; Sat, 27 Mar 2021 03:14:11 +0100 (CET) Received: from localhost ([::1]:55706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPySo-0007Lc-SQ for larch@yhetil.org; Fri, 26 Mar 2021 22:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPySh-0007LT-67 for guix-patches@gnu.org; Fri, 26 Mar 2021 22:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPySg-0006Wg-Gw for guix-patches@gnu.org; Fri, 26 Mar 2021 22:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPySg-0002AR-B9 for guix-patches@gnu.org; Fri, 26 Mar 2021 22:14: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: Sat, 27 Mar 2021 02:14: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.16168111928264 (code B ref 47274); Sat, 27 Mar 2021 02:14:02 +0000 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 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-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=1616811252; 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=GPXXp+sJHelArayMl+L/u7BnDsc9YQ7zdh7nTJ/3uHc=; b=oU5MCP7D46D9tekUHmBcF9+VKcMxcVwFXnC9yZXr2tGKtvzxXwHGQaQsPdpzrE5KX6Ih/3 Pfx51hziJM4Nmvpci3qjc4ZtTrCKvES2edQcfvpaRYw/KjMsKNWzXXObHpDhqoo3WYPKQj DA46NGcp18+Z7Ut1hMDZPg2bW61m4QIvEmaFa5lePqAxsho5QdnwdyKKHtQF3UHCIfX/Y2 d9tVueEHbtK+z+SxkCU/TXS3OkdJAqSPGb459ElxqAMH+UufB8x+gq8dBuppH3tuAK/GsD b7v32+oj8M6rBKfEeFETnQQggrX/MxZdC7/C6nYj0YkkFHzdVNV88WKAhlGEsw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616811252; a=rsa-sha256; cv=none; b=JwnPIsvU5ts0EMPZBpABoW5cDBA7KMrVrOh7xiv0MTuIxigRmJ9NXBRNsEvpfxC7eRuFzi KWmpSlrNdvMI9NLJL7TCjWo2/tpoohADOw3wYn4C4+LFu4+0WqAGRBpLEkU5glURj0AiVJ CccNcaOBEb7866dmcRR25gORwjE+GJVyNtz07uo3GTR/mpMU8uBp20p1jkz+dWJOOhcvG1 j7SNFbg9DN+TbCCXHQRTYdQ8oNtqoTLTuADde1xNAo/uDR6iHnQpuvitDJi4Cb4a+9C6+Z 26FgnRKDzB+/3Le6yRP6l65QRQRaj/hdWWBbb4QdisxTeoUc+Yot58BA/sXDSw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=NuF1tpzS; 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: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=NuF1tpzS; 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: B70691EB92 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: DVG0IGmcwRRB 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