From patchwork Fri Jul 10 18:32:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 23156 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D935E27BBE1; Fri, 10 Jul 2020 19:33:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 323FE27BBE4 for ; Fri, 10 Jul 2020 19:33:11 +0100 (BST) Received: from localhost ([::1]:51642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtxpe-0004kf-GL for patchwork@mira.cbaines.net; Fri, 10 Jul 2020 14:33:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtxpW-0004jl-E7 for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtxpW-0006MU-3M for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jtxpV-0001pK-Sl for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [[PATCH V2] 01/10] gnu: libring: Fetch from git, update to 20200708-guix. References: <20200706153442.1843-1-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200706153442.1843-1-tona_kosmicznego_smiecia@interia.pl> Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Jul 2020 18:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42229@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15944059616928 (code B ref 42229); Fri, 10 Jul 2020 18:33:01 +0000 Received: (at 42229) by debbugs.gnu.org; 10 Jul 2020 18:32:41 +0000 Received: from localhost ([127.0.0.1]:43391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtxpA-0001nK-SD for submit@debbugs.gnu.org; Fri, 10 Jul 2020 14:32:41 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:39518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtxp7-0001mY-RI for 42229@debbugs.gnu.org; Fri, 10 Jul 2020 14:32:39 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Fri, 10 Jul 2020 20:32:30 +0200 (CEST) From: Jan Wielkiewicz Date: Fri, 10 Jul 2020 20:32:11 +0200 Message-Id: <20200710183220.19829-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1594405951; bh=HJVwVijVM/6YnI8pFsLphSCYJO7wPlJ53Lzpb+Wz37I=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding: X-Interia-Antivirus; b=aT+EfsOSKZbI2kssL6OGcnuQC93D6AGHtdpnPfgzxpz9bIzK3hamybsEt81N+JGZ+ RCYQlzUaxZfwwJYE2Axdf7Le+HgbH41+O2ruRt+F23FGWStJ1s/FZ03P3SIn7hxnbU Y7bEpIf2JZfmNKs3j/lWNG7fbCg8g59UAr3rlrig= 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (define-module): Use the "backup" module. (%jami-version, %libring-commit, %libring-revision): New variables. (jami-source): Rename procedure to (libring-source). (libring-source)[without-daemon]: Rename keyword to [without-contrib]. [origin]: Fetch from git, update path to the contrib directory, update hash and commit. (libring)[source]: Use (libring-source). [version]: Use the (%jami-version, %libring-commit, %libring-revision) variables. [inputs]: Add libarchive, remove obsolete comment - there's pjproject-jami already. [arguments]: Do not chdir to "daemon" - due to fetching from git, we're in the proper directory already. --- gnu/packages/jami.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index d5cb3b62f6..06aeafea5d 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -62,23 +63,29 @@ #:use-module (guix utils) #:use-module (srfi srfi-1)) -(define %jami-version "20200401.1.6f090de") +(define %jami-version "20200708-guix") +(define %libring-commit "07188b4a717e5ac6e582d71c895b74fbbfd02b24") +(define %libring-revision "0") -(define* (jami-source #:key without-daemon) +(define* (libring-source #:key without-contrib) (origin - (method url-fetch) - (uri (string-append "https://dl.jami.net/release/tarballs/jami_" - %jami-version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://review.jami.net/ring-daemon") + (commit %libring-commit))) + (file-name (git-file-name (if without-contrib + "libring-source-without-contrib" + "libring-source") + %jami-version)) (modules '((guix build utils))) (snippet - (if without-daemon + (if without-contrib '(begin - (delete-file-recursively "daemon/contrib")) + (delete-file-recursively "contrib")) #f)) (sha256 (base32 - "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) + "05068ijvbd6gd9i14iz23dn5nc0fsphwa3hpdpqairqv00rr9h9b")))) ;; Savoir-Faire Linux modifies many libraries to add features ;; to Jami. This procedure makes applying patches to a given @@ -441,8 +448,8 @@ (define-public libring (package (name "libring") - (version %jami-version) - (source (jami-source #:without-daemon #t)) + (version (git-version %jami-version %libring-revision %libring-commit)) + (source (libring-source #:without-contrib #t)) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -462,6 +469,7 @@ ("opus" ,opus) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) + ("libarchive" ,libarchive) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("speex" ,speex) @@ -479,8 +487,6 @@ ("restinio" ,restinio) ("libx11" ,libx11) ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. ("pjproject" ,pjproject-jami))) (native-inputs `(("autoconf" ,autoconf) @@ -494,10 +500,6 @@ `(#:tests? #f ; The tests fail to compile due to missing headers. #:phases (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "daemon") - #t)) (add-before 'build 'add-lib-dir (lambda _ (mkdir-p "src/lib")