Pierre Langlois wrote 4 years ago
(name . Guix-patches)(address . guix-patches@gnu.org)
87im501w3r.fsf@gmx.com
Hi Guix!
Here are a couple of patches to update ardour. While reviewing the
configure output to make sure we weren't missing any inputs I added
libwebsockets, which also needed to be updated.
Looking good?
Thanks,
Pierre
-----BEGIN PGP SIGNATURE-----
iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBrSDgYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UQEUH/RJ6p1i+Mx2c/KF0Ko5fOUww
Fnlq0dvgXahdasy9SEdOGc112T+g/D4MCtEjVvebLubXbkREt5J0tbdGxZcfl+1g
QL7xUK36Uu9RCoiamnTpk5aYrTWv249O49KDJryFa1KejGWwUNzenKOtz6bLHJZJ
1nAJdoVK2wvLivm9EieTqSQnNWnrnZ4tvy+EnlIG/gjxmmvfEhs1SbmP+oYT7SBi
KwCCR7dq7Cu2ai7rLGCi2uITgVizfjueucaYEDaO4aiknwsZZGcMbey8mL8lCvLn
LjpIHIrcZVuNpTWa0AJ2dFIFmWAeT1AtuFk5Ue9fW4GkfCNj5GjdPOfXnEFbw0A=
=k7mw
-----END PGP SIGNATURE-----
From d4cdbc8d91afc68a9a22c714018db557dcfc5bab Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Mon, 5 Apr 2021 15:53:12 +0100
Subject: [PATCH 1/2] gnu: libwebsockets: Update to 4.1.6.
* gnu/packages/web.scm (libwebsockets): Update to 4.1.6.
---
gnu/packages/web.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Toggle diff (37 lines)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7bc638ba88..6d916b9bef 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -22,7 +22,7 @@
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
-;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2017, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2019, 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018, 2019 Julien Lepiller <julien@lepiller.eu>
@@ -1331,18 +1331,17 @@ parser written in ANSI C and a small validating JSON generator.")
(define-public libwebsockets
(package
(name "libwebsockets")
- (version "1.3")
+ (version "4.1.6")
(source (origin
;; The project does not publish tarballs, so we have to take
;; things from Git.
(method git-fetch)
(uri (git-reference
(url "https://github.com/warmcat/libwebsockets")
- (commit (string-append "v" version
- "-chrome37-firefox30"))))
+ (commit (string-append "v" version))))
(sha256
(base32
- "12fqh2d2098mgf0ls19p9lzibpsqhv7mc5rn1yvrbfnazmcr40g4"))
+ "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"))
(file-name (string-append name "-" version))))
(build-system cmake-build-system)
--
2.31.1
From b8d0b8cdc06aced00f414745d0f1ad56120842f2 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Mon, 5 Apr 2021 15:55:24 +0100
Subject: [PATCH 2/2] gnu: ardour: Update to 6.6.
* gnu/packages/audio.scm (ardour): Update to 6.6.
[origin]: Use git protocol, https isn't available anymore. Adapt snippet.
[arguments]: Add "--optimize" flags. Switch to python3.
[inputs]: Add dbus, libwebsockets, openssl, pulseaudio and soundtouch.
---
gnu/packages/audio.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
Toggle diff (88 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index eff45af80f..6e064f7175 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -18,7 +18,7 @@
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot>
-;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
@@ -567,11 +567,11 @@ streams from live audio.")
(define-public ardour
(package
(name "ardour")
- (version "5.12")
+ (version "6.6")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://git.ardour.org/ardour/ardour.git")
+ (url "git://git.ardour.org/ardour/ardour.git")
(commit version)))
(snippet
;; Ardour expects this file to exist at build time. The revision
@@ -581,15 +581,16 @@ streams from live audio.")
"libs/ardour/revision.cc"
(lambda (port)
(format port ,(string-append "#include \"ardour/revision.h\"
-namespace ARDOUR { const char* revision = \"" version "\" ; }"))
+namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }"))
#t)))
(sha256
(base32
- "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"))
+ "0k5rxh8b3d8si3lj01gfqj0pmd448d8sj4asnb205mwhwbfgn0cp"))
(file-name (string-append name "-" version))))
(build-system waf-build-system)
(arguments
`(#:configure-flags '("--cxx11" ; required by gtkmm
+ "--optimize"
"--no-phone-home" ; don't contact ardour.org
"--freedesktop" ; build .desktop file
"--test") ; build unit tests
@@ -619,8 +620,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }"))
ver ".appdata.xml")
(string-append share "/appdata/")))
#t)))
- #:test-target "test"
- #:python ,python-2))
+ #:test-target "test"))
(inputs
`(("alsa-lib" ,alsa-lib)
("atkmm" ,atkmm)
@@ -628,6 +628,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }"))
("boost" ,boost)
("cairomm" ,cairomm)
("curl" ,curl)
+ ("dbus" ,dbus)
("eudev" ,eudev)
("fftw" ,fftw)
("fftwf" ,fftwf)
@@ -644,17 +645,21 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }"))
("libsndfile" ,libsndfile)
("libusb" ,libusb)
("libvorbis" ,libvorbis)
+ ("libwebsockets" ,libwebsockets)
("libxml2" ,libxml2)
("lilv" ,lilv)
("lrdf" ,lrdf)
("lv2" ,lv2)
+ ("openssl" ,openssl) ; Required by libwebsockets.
("pangomm" ,pangomm)
("python-rdflib" ,python-rdflib)
+ ("pulseaudio" ,pulseaudio)
("readline" ,readline)
("redland" ,redland)
("rubberband" ,rubberband)
("serd" ,serd)
("sord" ,sord)
+ ("soundtouch" ,soundtouch)
("sratom" ,sratom)
("suil" ,suil)
("taglib" ,taglib)
--
2.31.1