* [bug#56140] Resending the patches with correcting mistakes.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
@ 2022-06-24 8:54 ` Sughosha via Guix-patches via
2022-06-28 7:45 ` [bug#56140] [Patches] Add and update music packages Alice BRENON
` (10 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2022-06-24 8:54 UTC (permalink / raw)
To: 56140@debbugs.gnu.org
[-- Attachment #1.1: Type: text/plain, Size: 123 bytes --]
Sorry that I have not used full sentenses in change log. I came to know about it later. I am sending all the patches again.
[-- Attachment #1.2: Type: text/html, Size: 203 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch1.patch --]
[-- Type: text/x-patch; name=patch1.patch, Size: 3208 bytes --]
From ba87d4713da9cc26cc7279c56d287f385bf696bc Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Wed, 22 Jun 2022 14:30:17 +0200
Subject: [PATCH 1/4] gnu: Update sorcer
* gnu/packages/music.scm: Update sorcer to its latest commit which fixes its building.
---
gnu/packages/music.scm | 59 ++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 60cb176320..449d4ab250 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5055,44 +5055,29 @@ (define-public patchmatrix
(license license:artistic2.0)))
(define-public sorcer
- (package
- (name "sorcer")
- (version "1.1.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/openAVproductions/"
- "openAV-Sorcer/archive/release-"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "07iyqj28wm0xc4arrq893bm12xjpz65db7ynrlmf6w8krg8wjmd0"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f ; no tests included
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-architecture-specific-flags
- (lambda _
- (substitute* "CMakeLists.txt"
- (("-msse2 -mfpmath=sse") ""))
- #t))
- (add-after 'unpack 'build-faust-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "faust"
- (delete-file "main.cpp")
- (invoke "faust" "-i"
- "-a" "lv2synth.cpp"
- "-o" "main.cpp" "main.dsp")))))))
- (inputs
- (list boost lv2 ntk))
- (native-inputs
- (list faust pkg-config))
- (home-page "http://openavproductions.com/sorcer/")
- (synopsis "Wavetable LV2 plugin synth")
- (description "Sorcer is a wavetable LV2 plugin synthesizer, targeted at
+ (let ((revision "6") (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
+ (package
+ (name "sorcer")
+ (version (git-version "1.1.3" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/openAVproductions/openAV-Sorcer")
+ (commit commit)))
+ (sha256
+ (base32
+ "0ryaglp2pzln2bm0pwc5p9lb2nk0x4wmrs4c4cp6d2m2hhk82yk7"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ;no tests included
+ (inputs (list boost lv2 ntk))
+ (native-inputs (list faust pkg-config))
+ (home-page "http://openavproductions.com/sorcer/")
+ (synopsis "Wavetable LV2 plugin synth")
+ (description "Sorcer is a wavetable LV2 plugin synthesizer, targeted at
the electronic or dubstep genre.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public sonivox-eas
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: patch2.patch --]
[-- Type: text/x-patch; name=patch2.patch, Size: 2365 bytes --]
From 98d2fde325564c4a004613546d00a1c6e75502a8 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Wed, 22 Jun 2022 14:31:39 +0200
Subject: [PATCH 2/4] gnu: Add distrho-ports
* gnu/packages/music.scm: Add distrho-ports.
---
gnu/packages/music.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 449d4ab250..e691d43d12 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5938,6 +5938,37 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ (let ((revision "602") (commit "5907a18cb50dd63d84d37776dfd8e8dcc7f3e378"))
+ (package
+ (name "distrho-ports")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ (commit commit)))
+ (sha256
+ (base32
+ "1ggl3piwb18gkz3glbqx5h1dcjcc5b9kpssd54fpxddaxagc4pwz"))))
+ (build-system meson-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config) ("cmake" ,cmake-minimal)))
+ (inputs (list fftwf
+ alsa-lib
+ freetype
+ libx11
+ libxrender
+ libxext
+ libxcursor
+ mesa))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Linux audio plugins and LV2 ports")
+ (description
+ "This package contains GNU/Linux and LV2 ports of the following plugins: The Function, The Pilgrim, Dexed, dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb, Tremolo), DrumSynth, EasySSP, EQinox, HiReSam, JuceOPL, KlangFalter, LUFS Meter, LUFS Meter (Multichannel), Luftikus, Obxd, PitchedDelay, ReFine, StereoSourceSeperation, Swanky Amp, TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II, Reverb-III, Vocoder-II), Temper, Vex, Vitalium and Wolpertinger")
+ ;; This package consists of several plugins.
+ ;; Different copyrights and licenses apply to different plugins.
+ (license (list license:gpl2 license:lgpl3)))))
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: patch3.patch --]
[-- Type: text/x-patch; name=patch3.patch, Size: 1862 bytes --]
From e695d37744c81963f22e93af9aafbadd38983b5a Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Wed, 22 Jun 2022 14:32:11 +0200
Subject: [PATCH 3/4] gnu: Add luppp
* gnu/packages/music.scm: Add luppp.
---
gnu/packages/music.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index e691d43d12..a3710adf3a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5054,6 +5054,33 @@ (define-public patchmatrix
OSC connections.")
(license license:artistic2.0)))
+(define-public luppp
+ (let ((revision "29") (commit "23da1497f80dbace48b7807afd3570c57a4d5994"))
+ (package
+ (name "luppp")
+ (version (git-version "1.2.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openAVproductions/openAV-Luppp")
+ (commit commit)))
+ (sha256
+ (base32
+ "1rjl7fwnqq1gxa3haw1z0p1mld23i194sc43m03h9isagkwxrx9d"))))
+ (build-system meson-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config) ("cmake-minimal" ,cmake-minimal)))
+ (inputs (list cairo
+ ntk
+ liblo
+ jack-1
+ libsndfile
+ libsamplerate))
+ (home-page "http://openavproductions.com/luppp")
+ (synopsis "Live performance tool")
+ (description
+ "Luppp is a music creation tool, intended for live use. The focus is on real time processing and a fast and intuitive workflow with MIDI mapping support.")
+ (license license:gpl3))))
+
(define-public sorcer
(let ((revision "6") (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: patch4.patch --]
[-- Type: text/x-patch; name=patch4.patch, Size: 1801 bytes --]
From f8fd8c894b62080da31982431550946296e61407 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Wed, 22 Jun 2022 14:32:28 +0200
Subject: [PATCH 4/4] gnu: Add fabla
* gnu/packages/music.scm: Add fabla.
---
gnu/packages/music.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index a3710adf3a..9f992706b7 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5081,6 +5081,30 @@ (define-public luppp
"Luppp is a music creation tool, intended for live use. The focus is on real time processing and a fast and intuitive workflow with MIDI mapping support.")
(license license:gpl3))))
+(define-public fabla
+ (let ((revision "18") (commit "10acf03046d980f96ed192d5acb9deb812f5c639"))
+ (package
+ (name "fabla")
+ (version (git-version "1.2.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openAVproductions/openAV-Fabla")
+ (commit commit)))
+ (sha256
+ (base32
+ "0ybbzb86j1n5dfhzc6aa3cibkwi6q3x0c18b1w3anyibanmr1wmc"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f))
+ (native-inputs `(("pkg-config" ,pkg-config) ("lv2" ,lv2)
+ ("mesa" ,mesa)))
+ (inputs (list ntk cairomm libsndfile))
+ (home-page "http://openavproductions.com/fabla")
+ (synopsis "Drum sampler LV2 plugin")
+ (description "Fabla is a drum sampler LV2 plugin.")
+ (license license:gpl3))))
+
(define-public sorcer
(let ((revision "6") (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
(package
--
2.36.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [Patches] Add and update music packages
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
2022-06-24 8:54 ` [bug#56140] Resending the patches with correcting mistakes Sughosha via Guix-patches via
@ 2022-06-28 7:45 ` Alice BRENON
2022-06-28 8:30 ` Sughosha via Guix-patches via
` (9 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Alice BRENON @ 2022-06-28 7:45 UTC (permalink / raw)
To: 56140
Hi !
Thanks for submitting this patch ! I'm in no position to provide
a definitive answer to accept or reject this but here are some immediate
things that could be improved.
- your description of Fabla doesn't add much information compared to
the synopsis. What makes it special ? How is it different from the
other similar tools ? (see
https://guix.gnu.org/fr/manual/devel/en/html_node/Synopses-and-Descriptions.html#Synopses-and-Descriptions
for inspiration)
- the other packages seem to have more extensive description, but they
make very long lines, have you tried formatting your package using
the `guix style` command ?
(https://guix.gnu.org/fr/manual/devel/en/html_node/Formatting-Code.html#Formatting-Code)
- you seem to consistently use the "old" syntax for
packages in native-inputs, as opposed to inputs, is there a good
reason for that or have you maybe only found examples where the
native-inputs haven't been modernized ? While it makes sense to
rename `cmake-minimal` to `cmake` in the definition of
`distrho-ports` (though I wonder `luppp` didn't require the same
renaming and keeps the key "cmake-minimal" for `cmake-minimal`, all
the others occurrences (`("pkg-config" ,pkg-config)`, `("lv2" ,lv2)`…)
are totally unneeded for as far as I understand and could be
simplified as `(list pkg-config lv2 mesa)`.
I'm also a bit curious as to why tests need to be explicitly
deactivated in `sorcer`, does running the default cmake command to test
the project result in a failure, not just a NOP ?
I hope some other people will take it over from there because I don't
have much more to contribute : )
Cheers,
Alice
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#56140] [Patches] Add and update music packages
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
2022-06-24 8:54 ` [bug#56140] Resending the patches with correcting mistakes Sughosha via Guix-patches via
2022-06-28 7:45 ` [bug#56140] [Patches] Add and update music packages Alice BRENON
@ 2022-06-28 8:30 ` Sughosha via Guix-patches via
2022-06-28 12:40 ` Maxime Devos
2022-07-01 17:29 ` Ricardo Wurmus
` (8 subsequent siblings)
11 siblings, 1 reply; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2022-06-28 8:30 UTC (permalink / raw)
To: 56140@debbugs.gnu.org
[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]
Hi Alice,
First of all, thanks for reviewing my patches :)
> - your description of Fabla doesn't add much information compared to the synopsis. What makes it special ? How is it different from the other similar tools ? (see https://guix.gnu.org/fr/manual/devel/en/html_node/Synopses-and-Descriptions.html#Synopses-and-Descriptions for inspiration)
I will improve the descriptions.
> - the other packages seem to have more extensive description, but they make very long lines, have you tried formatting your package using the `guix style` command ? (https://guix.gnu.org/fr/manual/devel/en/html_node/Formatting-Code.html#Formatting-Code)
Sorry that I have forgot this step. I will do it.
> - you seem to consistently use the "old" syntax for packages in native-inputs, as opposed to inputs, is there a good reason for that or have you maybe only found examples where the native-inputs haven't been modernized ? While it makes sense to rename `cmake-minimal` to `cmake` in the definition of `distrho-ports` (though I wonder `luppp` didn't require the same renaming and keeps the key "cmake-minimal" for `cmake-minimal`, all the others occurrences (`("pkg-config" ,pkg config)`, `("lv2" ,lv2)`…) are totally unneeded for as far as I understand and could be simplified as `(list pkg-config lv2 mesa)`.
It's just that I practiced to use the old way for native-inputs. Many packages require to do so, for example `("glib:bin" ,glib "bin")` cannot be declared as somethig like `(list glib)` (as far as I know). It's just that mejority of the packages I defined had required such type of native-inputs, so I practiced it that way.
> I'm also a bit curious as to why tests need to be explicitly deactivated in `sorcer`, does running the default cmake command to test the project result in a failure, not just a NOP ?
`sorcer` was initially not packaged by me. It was failing to build, so I updated it to the most recent commit and removed the commands in the arguments which are no longer required in this commit. Disabling the tests is as it was before, as in the comment it says that tests are not defined in the git repository.
I will improve the patches, fixing mistakes, and then resend the patches.
Thank you.
[-- Attachment #2: Type: text/html, Size: 2999 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#56140] [Patches] Add and update music packages
2022-06-28 8:30 ` Sughosha via Guix-patches via
@ 2022-06-28 12:40 ` Maxime Devos
2022-07-01 16:04 ` Sughosha via Guix-patches via
0 siblings, 1 reply; 20+ messages in thread
From: Maxime Devos @ 2022-06-28 12:40 UTC (permalink / raw)
To: Sughosha, 56140@debbugs.gnu.org
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
Sughosha via Guix-patches via schreef op di 28-06-2022 om 08:30
[+0000]:
> glib:bin" ,glib "bin")` cannot be declared as somethig like `(list
> glib)` (as far as I know).
You can do (list `(,glib "bin") hello other-package etc...) (untested).
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#56140] [Patches] Add and update music packages
2022-06-28 12:40 ` Maxime Devos
@ 2022-07-01 16:04 ` Sughosha via Guix-patches via
0 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2022-07-01 16:04 UTC (permalink / raw)
To: 56140@debbugs.gnu.org
[-- Attachment #1: Type: text/plain, Size: 28 bytes --]
Fixed mistakes and improved.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-sorcer-Update-to-1.1.3-6.cc7f6f5.patch --]
[-- Type: text/x-patch; name=0001-gnu-sorcer-Update-to-1.1.3-6.cc7f6f5.patch, Size: 3590 bytes --]
From d096d031893b8c1bfcf2450cbbbb76f8d73d16e4 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 1 Jul 2022 17:53:18 +0200
Subject: [PATCH 1/4] gnu: sorcer: Update to 1.1.3-6.cc7f6f5.
* gnu/packages/music.scm (sorcer): Update to 1.1.3-6.cc7f6f5.
This update fixes the building of the package.
---
gnu/packages/music.scm | 65 ++++++++++++++++++------------------------
1 file changed, 28 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index e0522e40f5..4e5c8bd081 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5056,44 +5056,35 @@ (define-public patchmatrix
(license license:artistic2.0)))
(define-public sorcer
- (package
- (name "sorcer")
- (version "1.1.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/openAVproductions/"
- "openAV-Sorcer/archive/release-"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "07iyqj28wm0xc4arrq893bm12xjpz65db7ynrlmf6w8krg8wjmd0"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f ; no tests included
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-architecture-specific-flags
- (lambda _
- (substitute* "CMakeLists.txt"
- (("-msse2 -mfpmath=sse") ""))
- #t))
- (add-after 'unpack 'build-faust-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "faust"
- (delete-file "main.cpp")
- (invoke "faust" "-i"
- "-a" "lv2synth.cpp"
- "-o" "main.cpp" "main.dsp")))))))
- (inputs
- (list boost lv2 ntk))
- (native-inputs
- (list faust pkg-config))
- (home-page "http://openavproductions.com/sorcer/")
- (synopsis "Wavetable LV2 plugin synth")
- (description "Sorcer is a wavetable LV2 plugin synthesizer, targeted at
+ (let ((revision "6") (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
+ (package
+ (name "sorcer")
+ (version (git-version "1.1.3" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/openAVproductions/openAV-Sorcer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ryaglp2pzln2bm0pwc5p9lb2nk0x4wmrs4c4cp6d2m2hhk82yk7"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'remove-architecture-specific-flags
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("-msse2 -mfpmath=sse") "")) #t))))) ;no tests included
+ (inputs (list boost lv2 ntk))
+ (native-inputs (list faust pkg-config))
+ (home-page "http://openavproductions.com/sorcer/")
+ (synopsis "Wavetable LV2 plugin synth")
+ (description "Sorcer is a wavetable LV2 plugin synthesizer, targeted at
the electronic or dubstep genre.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public sonivox-eas
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-fabla.patch --]
[-- Type: text/x-patch; name=0002-gnu-Add-fabla.patch, Size: 1799 bytes --]
From 89d254e0655754f72ef41660f063e8aafe9ac0ad Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 1 Jul 2022 17:53:59 +0200
Subject: [PATCH 2/4] gnu: Add fabla.
* gnu/packages/music.scm (fabla): New variable.
---
gnu/packages/music.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4e5c8bd081..1b87675a4a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5055,6 +5055,33 @@ (define-public patchmatrix
OSC connections.")
(license license:artistic2.0)))
+(define-public fabla
+ (let ((revision "17") (commit "10acf03046d980f96ed192d5acb9deb812f5c639"))
+ (package
+ (name "fabla")
+ (version (git-version "1.3.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openAVproductions/openAV-Fabla")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ybbzb86j1n5dfhzc6aa3cibkwi6q3x0c18b1w3anyibanmr1wmc"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f))
+ (native-inputs (list pkg-config lv2 mesa))
+ (inputs (list ntk cairomm libsndfile))
+ (home-page "http://openavproductions.com/fabla/")
+ (synopsis "Sampler LV2 plugin")
+ (description
+ "Fabla is an LV2 drum sampler plugin instrument. It is ideal for
+loading up your favorite sampled sounds and bashing away on a MIDI
+controller.")
+ (license license:gpl3))))
+
(define-public sorcer
(let ((revision "6") (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Add-luppp.patch --]
[-- Type: text/x-patch; name=0003-gnu-Add-luppp.patch, Size: 1959 bytes --]
From 9ce850f5b65a6e49352f63c11443bc7090647e85 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 1 Jul 2022 17:54:41 +0200
Subject: [PATCH 3/4] gnu: Add luppp.
* gnu/packages/music.scm (luppp): New variable.
---
gnu/packages/music.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1b87675a4a..320a87f2c5 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5055,6 +5055,36 @@ (define-public patchmatrix
OSC connections.")
(license license:artistic2.0)))
+(define-public luppp
+ (let ((revision "29") (commit "23da1497f80dbace48b7807afd3570c57a4d5994"))
+ (package
+ (name "luppp")
+ (version (git-version "1.2.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openAVproductions/openAV-Luppp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rjl7fwnqq1gxa3haw1z0p1mld23i194sc43m03h9isagkwxrx9d"))))
+ (build-system meson-build-system)
+ (native-inputs (list pkg-config cmake-minimal))
+ (inputs (list cairo
+ ntk
+ liblo
+ jack-1
+ libsndfile
+ libsamplerate))
+ (home-page "http://openavproductions.com/luppp/")
+ (synopsis "Live performance tool")
+ (description
+ "Luppp is a music creation tool, intended for live use. The focus is on
+real time processing and a fast and intuitive workflow. With extensive MIDI
+mapping support, you can get looping just how you like!")
+ (license license:gpl3))))
+
(define-public fabla
(let ((revision "17") (commit "10acf03046d980f96ed192d5acb9deb812f5c639"))
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-Add-distrho-ports.patch --]
[-- Type: text/x-patch; name=0004-gnu-Add-distrho-ports.patch, Size: 2425 bytes --]
From 30e44861906ce8fc7c4213948234cf6334641307 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 1 Jul 2022 17:55:37 +0200
Subject: [PATCH 4/4] gnu: Add distrho-ports.
* gnu/packages/music.scm (distrho-ports): New variable.
---
gnu/packages/music.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 320a87f2c5..351b5760b3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6002,6 +6002,44 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ (let ((revision "611") (commit "d500be0794bba5dfa734806d8b0b1e6894ec04be"))
+ (package
+ (name "distrho-ports")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a0i5ajqww8zpgrgpr1n4r2418l2sakvdz9y7pjwnx8168kmlmpl"))))
+ (build-system meson-build-system)
+ (native-inputs (list pkg-config cmake-minimal))
+ (inputs (list fftwf
+ alsa-lib
+ freetype
+ libx11
+ libxrender
+ libxext
+ libxcursor
+ mesa))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Linux audio plugins and LV2 ports")
+ (description
+ "This package contains GNU/Linux and LV2 ports of the following plugins:
+The Function, The Pilgrim, Dexed, dRowAudio plugins (Distortion, Distortion
+Shaper, Flanger, Reverb, Tremolo), DrumSynth, EasySSP, EQinox, HiReSam,
+JuceOPL, KlangFalter, LUFS Meter, LUFS Meter (Multichannel), Luftikus, Obxd,
+PitchedDelay, ReFine, StereoSourceSeperation, Swanky Amp, TAL plugins (Dub-3,
+Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II, Reverb-III, Vocoder-II),
+Temper, Vex, Vitalium and Wolpertinger")
+ ;; This package consists of several plugins.
+ ;; Different copyrights and licenses apply to different plugins.
+ (license (list license:gpl2 license:lgpl3)))))
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
2.36.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [bug#56140] [Patches] Add and update music packages
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (2 preceding siblings ...)
2022-06-28 8:30 ` Sughosha via Guix-patches via
@ 2022-07-01 17:29 ` Ricardo Wurmus
2022-07-01 18:05 ` Thorsten Wilms
2023-06-15 16:30 ` [bug#56140] [Patch v2 0/2]: gnu: Add distrho-ports Sughosha via Guix-patches via
` (7 subsequent siblings)
11 siblings, 1 reply; 20+ messages in thread
From: Ricardo Wurmus @ 2022-07-01 17:29 UTC (permalink / raw)
To: 56140; +Cc: Sughosha, Alice BRENON
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi,
I slightly modified the patches as discussed on IRC.
I’m not sure about what to do with the last patch of the series, the one
adding distrho-ports. This package bundles a bunch of other libraries
and the license situation is not clear. I just spot checked one or two
plugins and their licenses do not appear in the license field so I’d
prefer to have some more eyes on this and see if things can be unbundled
some more.
Below is my modified package definition.
--
Ricardo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-distrho-ports.patch --]
[-- Type: text/x-patch, Size: 2514 bytes --]
From be138ba5b9898654cf935f6828ae53a8211ff634 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 1 Jul 2022 17:55:37 +0200
Subject: [PATCH] gnu: Add distrho-ports.
* gnu/packages/music.scm (distrho-ports): New variable.
---
gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cc9bae5612..297748e39e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6019,6 +6019,69 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ (package
+ (name "distrho-ports")
+ (version "0.2021-03-15")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ ;; This commit corresponds to tag 2021-03-15
+ (commit "fe5bf2e87dd440ba98d3e8ac647b8518e2851f74")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a0i5ajqww8zpgrgpr1n4r2418l2sakvdz9y7pjwnx8168kmlmpl"))))
+ (build-system meson-build-system)
+ (inputs
+ (list fftwf
+ alsa-lib
+ freetype
+ libx11
+ libxrender
+ libxext
+ libxcursor
+ mesa))
+ (native-inputs
+ (list pkg-config
+ cmake-minimal))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Audio plugins and LV2 ports")
+ (description
+ "This package contains LV2 ports of the following plugins:
+@itemize
+@item The Function,
+@item The Pilgrim,
+@item Dexed,
+@item dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb,
+ Tremolo),
+@item DrumSynth,
+@item EasySSP,
+@item EQinox,
+@item HiReSam,
+@item JuceOPL,
+@item KlangFalter,
+@item LUFS Meter,
+@item LUFS Meter (Multichannel),
+@item Luftikus,
+@item Obxd,
+@item PitchedDelay,
+@item ReFine,
+@item StereoSourceSeperation,
+@item Swanky Amp,
+@item TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II,
+ Reverb-III, Vocoder-II),
+@item Temper,
+@item Vex,
+@item Vitalium, and
+@item Wolpertinger.
+@end itemize
+")
+ ;; This package consists of several plugins.
+ ;; Different copyrights and licenses apply to different plugins.
+ (license (list license:gpl2 license:lgpl3))))
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
2.36.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [Patches] Add and update music packages
2022-07-01 17:29 ` Ricardo Wurmus
@ 2022-07-01 18:05 ` Thorsten Wilms
0 siblings, 0 replies; 20+ messages in thread
From: Thorsten Wilms @ 2022-07-01 18:05 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: Sughosha, 56140, Alice BRENON
On Fri, 01 Jul 2022 19:29:17 +0200
Ricardo Wurmus <rekado@elephly.net> wrote:
> I’m not sure about what to do with the last patch of the series, the one
> adding distrho-ports. This package bundles a bunch of other libraries
> and the license situation is not clear. I just spot checked one or two
> plugins and their licenses do not appear in the license field so I’d
> prefer to have some more eyes on this and see if things can be unbundled
> some more.
When I had a go at packaging distrho-ports, I took notes about the
licensing situation and asked about it on the list. Issues include
total lack of licensing information, licensing info only upstream,
upstream unavailable due to DMCA takedwon.
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49224
---
non-copyleft for drow (MIT). agpl3 for HiReSam.
Just no license info for arctican-function, artican-pilgrim and vex.
No license info found in the repo, but found by following the URL
given in each source/JucePluginCharacteristics.h:
- ports-legacy/HiReSam ->
https://github.com/klangfreund/SpectrumAnalyser: GPL2+ or Affero
GPL3
- ports-legacy/drowaudio-common ->
https://github.com/drowaudio/drowaudio: MIT. Plus LGPL2.1 for
included Soundtouch, which I found no mention of in DISTRHO-Ports
sources. Also mentions separate license for FFTReal, which I also
see no mention of in DISTRHO-Ports sources.
- ports-legacy/easySSP ->
https://github.com/automatl/audio-dsp-multi-visualize/: GPL3.
- ports-legacy/juce-opl -> https://bsutherland.github.io/JuceOPLVSTi/
-> https://github.com/bsutherland/JuceOPLVSTi: GPL2.
- ports/legacyluftikus ->
https://code.google.com/archive/p/lkjb-plugins/: GPL2.
- ports-legacy/pitchedDelay ->
https://code.google.com/archive/p/lkjb-dc12/: GPL2.
- ports-legacy/refine -> https://github.com/lkjbdsp/lkjb-plugins#ReFine:
MIT. Strangely, this repo also includes PitchedDelay and Luftikus,
presented elsewhere as GPL2.
- ports-legacy/stereosourceseparation ->
https://github.com/laixinyuan/StereoSourceSepartion: Repository
unavailable due to DMCA takedown. According to falkTX, this is due
Steinberg having something against distribution of the VST2 SDK,
which is not included in the DISTRHO-Ports version.
- ports-legacy/temper -> https://github.com/creativeintent/temper:
GPL3.
- ports-legacy/wolpertinger -> https://tumbetoene.tuxfamily.org/
-> https://tumbetoene.tuxfamily.org/index.php?entry=entry110926-112345
-> download readme: GPL2+.
---
--
Thorsten Wilms <t_w_@freenet.de>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#56140] [Patch v2 0/2]: gnu: Add distrho-ports.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (3 preceding siblings ...)
2022-07-01 17:29 ` Ricardo Wurmus
@ 2023-06-15 16:30 ` Sughosha via Guix-patches via
2023-06-15 16:32 ` [bug#56140] [Patch v2 1/2]: gnu: Add optional-lite Sughosha via Guix-patches via
` (6 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-15 16:30 UTC (permalink / raw)
To: 56140; +Cc: rekado@elephly.net, alice.brenon@ens-lyon.fr
In this series of patches I refactored license field in detail,
unbundled third party libraries and fixed fonts not being displayed.
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#56140] [Patch v2 1/2]: gnu: Add optional-lite.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (4 preceding siblings ...)
2023-06-15 16:30 ` [bug#56140] [Patch v2 0/2]: gnu: Add distrho-ports Sughosha via Guix-patches via
@ 2023-06-15 16:32 ` Sughosha via Guix-patches via
2023-06-15 16:34 ` [bug#56140] [Patch v2 2/2]: gnu: Add distrho-ports Sughosha via Guix-patches via
` (5 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-15 16:32 UTC (permalink / raw)
To: 56140; +Cc: rekado@elephly.net, alice.brenon@ens-lyon.fr
* gnu/packages/music.scm (optional-lite): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 365b15a..8f5d305 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2068,6 +2068,29 @@ (define-public bloomberg-bde
(home-page "https://github.com/bloomberg/bde")
(license license:asl2.0))))
+(define-public optional-lite
+ (package
+ (name "optional-lite")
+ (version "3.5.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/martinmoene/optional-lite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jpsm94kp1504yk9s2km86zv8xrszz30qanmhz2ljmvsdblz2l47"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/martinmoene/optional-lite")
+ (synopsis "Nullable object for C++98, C++11 and later")
+ (description
+ "optional lite is a single-file header-only library to represent optional
+(nullable) objects and pass them by value. The library aims to provide a
+C++17-like optional for use with C++98 and later. If available, std::optional
+is used.")
+ (license license:boost1.0)))
+
(define-public gulrak-filesystem
(package
(name "gulrak-filesystem")
--
libgit2 1.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [Patch v2 2/2]: gnu: Add distrho-ports.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (5 preceding siblings ...)
2023-06-15 16:32 ` [bug#56140] [Patch v2 1/2]: gnu: Add optional-lite Sughosha via Guix-patches via
@ 2023-06-15 16:34 ` Sughosha via Guix-patches via
2023-06-15 18:38 ` Ricardo Wurmus
2023-06-16 14:05 ` [bug#56140] [PATCH v3 0/2] " Sughosha via Guix-patches via
` (4 subsequent siblings)
11 siblings, 1 reply; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-15 16:34 UTC (permalink / raw)
To: 56140; +Cc: rekado@elephly.net, alice.brenon@ens-lyon.fr
* gnu/packages/music.scm (distrho-ports): New variable.
---
gnu/packages/music.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 135 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2e7edda..fbd1e76 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6344,6 +6344,141 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ (let ((commit "f2dbaded0a05732e3499fa374a586e5b32370da5")
+ (revision "0"))
+ (package
+ (name "distrho-ports")
+ (version (git-version "0.2021-03-15" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ ;; This commit corresponds to tag 2021-03-15
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rrnqwask2qg05ynisk6bpj118cl7c3w53rqrfg5x3sx847rjjgc"))
+ (snippet
+ '(with-directory-excursion "ports-juce6"
+ ;; Delete third party libraries.
+ (for-each delete-file-recursively
+ (list "swankyamp/thirdparty"
+ "vitalium/third_party"))
+ ;; Exclude them from building.
+ (substitute*
+ (list "swankyamp/meson.build"
+ "vitalium/meson.build")
+ (("'third") "#'third"))
+ ;; Use system provided "nlohmann/json.hpp".
+ (with-directory-excursion "vitalium/source"
+ (substitute*
+ (list "common/line_generator.h"
+ "common/load_save.h"
+ "common/tuning.h"
+ "common/wavetable/wavetable_component.h"
+ "common/wavetable/wavetable_creator.h"
+ "common/wavetable/wavetable_keyframe.h"
+ "interface/editor_sections/save_section.h"
+ "interface/look_and_feel/skin.h"
+ "synthesis/producers/sample_source.h")
+ (("json/json\\.h") "nlohmann/json.hpp")))))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;no test target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "libs"
+ (for-each
+ (lambda (dir)
+ (substitute*
+ (string-append dir "/source/modules/juce_graphics"
+ "/native/juce_linux_Fonts.cpp")
+ (("/usr/share/fonts")
+ (search-input-directory inputs "/etc/fonts"))))
+ (list "juce5" "juce6" "juce7"))))))))
+ (native-inputs
+ (list cmake-minimal
+ concurrentqueue
+ nlohmann-json
+ optional-lite
+ pkg-config))
+ (inputs
+ (list alsa-lib
+ fontconfig
+ freetype
+ fftwf
+ libx11
+ libxcursor
+ libxext
+ libxrender
+ mesa))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Audio plugins and LV2 ports")
+ (description
+ "This package contains LV2 ports of the following plugins:
+@itemize
+@item The Function,
+@item The Pilgrim,
+@item CHOW,
+@item Dexed,
+@item dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb,
+ Tremolo),
+@item DrumSynth,
+@item EasySSP,
+@item EQinox,
+@item HiReSam,
+@item JuceOPL,
+@item KlangFalter,
+@item LUFS Meter,
+@item Luftikus,
+@item Obxd,
+@item PitchedDelay,
+@item ReFine,
+@item StereoSourceSeperation,
+@item Swanky Amp,
+@item TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II,
+ Reverb-III, Vocoder-II),
+@item Temper,
+@item Vex,
+@item Vitalium, and
+@item Wolpertinger.
+@end itemize
+")
+ ;; Licenses for lv2-ttl-generator, The Function, The Pilgrim,
+ ;; juce-demo-host and juce-demo-plugin are not declared.
+ (license
+ (list license:asl2.0 ;for msfa
+ license:bsd-2 ;for mingw-std-threads and dsp-utility
+ ;; There is no mention of licenses for dRowAudio plugins,
+ ;; Luftikus, PitchedDelay and ReFine in this repository, but the
+ ;; upstream repositories released them under MIT:
+ ;; https://github.com/drowaudio/drowaudio;
+ ;; https://github.com/lkjbdsp/lkjb-plugins.
+ license:expat ;for FFTConvolver
+ (license:fsf-free ;for Temper
+ "file:///ports-juce5/temper/source/TemperDsp.hpp")
+ license:gpl2 ;for juce-plugin, LUFS Meter and Obxd
+ ;; There is no mention of license for Wolpertinger, but the
+ ;; upstream released it under GPLv2+:
+ ;; https://github.com/jkroll20/wolpertinger.
+ license:gpl2+ ;for HiReSam, TAL plugins and Vex
+ ;; There is no mention of license for EasySSP in this repository,
+ ;; but the upstream repository released it under GPLv3:
+ ;; https://github.com/automatl/audio-dsp-multi-visualize.
+ license:gpl3 ;for JUCE and CHOW
+ license:gpl3+ ;for Dexed, Swanky Amp, Vitalium and KlangFalter
+ license:lgpl2.0+ ;for DrumSynth, EQinox
+ license:lgpl3+
+ license:lgpl2.1+ ;for juce-opl
+ (license:non-copyleft ;kiss_fft
+ (string-append "file:///ports-juce5/stereosourceseparation"
+ "/source/kiss_fft/kiss_fft.c"))
+ license:wtfpl2))))) ;for FFTReal
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
libgit2 1.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [Patch v2 2/2]: gnu: Add distrho-ports.
2023-06-15 16:34 ` [bug#56140] [Patch v2 2/2]: gnu: Add distrho-ports Sughosha via Guix-patches via
@ 2023-06-15 18:38 ` Ricardo Wurmus
0 siblings, 0 replies; 20+ messages in thread
From: Ricardo Wurmus @ 2023-06-15 18:38 UTC (permalink / raw)
To: Sughosha; +Cc: 56140, alice.brenon@ens-lyon.fr
Hi Sughosha,
> * gnu/packages/music.scm (distrho-ports): New variable.
Thanks for the patch!
> +(define-public distrho-ports
> + (let ((commit "f2dbaded0a05732e3499fa374a586e5b32370da5")
> + (revision "0"))
> + (package
> + (name "distrho-ports")
> + (version (git-version "0.2021-03-15" revision commit))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/DISTRHO/DISTRHO-Ports")
> + ;; This commit corresponds to tag 2021-03-15
As far as I can tell the commit corresponding to the tag is actually
fe5bf2e87dd440ba98d3e8ac647b8518e2851f74.
> + (snippet
> + '(with-directory-excursion "ports-juce6"
> + ;; Delete third party libraries.
> + (for-each delete-file-recursively
> + (list "swankyamp/thirdparty"
> + "vitalium/third_party"))
> + ;; Exclude them from building.
> + (substitute*
> + (list "swankyamp/meson.build"
> + "vitalium/meson.build")
It’s nitpicking, but we seem to prefer a quoted list for substitute*.
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-paths
> + (lambda* (#:key inputs #:allow-other-keys)
> + (with-directory-excursion "libs"
> + (for-each
> + (lambda (dir)
> + (substitute*
> + (string-append dir "/source/modules/juce_graphics"
> + "/native/juce_linux_Fonts.cpp")
> + (("/usr/share/fonts")
> + (search-input-directory inputs "/etc/fonts"))))
> + (list "juce5" "juce6" "juce7"))))))))
I’d prefer something like this:
--8<---------------cut here---------------start------------->8---
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((fonts (search-input-directory inputs "/etc/fonts")))
(with-directory-excursion "libs"
(substitute* (find-files "." "juce_linux_Fonts.cpp$")
(("/usr/share/fonts") fonts)))))))
--8<---------------cut here---------------end--------------->8---
More generally, I think we should not use for-each since we already have
a way to pass multiple files to substitute*.
> + (native-inputs
> + (list cmake-minimal
> + concurrentqueue
> + nlohmann-json
> + optional-lite
> + pkg-config))
Why are these libraries native inputs?
> + ;; Licenses for lv2-ttl-generator, The Function, The Pilgrim,
> + ;; juce-demo-host and juce-demo-plugin are not declared.
Then these are nonfree and should be removed. You could report this to
the maintainers and include a link to the issue here, so we can follow
up in the future.
> + (license
> + (list license:asl2.0 ;for msfa
> + license:bsd-2 ;for mingw-std-threads and dsp-utility
> + ;; There is no mention of licenses for dRowAudio plugins,
> + ;; Luftikus, PitchedDelay and ReFine in this repository, but the
> + ;; upstream repositories released them under MIT:
> + ;; https://github.com/drowaudio/drowaudio;
> + ;; https://github.com/lkjbdsp/lkjb-plugins.
> + license:expat ;for FFTConvolver
> + (license:fsf-free ;for Temper
> + "file:///ports-juce5/temper/source/TemperDsp.hpp")
> + license:gpl2 ;for juce-plugin, LUFS Meter and Obxd
> + ;; There is no mention of license for Wolpertinger, but the
> + ;; upstream released it under GPLv2+:
> + ;; https://github.com/jkroll20/wolpertinger.
> + license:gpl2+ ;for HiReSam, TAL plugins and Vex
> + ;; There is no mention of license for EasySSP in this repository,
> + ;; but the upstream repository released it under GPLv3:
> + ;; https://github.com/automatl/audio-dsp-multi-visualize.
> + license:gpl3 ;for JUCE and CHOW
The release notes for 2021-03-15 say:
CHOW has been removed from plugins to build and install
> + license:gpl3+ ;for Dexed, Swanky Amp, Vitalium and KlangFalter
> + license:lgpl2.0+ ;for DrumSynth, EQinox
> + license:lgpl3+
> + license:lgpl2.1+ ;for juce-opl
> + (license:non-copyleft ;kiss_fft
> + (string-append "file:///ports-juce5/stereosourceseparation"
> + "/source/kiss_fft/kiss_fft.c"))
> + license:wtfpl2))))) ;for FFTReal
Phew, that’s a lot. I haven’t validated any of them. Someone should do
this before applying this patch.
--
Ricardo
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#56140] [PATCH v3 0/2] gnu: Add distrho-ports.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (6 preceding siblings ...)
2023-06-15 16:34 ` [bug#56140] [Patch v2 2/2]: gnu: Add distrho-ports Sughosha via Guix-patches via
@ 2023-06-16 14:05 ` Sughosha via Guix-patches via
2023-06-16 14:06 ` [bug#56140] [PATCH v3 1/2] gnu: Add optional-lite Sughosha via Guix-patches via
` (3 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 14:05 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
Hi Ricardo,
Thanks for reviewing this patch. Following your suggestions made some
improvements.
> > + (native-inputs
> > + (list cmake-minimal
> > + concurrentqueue
> > + nlohmann-json
> > + optional-lite
> > + pkg-config))
>
> Why are these libraries native inputs?
"concurrentqueue", "nlohmann-json" and "optional-lite" were bundled with
the source. I deleted their folders and added them as native-inputs.
> > + ;; Licenses for lv2-ttl-generator, The Function, The Pilgrim,
> > + ;; juce-demo-host and juce-demo-plugin are not declared.
> Then these are nonfree and should be removed.
I found license of lv2-ttl-generator in its upstream and removed plugins
with no license and not included in building.
I also last I improved license definition.
Sughosha (2):
gnu: Add optional-lite.
gnu: Add distrho-ports.
gnu/packages/cpp.scm | 23 ++++++
gnu/packages/music.scm | 154 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+)
base-commit: 8f0698dde351790e0bc9e905e4cd71902fd55d5f
--
2.40.1
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#56140] [PATCH v3 1/2] gnu: Add optional-lite.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (7 preceding siblings ...)
2023-06-16 14:05 ` [bug#56140] [PATCH v3 0/2] " Sughosha via Guix-patches via
@ 2023-06-16 14:06 ` Sughosha via Guix-patches via
2023-06-16 14:06 ` [bug#56140] [PATCH v3 2/2] gnu: Add distrho-ports Sughosha via Guix-patches via
` (2 subsequent siblings)
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 14:06 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
* gnu/packages/music.scm (optional-lite): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 365b15a3b9..8f5d305a26 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2068,6 +2068,29 @@ (define-public bloomberg-bde
(home-page "https://github.com/bloomberg/bde")
(license license:asl2.0))))
+(define-public optional-lite
+ (package
+ (name "optional-lite")
+ (version "3.5.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/martinmoene/optional-lite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jpsm94kp1504yk9s2km86zv8xrszz30qanmhz2ljmvsdblz2l47"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/martinmoene/optional-lite")
+ (synopsis "Nullable object for C++98, C++11 and later")
+ (description
+ "optional lite is a single-file header-only library to represent optional
+(nullable) objects and pass them by value. The library aims to provide a
+C++17-like optional for use with C++98 and later. If available, std::optional
+is used.")
+ (license license:boost1.0)))
+
(define-public gulrak-filesystem
(package
(name "gulrak-filesystem")
--
2.40.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [PATCH v3 2/2] gnu: Add distrho-ports.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (8 preceding siblings ...)
2023-06-16 14:06 ` [bug#56140] [PATCH v3 1/2] gnu: Add optional-lite Sughosha via Guix-patches via
@ 2023-06-16 14:06 ` Sughosha via Guix-patches via
2023-06-16 15:02 ` [bug#56140] [PATCH v4 0/2] " Sughosha via Guix-patches via
2023-06-16 15:02 ` [bug#56140] [PATCH v4 1/2] gnu: Add optional-lite Sughosha via Guix-patches via
2023-09-02 8:40 ` bug#56140: Add optional-lite and distrho-ports Ricardo Wurmus
11 siblings, 1 reply; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 14:06 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
* gnu/packages/music.scm (distrho-ports): New variable.
---
gnu/packages/music.scm | 154 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 154 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2e7eddafb0..89b46bd627 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6344,6 +6344,160 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ ;; From 2021-03-15 to this commit various important changes are made
+ ;; including improved directory structure and updated JUCE versions.
+ (let ((commit "f2dbaded0a05732e3499fa374a586e5b32370da5")
+ (revision "0"))
+ (package
+ (name "distrho-ports")
+ (version (git-version "2021-03-15" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rrnqwask2qg05ynisk6bpj118cl7c3w53rqrfg5x3sx847rjjgc"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete third party libraries, libraries without licenses
+ ;; and unneeded libraries.
+ (for-each delete-file-recursively
+ (list "ports-juce5/arctican-function" ;no license
+ "ports-juce5/arctican-pilgrim" ;no license
+ "ports-juce5/drowaudio-tremolo" ;no license
+ "ports-juce5/juce-demo-host" ;not used
+ "ports-juce5/juce-demo-plugin" ;not used
+ "ports-juce5/temper/source/faust" ;bundled
+ "ports-juce6/chow" ;not used
+ "ports-juce6/swankyamp/thirdparty" ;bundled
+ "ports-juce6/vitalium/third_party")) ;bundled
+ ;; Exclude them from building.
+ (substitute* (find-files "." "meson.build$")
+ (("'arctican") "#'arctican")
+ (("'drowaudio-tremolo") "#'drowaudio-tremolo")
+ (("'third") "#'third"))
+ ;; Use system provided "nlohmann/json.hpp".
+ (with-directory-excursion "ports-juce6/vitalium/source"
+ (substitute*
+ (list "common/line_generator.h"
+ "common/load_save.h"
+ "common/tuning.h"
+ "common/wavetable/wavetable_component.h"
+ "common/wavetable/wavetable_creator.h"
+ "common/wavetable/wavetable_keyframe.h"
+ "interface/editor_sections/save_section.h"
+ "interface/look_and_feel/skin.h"
+ "synthesis/producers/sample_source.h")
+ (("json/json\\.h") "nlohmann/json.hpp")))))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;no test target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-juce-fonts
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("/usr/share/fonts")
+ (search-input-directory inputs "/etc/fonts"))))
+ (find-files "libs" "juce_linux_Fonts.cpp$")))))))
+ (native-inputs
+ (list cmake-minimal
+ concurrentqueue
+ faust
+ nlohmann-json
+ optional-lite
+ pkg-config))
+ (inputs
+ (list alsa-lib
+ fontconfig
+ freetype
+ fftwf
+ libx11
+ libxcursor
+ libxext
+ libxrender
+ mesa))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Audio plugins and LV2 ports")
+ (description
+ "This package contains LV2 ports of the following plugins:
+@itemize
+@item Dexed,
+@item dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb,
+ Tremolo),
+@item DrumSynth,
+@item EasySSP,
+@item EQinox,
+@item HiReSam,
+@item JuceOPL,
+@item KlangFalter,
+@item LUFS Meter,
+@item Luftikus,
+@item Obxd,
+@item PitchedDelay,
+@item ReFine,
+@item StereoSourceSeperation,
+@item Swanky Amp,
+@item TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II,
+ Reverb-III, Vocoder-II),
+@item Temper,
+@item Vex,
+@item Vitalium, and
+@item Wolpertinger.
+@end itemize")
+ (license
+ (list license:asl2.0 ;used by Dexed
+ ;; mingw-std-threads and EasySSP (for dsp-utility) use FreeBSD.
+ license:bsd-2
+ ;; Licenses for dRowAudio is not found in this repository, but
+ ;; the upstream project is licensed under MIT:
+ ;; https://github.com/drowaudio/drowaudio.
+ ;; Luftikus, PitchedDelay and ReFine are ported from lkjb plugins
+ ;; which is licensed under MIT:
+ ;; https://github.com/lkjbdsp/lkjb-plugins.
+ license:expat
+ (license:fsf-free ;used by Temper
+ "file:///ports-juce5/temper/source/TemperDsp.hpp")
+ ;; juce-plugin, LUFS Meter, Obxd and TAL plugins use GPLv2.
+ license:gpl2
+ ;; License for Wolpertinger is not found in this repository, but
+ ;; the upstream project is licensed under GPLv2+:
+ ;; https://github.com/jkroll20/wolpertinger.
+ ;; dRowAudio plugins, juced, HiReSam and Vex use this license.
+ ;; Packages using files from JUCETICE project use this license.
+ license:gpl2+
+ ;; License for EasySSP is not found in this repository, but the
+ ;; upstream project is licensed under GPLv3:
+ ;; https://github.com/automatl/audio-dsp-multi-visualize.
+ license:gpl3 ;used by JUCE
+ ;; Dexed, Swanky Amp, Vitalium and KlangFalter use GPLv3+.
+ license:gpl3+
+ ;; License for lv2-ttl-generator is not found in this repository,
+ ;; but is a part of DPF-Plugins and is licensed under ISC:
+ ;; https://github.com/DISTRHO/DPF.
+ ;; JUCE uses this license for juce_audio_basics,
+ ;; juce_audio_devices, juce_blocks_basics, juce_core and
+ ;; juce_events.
+ license:isc
+ license:lgpl2.0+ ;used by DrumSynth and EQinox
+ license:lgpl2.1+ ;used by SoundTouch and juce-opl
+ ;; StereoSourceSeperation uses a non-copyleft license.
+ (license:non-copyleft
+ (string-append "file:///ports-juce5/stereosourceseparation"
+ "/source/kiss_fft/kiss_fft.c"))
+ ;; dRowAudio uses a non-copyleft license for curl.
+ (license:non-copyleft
+ (string-append "file:///libs/drowaudio/source/dRowAudio"
+ "/network/curl/include/curl/curl.h"))
+ license:wtfpl2))))) ;used by dRowAudio for FFTReal
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
2.40.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] [PATCH v4 0/2] gnu: Add distrho-ports.
2023-06-16 14:06 ` [bug#56140] [PATCH v3 2/2] gnu: Add distrho-ports Sughosha via Guix-patches via
@ 2023-06-16 15:02 ` Sughosha via Guix-patches via
2023-06-16 15:04 ` [bug#56140] [PATCH v4 2/2] " Sughosha via Guix-patches via
2023-09-02 1:11 ` [bug#56140] Add optional-lite and distrho-ports Vagrant Cascadian
0 siblings, 2 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 15:02 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
In this v4 series of patches, the only change from v3 is that added
native-search-paths to distrho-ports.
Sughosha (2):
gnu: Add optional-lite.
gnu: Add distrho-ports.
gnu/packages/cpp.scm | 23 ++++++
gnu/packages/music.scm | 164 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 187 insertions(+)
base-commit: 8f0698dde351790e0bc9e905e4cd71902fd55d5f
--
2.40.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#56140] [PATCH v4 2/2] gnu: Add distrho-ports.
2023-06-16 15:02 ` [bug#56140] [PATCH v4 0/2] " Sughosha via Guix-patches via
@ 2023-06-16 15:04 ` Sughosha via Guix-patches via
2023-09-02 1:11 ` [bug#56140] Add optional-lite and distrho-ports Vagrant Cascadian
1 sibling, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 15:04 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
* gnu/packages/music.scm (distrho-ports): New variable.
---
gnu/packages/music.scm | 164 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 164 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2e7eddafb0..a21a16cfc7 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6344,6 +6344,170 @@ (define-public mamba
ones.")
(license license:bsd-0)))
+(define-public distrho-ports
+ ;; From 2021-03-15 to this commit various important changes are made
+ ;; including improved directory structure and updated JUCE versions.
+ (let ((commit "f2dbaded0a05732e3499fa374a586e5b32370da5")
+ (revision "0"))
+ (package
+ (name "distrho-ports")
+ (version (git-version "2021-03-15" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DISTRHO/DISTRHO-Ports")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rrnqwask2qg05ynisk6bpj118cl7c3w53rqrfg5x3sx847rjjgc"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete third party libraries, libraries without licenses
+ ;; and unneeded libraries.
+ (for-each delete-file-recursively
+ (list "ports-juce5/arctican-function" ;no license
+ "ports-juce5/arctican-pilgrim" ;no license
+ "ports-juce5/drowaudio-tremolo" ;no license
+ "ports-juce5/juce-demo-host" ;not used
+ "ports-juce5/juce-demo-plugin" ;not used
+ "ports-juce5/temper/source/faust" ;bundled
+ "ports-juce6/chow" ;not used
+ "ports-juce6/swankyamp/thirdparty" ;bundled
+ "ports-juce6/vitalium/third_party")) ;bundled
+ ;; Exclude them from building.
+ (substitute* (find-files "." "meson.build$")
+ (("'arctican") "#'arctican")
+ (("'drowaudio-tremolo") "#'drowaudio-tremolo")
+ (("'third") "#'third"))
+ ;; Use system provided "nlohmann/json.hpp".
+ (with-directory-excursion "ports-juce6/vitalium/source"
+ (substitute*
+ (list "common/line_generator.h"
+ "common/load_save.h"
+ "common/tuning.h"
+ "common/wavetable/wavetable_component.h"
+ "common/wavetable/wavetable_creator.h"
+ "common/wavetable/wavetable_keyframe.h"
+ "interface/editor_sections/save_section.h"
+ "interface/look_and_feel/skin.h"
+ "synthesis/producers/sample_source.h")
+ (("json/json\\.h") "nlohmann/json.hpp")))))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;no test target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-juce-fonts
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("/usr/share/fonts")
+ (search-input-directory inputs "/etc/fonts"))))
+ (find-files "libs" "juce_linux_Fonts.cpp$")))))))
+ (native-inputs
+ (list cmake-minimal
+ concurrentqueue
+ faust
+ nlohmann-json
+ optional-lite
+ pkg-config))
+ (inputs
+ (list alsa-lib
+ fontconfig
+ freetype
+ fftwf
+ libx11
+ libxcursor
+ libxext
+ libxrender
+ mesa))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LV2_PATH")
+ (files '("lib/lv2")))
+ (search-path-specification
+ (variable "VST2_PATH")
+ (files '("lib/vst")))
+ (search-path-specification
+ (variable "VST3_PATH")
+ (files '("lib/vst3")))))
+ (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+ (synopsis "Audio plugins and LV2 ports")
+ (description
+ "This package contains LV2 ports of the following plugins:
+@itemize
+@item Dexed,
+@item dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb,
+ Tremolo),
+@item DrumSynth,
+@item EasySSP,
+@item EQinox,
+@item HiReSam,
+@item JuceOPL,
+@item KlangFalter,
+@item LUFS Meter,
+@item Luftikus,
+@item Obxd,
+@item PitchedDelay,
+@item ReFine,
+@item StereoSourceSeperation,
+@item Swanky Amp,
+@item TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II,
+ Reverb-III, Vocoder-II),
+@item Temper,
+@item Vex,
+@item Vitalium, and
+@item Wolpertinger.
+@end itemize")
+ (license
+ (list license:asl2.0 ;used by Dexed
+ ;; mingw-std-threads and EasySSP (for dsp-utility) use FreeBSD.
+ license:bsd-2
+ ;; Licenses for dRowAudio is not found in this repository, but
+ ;; the upstream project is licensed under MIT:
+ ;; https://github.com/drowaudio/drowaudio.
+ ;; Luftikus, PitchedDelay and ReFine are ported from lkjb plugins
+ ;; which is licensed under MIT:
+ ;; https://github.com/lkjbdsp/lkjb-plugins.
+ license:expat
+ (license:fsf-free ;used by Temper
+ "file:///ports-juce5/temper/source/TemperDsp.hpp")
+ ;; juce-plugin, LUFS Meter, Obxd and TAL plugins use GPLv2.
+ license:gpl2
+ ;; License for Wolpertinger is not found in this repository, but
+ ;; the upstream project is licensed under GPLv2+:
+ ;; https://github.com/jkroll20/wolpertinger.
+ ;; dRowAudio plugins, juced, HiReSam and Vex use this license.
+ ;; Packages using files from JUCETICE project use this license.
+ license:gpl2+
+ ;; License for EasySSP is not found in this repository, but the
+ ;; upstream project is licensed under GPLv3:
+ ;; https://github.com/automatl/audio-dsp-multi-visualize.
+ license:gpl3 ;used by JUCE
+ ;; Dexed, Swanky Amp, Vitalium and KlangFalter use GPLv3+.
+ license:gpl3+
+ ;; License for lv2-ttl-generator is not found in this repository,
+ ;; but is a part of DPF-Plugins and is licensed under ISC:
+ ;; https://github.com/DISTRHO/DPF.
+ ;; JUCE uses this license for juce_audio_basics,
+ ;; juce_audio_devices, juce_blocks_basics, juce_core and
+ ;; juce_events.
+ license:isc
+ license:lgpl2.0+ ;used by DrumSynth and EQinox
+ license:lgpl2.1+ ;used by SoundTouch and juce-opl
+ ;; StereoSourceSeperation uses a non-copyleft license.
+ (license:non-copyleft
+ (string-append "file:///ports-juce5/stereosourceseparation"
+ "/source/kiss_fft/kiss_fft.c"))
+ ;; dRowAudio uses a non-copyleft license for curl.
+ (license:non-copyleft
+ (string-append "file:///libs/drowaudio/source/dRowAudio"
+ "/network/curl/include/curl/curl.h"))
+ license:wtfpl2))))) ;used by dRowAudio for FFTReal
+
(define-public dpf-plugins
(package
(name "dpf-plugins")
--
2.40.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#56140] Add optional-lite and distrho-ports
2023-06-16 15:02 ` [bug#56140] [PATCH v4 0/2] " Sughosha via Guix-patches via
2023-06-16 15:04 ` [bug#56140] [PATCH v4 2/2] " Sughosha via Guix-patches via
@ 2023-09-02 1:11 ` Vagrant Cascadian
1 sibling, 0 replies; 20+ messages in thread
From: Vagrant Cascadian @ 2023-09-02 1:11 UTC (permalink / raw)
To: Sughosha, rekado; +Cc: 56140, control
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
retitle 56140 Add optional-lite and distrho-ports
thanks
On 2023-06-16, Sughosha wrote:
> In this v4 series of patches, the only change from v3 is that added
> native-search-paths to distrho-ports.
>
> Sughosha (2):
> gnu: Add optional-lite.
> gnu: Add distrho-ports.
These are the only changes from this bug that have not been applied,
updated the description to match.
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#56140] [PATCH v4 1/2] gnu: Add optional-lite.
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (9 preceding siblings ...)
2023-06-16 14:06 ` [bug#56140] [PATCH v3 2/2] gnu: Add distrho-ports Sughosha via Guix-patches via
@ 2023-06-16 15:02 ` Sughosha via Guix-patches via
2023-09-02 8:40 ` bug#56140: Add optional-lite and distrho-ports Ricardo Wurmus
11 siblings, 0 replies; 20+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-16 15:02 UTC (permalink / raw)
To: rekado@elephly.net; +Cc: 56140
* gnu/packages/music.scm (optional-lite): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 365b15a3b9..8f5d305a26 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2068,6 +2068,29 @@ (define-public bloomberg-bde
(home-page "https://github.com/bloomberg/bde")
(license license:asl2.0))))
+(define-public optional-lite
+ (package
+ (name "optional-lite")
+ (version "3.5.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/martinmoene/optional-lite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jpsm94kp1504yk9s2km86zv8xrszz30qanmhz2ljmvsdblz2l47"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/martinmoene/optional-lite")
+ (synopsis "Nullable object for C++98, C++11 and later")
+ (description
+ "optional lite is a single-file header-only library to represent optional
+(nullable) objects and pass them by value. The library aims to provide a
+C++17-like optional for use with C++98 and later. If available, std::optional
+is used.")
+ (license license:boost1.0)))
+
(define-public gulrak-filesystem
(package
(name "gulrak-filesystem")
--
2.40.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* bug#56140: Add optional-lite and distrho-ports
2022-06-22 12:36 [bug#56140] [Patches] Add and update music packages Sughosha via Guix-patches via
` (10 preceding siblings ...)
2023-06-16 15:02 ` [bug#56140] [PATCH v4 1/2] gnu: Add optional-lite Sughosha via Guix-patches via
@ 2023-09-02 8:40 ` Ricardo Wurmus
11 siblings, 0 replies; 20+ messages in thread
From: Ricardo Wurmus @ 2023-09-02 8:40 UTC (permalink / raw)
To: 56140-done
Hi Sughosha,
I’ve applied the latest version of your patches with a few minor
changes:
- some indentation changes
- changed the build phase to do without for-each.
Thank you for your patience!
--
Ricardo
^ permalink raw reply [flat|nested] 20+ messages in thread