From: Alexandros Theodotou <alex@zrythm.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: Tobias Geerinckx-Rice <me@tobias.gr>,
42473@debbugs.gnu.org,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
GNU Guix maintainers <guix-maintainers@gnu.org>
Subject: [bug#42473] [PATCH] gnu: zrythm: Update to 0.8.694.
Date: Fri, 11 Sep 2020 17:52:35 +0100 [thread overview]
Message-ID: <5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org> (raw)
In-Reply-To: <871rj8tjdz.fsf@gnu.org>
[-- Attachment #1.1: Type: text/plain, Size: 1423 bytes --]
Hi,
On Fri, 2020-09-11 at 17:36 +0200, Ludovic Courtès wrote:
> This requires Meson 0.55 so it doesn’t work on master.
>
> Could you add Meson 0.55 and have zrythm use it?
Done. Not sure exactly what you expect but I added an additional
meson55 package and used it like #:meson ,meson55. Feel free to edit it
accordingly.
> > 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.
Err, gitg miss, I only selected the additions to stage. Fixed.
> Could you resend the other 3 patches, making sure everything works on
> master?
Please find them attached.
Thanks,
Alex
[-- Attachment #1.2: 0004-gnu-zrythm-Update-to-0.8.911.patch --]
[-- Type: text/x-patch, Size: 3782 bytes --]
From 5445ba672111bd753fcbba831996996de9d0fff0 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Fri, 11 Sep 2020 17:48:40 +0100
Subject: [PATCH 4/4] gnu: zrythm: Update to 0.8.911.
* gnu/packages/music.scm (zrythm): Update to 0.8.911.
---
gnu/packages/music.scm | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index aa55607939..57298c5d87 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -73,11 +73,13 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages code)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
@@ -5442,8 +5444,13 @@ 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. The trademark policy
+ ;; allows verbatim re-distribution, and it also allows FSF-approved
+ ;; distros to make necessary changes to integrate the software into the
+ ;; distribution.
(name "zrythm")
- (version "0.8.333")
+ (version "0.8.911")
(source
(origin
(method url-fetch)
@@ -5451,13 +5458,19 @@ and as an LV2 plugin.")
version ".tar.xz"))
(sha256
(base32
- "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb"))))
+ "1xyp70sjc2k5pfdqbwqa988v86da0rmmyl8ry86bqv4ja80sc6g9"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
+ #:meson ,meson55
#:configure-flags
- `("-Denable_tests=true" "-Dmanpage=true"
- "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")
+ `("-Dtests=true"
+ "-Dmanpage=true"
+ "-Ddseg_font=false"
+ "-Dgraphviz=enabled" ; for exporting routing graphs
+ "-Dguile=enabled" ; for Guile scripting
+ "-Djack=enabled" ; for JACK audio/MIDI backend
+ "-Dsdl=enabled") ; for SDL audio backend (which uses ALSA)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-xdg-open
@@ -5470,7 +5483,6 @@ and as an LV2 plugin.")
`(("alsa-lib" ,alsa-lib)
("jack" ,jack-1)
("font-dseg" ,font-dseg)
- ("ffmpeg" ,ffmpeg)
("fftw" ,fftw)
("fftwf" ,fftwf)
("gettext" ,gettext-minimal)
@@ -5479,19 +5491,23 @@ and as an LV2 plugin.")
("gtk+" ,gtk+)
("gtksourceview" ,gtksourceview)
("guile" ,guile-2.2)
+ ("libaudec" ,libaudec)
("libcyaml" ,libcyaml)
("libsamplerate" ,libsamplerate)
("libsndfile" ,libsndfile)
("libyaml" ,libyaml)
("lilv" ,lilv)
+ ("lv2" ,lv2)
+ ("reproc" ,reproc)
+ ("rubberband" ,rubberband)
+ ("rtmidi" ,rtmidi)
+ ("sdl2" ,sdl2)
("xdg-utils" ,xdg-utils)
- ("rubberband" ,rubberband)))
+ ("zstd" ,zstd "lib")))
(native-inputs
`(("pkg-config" ,pkg-config)
("help2man" ,help2man)
- ("libaudec" ,libaudec)
- ("lv2" ,lv2)
- ("glib" ,glib "bin"))) ;for 'glib-compile-resources'
+ ("glib" ,glib "bin"))) ; for 'glib-compile-resources'
(synopsis "Digital audio workstation focusing on usability")
(description "Zrythm is a digital audio workstation designed to be
featureful and easy to use. It offers unlimited automation options, LV2
--
2.27.0
[-- Attachment #1.3: 0003-gnu-libaudec-Update-to-0.2.3.patch --]
[-- Type: text/x-patch, Size: 1462 bytes --]
From f19400bbce4d53df8d5829a3db4e3047b6b5ea6e Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Fri, 11 Sep 2020 17:37:23 +0100
Subject: [PATCH 3/4] gnu: libaudec: Update to 0.2.3.
* gnu/packages/audio.scm (libaudec): Update to 0.2.3.
---
gnu/packages/audio.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 0746f67b2e..5e6008f31e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4610,7 +4610,7 @@ in the package.")
(define-public libaudec
(package
(name "libaudec")
- (version "0.2.2")
+ (version "0.2.3")
(source
(origin
(method git-fetch)
@@ -4620,14 +4620,14 @@ in the package.")
(file-name (git-file-name name version))
(sha256
(base32
- "04mpmfmqc43asw0m3zxhb6jj4qms7x4jw7mx4xb1d3lh16xllniz"))))
+ "04hw61db8wscj28qjyiaiafx8xl87njgmvqszxyhs4gmg8xgjip7"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true")))
+ ;; Compile tests.
+ `(#:configure-flags `("-Dtests=true")))
(inputs
`(("libsamplerate" ,libsamplerate)
- ("libsndfile" ,libsndfile)
- ("ffmpeg" ,ffmpeg)))
+ ("libsndfile" ,libsndfile)))
(native-inputs
`(("pkg-config", pkg-config)))
(synopsis "Library for reading and resampling audio files")
--
2.27.0
[-- Attachment #1.4: 0002-gnu-libcyaml-Update-to-1.1.0.patch --]
[-- Type: text/x-patch, Size: 1182 bytes --]
From e242e5eace681f9d0a6fda1b6e7c496a052f6ee9 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Fri, 11 Sep 2020 17:34:22 +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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 2c3a007779..f0d7278a59 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5027,7 +5027,7 @@ written in C. It is developed as part of the NetSurf project.")
(define-public libcyaml
(package
(name "libcyaml")
- (version "1.0.1")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
@@ -5036,7 +5036,7 @@ written in C. It is developed as part of the NetSurf project.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
+ (base32 "1al5cbild3qimm59rmaj3i8m57qhinwshz7r67p7fqsccijrz71b"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
--
2.27.0
[-- Attachment #1.5: 0001-gnu-Add-meson55.patch --]
[-- Type: text/x-patch, Size: 1331 bytes --]
From 434b1ee36502451959328b1fc426acdf44b4f980 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Fri, 11 Sep 2020 17:27:56 +0100
Subject: [PATCH 1/4] gnu: Add meson55.
* gnu/packages/build-tools.scm (meson55): New variable.
---
gnu/packages/build-tools.scm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 7213c1bd0b..45471dc954 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -211,6 +211,22 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
resembles Python.")
(license license:asl2.0)))
+;; Added temporarily for packages that need it.
+;; TODO: Remove when core-updates is merged.
+(define-public meson55
+ (package
+ (inherit meson)
+ (name "meson55")
+ (version "0.55.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mesonbuild/meson/"
+ "releases/download/" version "/meson-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1070kjiirxxdfppmrhi3wsc6rykay1zlciqrzayjhjg0hkw42mrv"))))))
+
(define-public meson-for-build
(package
(inherit meson)
--
2.27.0
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-09-11 16:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 8:34 [bug#42473] [PATCH] gnu: zrythm: Update to 0.8.694 Alexandros Theodotou
2020-07-22 22:16 ` Ludovic Courtès
2020-07-23 3:06 ` Maxim Cournoyer
2020-07-26 10:16 ` Alexandros Theodotou
2020-07-26 17:08 ` Tobias Geerinckx-Rice via Guix-patches via
2020-07-26 19:26 ` Alexandros Theodotou
2020-07-26 22:51 ` Leo Prikler
2020-09-10 10:22 ` Ludovic Courtès
2020-09-10 13:16 ` Alexandros Theodotou
2020-09-11 15:36 ` Ludovic Courtès
2020-09-11 16:52 ` Alexandros Theodotou [this message]
2020-09-13 21:37 ` bug#42473: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org \
--to=alex@zrythm.org \
--cc=42473@debbugs.gnu.org \
--cc=guix-maintainers@gnu.org \
--cc=ludo@gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).