From patchwork Sun Jul 26 10:16:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandros Theodotou X-Patchwork-Id: 23381 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 7F06127BBE1; Sun, 26 Jul 2020 11:17:10 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 2384027BBE3 for ; Sun, 26 Jul 2020 11:17:09 +0100 (BST) Received: from localhost ([::1]:40932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzdiO-00076W-ID for patchwork@mira.cbaines.net; Sun, 26 Jul 2020 06:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzdiI-00074h-BQ for guix-patches@gnu.org; Sun, 26 Jul 2020 06:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40274) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jzdiI-000882-2V for guix-patches@gnu.org; Sun, 26 Jul 2020 06:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jzdiH-0005xy-PG for guix-patches@gnu.org; Sun, 26 Jul 2020 06:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42473] [PATCH] gnu: zrythm: Update to 0.8.694. Resent-From: Alexandros Theodotou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Jul 2020 10:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= Cc: 42473@debbugs.gnu.org, GNU Guix maintainers Received: via spool by 42473-submit@debbugs.gnu.org id=B42473.159575860422908 (code B ref 42473); Sun, 26 Jul 2020 10:17:01 +0000 Received: (at 42473) by debbugs.gnu.org; 26 Jul 2020 10:16:44 +0000 Received: from localhost ([127.0.0.1]:51820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzdhz-0005xP-UL for submit@debbugs.gnu.org; Sun, 26 Jul 2020 06:16:44 -0400 Received: from mout02.posteo.de ([185.67.36.142]:60345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzdhx-0005xB-9Y for 42473@debbugs.gnu.org; Sun, 26 Jul 2020 06:16:42 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 20B522400FE for <42473@debbugs.gnu.org>; Sun, 26 Jul 2020 12:16:34 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BDzPB3V99z9rxG; Sun, 26 Jul 2020 12:16:30 +0200 (CEST) Message-ID: From: Alexandros Theodotou Date: Sun, 26 Jul 2020 11:16:28 +0100 In-Reply-To: <87wo2vdj6d.fsf@gmail.com> References: <0e6300fea9caa1f9d7645c968a7c5b50d89f7b5c.camel@zrythm.org> <87k0yvfb60.fsf@gnu.org> <87wo2vdj6d.fsf@gmail.com> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 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 Hi, Thanks for the feedback! Attaching the updated patch. Thanks, Alex On Wed, 2020-07-22 at 23:06 -0400, Maxim Cournoyer wrote: > Hello, > > Ludovic Courtès writes: > > > Hi Alexandros, > > > > Alexandros Theodotou skribis: > > > > > This is actually 2 patches. The first updates libcyaml and the > > > 2nd > > > Zrythm. Note that I (Zrythm author) have added a trademark policy > > > to > > > Zrythm that says modified versions that include the trademarks > > > require > > > permission (as discussed on IRC with a few people): > > > https://www.zrythm.org/en/trademarks.html > > > > > > I am not 100% sure if patching the xdg-open path counts as a > > > modified > > > version, but in any case this email is signed using the same key > > > used > > > to sign the release, so it can be interpreted as "written > > > permission" > > > to redistribute this. > > > > OK. Perhaps right above the ‘name’ field of the package, you could > > add > > a link to the trademark policy above and state that Guix has a > > written > > permission to use it, with a link to your message? That way we’ll > > have > > an audit trail. > > That's a good idea. > > > > The FSDG allows trademarks from what I understand: > > > > Your interpretation seems correct to me. > > To me as well. > > > > So it is up to the maintainers to decide if they want to keep > > > Zrythm as > > > it is or rename it. Either way, I am happy with either decision, > > > although I would prefer if you were OK with keeping the "Zrythm" > > > name > > > (as long as there's no patches to remove/add functionality or > > > links to > > > the Zrythm website or things like that). > > > > I don’t see any reason not to keep “Zrythm” as things stand. > > > > Thoughts anyone? (Cc: maintainers.) > > I wish the trademark restrictions were relaxed to include the right > for > modifications made solely with the goal of > building/packaging/integrating the software with a free software > distribution. This would make things hassle free and extra clear. > > That said, I'm not opposed to include Zrythm as things stands, if > other > maintainers are OK with it. > > Maxim From 93189e429e19246c2039630b871eadd9c10cb73f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 22 Jul 2020 09:19:26 +0100 Subject: [PATCH 2/2] gnu: zrythm: Update to 0.8.694. * gnu/packages/music.scm (zrythm): Update to 0.8.694. --- gnu/packages/music.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3089a22c7c..f1db53ca65 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5203,8 +5203,12 @@ and as an LV2 plugin.") (define-public zrythm (package + ;; Zrythm contains trademarks and comes with a trademark policy found in + ;; TRADMARKS.md inside the release distribution. Guix has written + ;; permission to use the Zrythm trademarks: + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42473 (name "zrythm") - (version "0.8.333") + (version "0.8.694") (source (origin (method url-fetch) @@ -5212,13 +5216,13 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32 - "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb")))) + "17a2g153cyrx0jjgd2ppyraprlnk2zi4ihzr3f7gn0485crlc2g2")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags - `("-Denable_tests=true" "-Dmanpage=true" - "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true") + `("-Dtests=true" "-Dmanpage=true" + "-Ddseg_font=false" "-Dffmpeg=enabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-xdg-open @@ -5245,8 +5249,9 @@ and as an LV2 plugin.") ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) ("lilv" ,lilv) + ("rubberband" ,rubberband) ("xdg-utils" ,xdg-utils) - ("rubberband" ,rubberband))) + ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("help2man" ,help2man) -- 2.27.0