diff mbox series

[bug#42473] gnu: zrythm: Update to 0.8.694.

Message ID 679bd4b51b68c5d83257618ef9855e7d54a71a94.camel@zrythm.org
State Accepted
Headers show
Series [bug#42473] gnu: zrythm: Update to 0.8.694. | expand

Commit Message

Alexandros Theodotou Sept. 10, 2020, 1:16 p.m. UTC 
Hi Ludo,

> (I personally think wording that also includes Debian and Fedora, for
> instance, would be welcome, but it’s beyond the scope of this issue.)

Indeed, would be a good idea to add the "major" distros. Will add them
soon.

> There haven’t been further comments on this issue from fellow
> co-maintainers so I would suggest that you post a patch updating to
> the
> latest release and I’ll gladly apply it.

Attaching the 4 patches required to update zrythm to 0.8.911 (including
a new dependency: reproc, and updated dependencies: libaudec &
libcyaml).

For libaudec, mp3 handling is done via the embedded tinymp3 library now
(which could perhaps be packaged in the future and add an option to use
a system version) so ffmpeg is no longer necessary (same for zrythm).

For zrythm, I moved some dependencies from native-inputs to inputs
since they are better suited there (I was initially misunderstanding
what "native-inputs" meant when I first submitted it). Zstd is now also
a dependency (used to compress/decompress project files).

There are a few more updates I want to make to add support for optional
features but I will do that in future patches. Let's just get the
latest version working first.

Thanks,
Alex

On Thu, 2020-09-10 at 12:22 +0200, Ludovic Courtès wrote:
> Hi Alexandros!
> 
> AIUI, the FSDG-distro exemption at
> <https://www.zrythm.org/en/trademarks.html> applies to the latest
> release (and presumably foreseeable releases as well):
> 
>   You may further distribute altered copies of Zrythm that include
> the
>   Zrythm trademarks, provided that alterations solely serve the
> purposes
>   of:
> 
>   • porting Zrythm to a free system distribution currently approved
> by
>     the Free Software Foundation at
>     https://www.gnu.org/distros/free-distros.html, OR
> 
>   • fixing a bug in Zrythm that has already been acknowledged by
>     Alexandros Theodotou or CVE (https://cve.mitre.org/)
> 
> (I personally think wording that also includes Debian and Fedora, for
> instance, would be welcome, but it’s beyond the scope of this issue.)
> 
> There haven’t been further comments on this issue from fellow
> co-maintainers so I would suggest that you post a patch updating to
> the
> latest release and I’ll gladly apply it.
> 
> Thanks in advance, and apologies for the delay!
> 
> Ludo’.

Comments

Ludovic Courtès Sept. 11, 2020, 3:36 p.m. UTC | #1 
Hi,

Alexandros Theodotou <alex@zrythm.org> skribis:

> From 315b2618d2a95a950790d2a0bba05747b880505a Mon Sep 17 00:00:00 2001
> From: Alexandros Theodotou <alex@zrythm.org>
> Date: Thu, 10 Sep 2020 14:03:20 +0100
> Subject: [PATCH 4/4] gnu: zrythm: Update to 0.8.911.
>
> * gnu/packages/music.scm (zrythm): Update to 0.8.911.

This requires Meson 0.55 so it doesn’t work on master.

Could you add Meson 0.55 and have zrythm use it?

> From 10df2f9e6d8e533fc4df9ec067ef88468d788034 Mon Sep 17 00:00:00 2001
> From: Alexandros Theodotou <alex@zrythm.org>
> Date: Thu, 10 Sep 2020 13:49:51 +0100
> Subject: [PATCH 2/4] gnu: libcyaml: Update to 1.1.0.
>
> * gnu/packages/web.scm (libcyaml): Update to 1.1.0.
> ---
>  gnu/packages/web.scm | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index b674019b8f..01f8a6bfc2 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -5027,6 +5027,7 @@ written in C.  It is developed as part of the NetSurf project.")
>    (package
>      (name "libcyaml")
>      (version "1.0.1")
> +    (version "1.1.0")
>      (source
>       (origin
>         (method git-fetch)
> @@ -5036,6 +5037,7 @@ written in C.  It is developed as part of the NetSurf project.")
>         (file-name (git-file-name name version))
>         (sha256
>          (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
> +        (base32 "1al5cbild3qimm59rmaj3i8m57qhinwshz7r67p7fqsccijrz71b"))))

This one is obviously broken.  I tried to redo it by hand, but then
zrythm would fail to build.

> From 62dbf6ea03a35300be72e220732c9fd7de2a5e60 Mon Sep 17 00:00:00 2001
> From: Alexandros Theodotou <alex@zrythm.org>
> Date: Thu, 10 Sep 2020 13:45:25 +0100
> Subject: [PATCH 1/4] gnu: Add reproc.
>
> * gnu/packages/cpp.scm (reproc): New variable.

Applied!

Could you resend the other 3 patches, making sure everything works on
master?

TIA!

Ludo’.
diff mbox series

Patch

From 62dbf6ea03a35300be72e220732c9fd7de2a5e60 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Thu, 10 Sep 2020 13:45:25 +0100
Subject: [PATCH 1/4] gnu: Add reproc.

* gnu/packages/cpp.scm (reproc): New variable.
---
 gnu/packages/cpp.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 78f0f28716..5ee7171158 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -13,6 +13,7 @@ 
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -493,6 +494,36 @@  it's own version of the tool, this is a fork that aims to be more responsive
 and make @code{cpplint} usable in wider contexts.")
     (license license:bsd-3)))
 
+(define-public reproc
+  (package
+    (name "reproc")
+    (version "14.1.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/DaanDeMeyer/reproc")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"))))
+   (build-system cmake-build-system)
+   (arguments
+      ;; No tests.
+    `(#:tests? #f
+      ;; Enable building of shared library.
+      #:configure-flags `("-DBUILD_SHARED_LIBS=1")))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)))
+   (synopsis "Process IO library")
+   (description "reproc (Redirected Process) is a C/C++ library that
+simplifies starting, stopping and communicating with external programs.  The
+main use case is executing command line applications directly from C or C++
+code and retrieving their output.")
+   (home-page "https://github.com/DaanDeMeyer/reproc")
+   (license license:expat)))
+
 (define-public sobjectizer
   (package
     (name "sobjectizer")
-- 
2.27.0