[PATCH 0/5] Clean up lsp-plugins + update it to 1.2.15

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Parnikkapore
Owner
unassigned
Submitted by
Parnikkapore
Severity
normal
P
P
Parnikkapore wrote on 20 Apr 23:54 +0200
(address . guix-patches@gnu.org)
cover.1713647400.git.poomklao@yahoo.com
Hi Guix!

This patch series updates lsp-plugins to 1.2.15 and changes the package
definition to be in line with changes in lsp-plugins.

Have a good one :)

-----

Parnikkapore (5):
gnu: lsp-plugins: Update to 1.2.15.
gnu: lsp-plugins: Use new package style.
gnu: lsp-plugins: Update build environment variables
gnu: lsp-plugins: Enable all features.
gnu: lsp-plugins: Split outputs.

gnu/packages/music.scm | 62 ++++++++++++++++++++++++------------------
1 file changed, 36 insertions(+), 26 deletions(-)


base-commit: 43a4215cad8c6da357f895569c0cedf5e854cee0
--
2.41.0
P
P
Parnikkapore wrote on 20 Apr 23:58 +0200
[PATCH 1/5] gnu: lsp-plugins: Update to 1.2.15.
(address . 70486@debbugs.gnu.org)
b25e23e88543b20eac1aeda388f0f92e98a8f2b0.1713647400.git.poomklao@yahoo.com
* gnu/packages/music.scm (lsp-plugins): Update to 1.2.15.
[phases]: Skip tests if tests are disabled.
[inputs]: Remove unused inputs.
[native-inputs]: Ditto.

Change-Id: Iac82d106d7bd18049e7798c86afb9185d0ccff95
---
gnu/packages/music.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)

Toggle diff (60 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ceac94a592..ceb26927c6 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -55,6 +55,7 @@
;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Parnikkapore <poomklao@yahoo.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6197,15 +6198,15 @@ (define-public artyfx
(define-public lsp-plugins
(package
(name "lsp-plugins")
- (version "1.2.3")
+ (version "1.2.15")
(source
(origin
(method url-fetch)
- (uri (string-append "https://github.com/sadko4u/lsp-plugins"
+ (uri (string-append "https://github.com/lsp-plugins/lsp-plugins"
"/releases/download/" version
"/lsp-plugins-src-" version ".tar.gz"))
(sha256
- (base32 "0asgwrkyncxz5h7kjkbwm78z8l2jndxvsrgd634m5x9n37gjsgvs"))))
+ (base32 "1bpkbmy8djz304rlsf9zp7bkyc874gnpfihkigqg4fj667x2xfcj"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@@ -6223,21 +6224,18 @@ (define-public lsp-plugins
(string-append "PREFIX=" out)
(string-append "ETCDIR=" out "/etc")))))
(replace 'check
- (lambda _
- (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest"))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest"))))))
(inputs
(list cairo
freetype
- hicolor-icon-theme
- jack-1
- ladspa
+ jack-2
libsndfile
libx11
libxrandr
- lv2
mesa))
- (native-inputs
- (list pkg-config php))
+ (native-inputs (list pkg-config php))
(synopsis "Audio plugin collection")
(description "LSP (Linux Studio Plugins) is a collection of audio
plugins available as LADSPA/LV2 plugins and as standalone JACK
--
2.41.0
P
P
Parnikkapore wrote on 20 Apr 23:58 +0200
[PATCH 2/5] gnu: lsp-plugins: Use new package style.
(address . 70486@debbugs.gnu.org)
35a22c5c45081d9a069ba57137092267cca9aa93.1713647400.git.poomklao@yahoo.com
* gnu/packages/music (lsp-plugins)[arguments]: Use G-expressions. Use #$output
instead of assoc-ref.

Change-Id: Idca583b06e54c15f98a8439e7fb2a553bf9b112c
---
gnu/packages/music.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ceb26927c6..8ab8b6baeb 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6209,24 +6209,24 @@ (define-public lsp-plugins
(base32 "1bpkbmy8djz304rlsf9zp7bkyc874gnpfihkigqg4fj667x2xfcj"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
- (list
- (string-append "CC=" ,(cc-for-target))
+ (list
+ #:make-flags
+ #~(list
+ (string-append "CC=" #$(cc-for-target))
"BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0"
- (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc"))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "make" "config" "TEST=1"
- (string-append "PREFIX=" out)
- (string-append "ETCDIR=" out "/etc")))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest"))))))
+ (string-append "PREFIX=" #$output)
+ (string-append "ETC_PATH=" #$output "/etc"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (invoke "make" "config" "TEST=1"
+ (string-append "PREFIX=" #$output)
+ (string-append "ETCDIR=" #$output "/etc"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest")))))))
(inputs
(list cairo
freetype
--
2.41.0
P
P
Parnikkapore wrote on 20 Apr 23:58 +0200
[PATCH 3/5] gnu: lsp-plugins: Update build environment variables
(address . 70486@debbugs.gnu.org)
1d185daa607295f40431521e2e7b6999a744d786.1713647400.git.poomklao@yahoo.com
* gnu/packages/music.scm (lsp-plugins): Update build environment
variables
[make-flags]: Unset BUILD_MODULES, PREFIX, and ETC_PATH
[phases]: Set FEATURES and TEST

Change-Id: I24b6324eda6647429c7fe128abdc631b02f94cd1
---
gnu/packages/music.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 8ab8b6baeb..7500926c5b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6213,14 +6213,15 @@ (define-public lsp-plugins
#:make-flags
#~(list
(string-append "CC=" #$(cc-for-target))
- "BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0"
- (string-append "PREFIX=" #$output)
- (string-append "ETC_PATH=" #$output "/etc"))
+ "VST_UI=0")
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
- (invoke "make" "config" "TEST=1"
+ (invoke "make" "config"
+ "STRICT=1"
+ "TEST=1"
+ "FEATURES=lv2 ladspa jack"
(string-append "PREFIX=" #$output)
(string-append "ETCDIR=" #$output "/etc"))))
(replace 'check
--
2.41.0
P
P
Parnikkapore wrote on 20 Apr 23:58 +0200
[PATCH 4/5] gnu: lsp-plugins: Enable all features.
(address . 70486@debbugs.gnu.org)
63b6fb6cf6c86fa4098bef8b8708ceff7fd96d07.1713647400.git.poomklao@yahoo.com
* gnu/packages/music.scm (lsp-plugins): Enable all features.
[make-flags]: Unset VST_UI
[phases]: Use upstream's feature list

Change-Id: I6f3b906e26819da8e72dc360ea55f3948fa2992e
---
gnu/packages/music.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7500926c5b..f2045c6e4c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6211,9 +6211,7 @@ (define-public lsp-plugins
(arguments
(list
#:make-flags
- #~(list
- (string-append "CC=" #$(cc-for-target))
- "VST_UI=0")
+ #~(list (string-append "CC=" #$(cc-for-target)))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -6221,7 +6219,7 @@ (define-public lsp-plugins
(invoke "make" "config"
"STRICT=1"
"TEST=1"
- "FEATURES=lv2 ladspa jack"
+ "FEATURES=clap doc jack ladspa lv2 vst2 xdg"
(string-append "PREFIX=" #$output)
(string-append "ETCDIR=" #$output "/etc"))))
(replace 'check
--
2.41.0
P
P
Parnikkapore wrote on 20 Apr 23:58 +0200
[PATCH 5/5] gnu: lsp-plugins: Split outputs.
(address . 70486@debbugs.gnu.org)
9ad725d887b7a2fad28206ad081519a92e8fee1c.1713647400.git.poomklao@yahoo.com
* gnu/packages/music.scm (lsp-plugins): Split outputs.
[phases]: Add move-large-subdirs.
[outputs]: Declare outputs.

Change-Id: I50dc27b7ec43657fda12c7b03068f7be6290aeef
---
gnu/packages/music.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f2045c6e4c..4a3e615c15 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6225,7 +6225,19 @@ (define-public lsp-plugins
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest")))))))
+ (invoke ".build/host/lsp-plugin-fw/lsp-plugins-test" "utest"))))
+ (add-after 'install 'move-large-subdirs
+ (lambda _
+ (define (move-to-output output path)
+ (let ((source (string-append #$output path))
+ (target (string-append output path)))
+ (mkdir-p (dirname target))
+ (rename-file source target)))
+ (move-to-output #$output:doc "/share/doc") ; 29MB
+ (move-to-output #$output:lv2 "/lib/lv2") ; 32MB
+ (move-to-output #$output:bin "/bin") ; Avoid cluttering xdg menu
+ (move-to-output #$output:bin "/share")
+ (move-to-output #$output:bin "/etc"))))))
(inputs
(list cairo
freetype
@@ -6235,6 +6247,7 @@ (define-public lsp-plugins
libxrandr
mesa))
(native-inputs (list pkg-config php))
+ (outputs '("out" "doc" "lv2" "debug"))
(synopsis "Audio plugin collection")
(description "LSP (Linux Studio Plugins) is a collection of audio
plugins available as LADSPA/LV2 plugins and as standalone JACK
--
2.41.0
C
C
Christopher Baines wrote on 26 Apr 18:32 +0200
Re: [bug#70486] [PATCH 0/5] Clean up lsp-plugins + update it to 1.2.15
(name . Parnikkapore via Guix-patches via)(address . guix-patches@gnu.org)
87v844t78g.fsf@cbaines.net
Parnikkapore via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (19 lines)
> Hi Guix!
>
> This patch series updates lsp-plugins to 1.2.15 and changes the package
> definition to be in line with changes in lsp-plugins.
>
> Have a good one :)
>
> -----
>
> Parnikkapore (5):
> gnu: lsp-plugins: Update to 1.2.15.
> gnu: lsp-plugins: Use new package style.
> gnu: lsp-plugins: Update build environment variables
> gnu: lsp-plugins: Enable all features.
> gnu: lsp-plugins: Split outputs.
>
> gnu/packages/music.scm | 62 ++++++++++++++++++++++++------------------
> 1 file changed, 36 insertions(+), 26 deletions(-)

Thanks for the patches, they look good to me and I've pushed them to
master as ed0ecceab83a7a5edbe15ded585c7e42c06ba84a.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYr1yBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfaPw/8DFTYfD3pkht6+Z+HuKxZI3CbcjF/eXeS
Wmq7g4TWd72yYME18yp3goIsqrip6zS1TKxlIeQFCr1tzIA4ErUk4zUJXiTeMHF7
VZC//CzP9Vm72AjGA8uWmYdxvHkwUE4yIM18Clk5w4Xr2JWB0BkkbWn/xsCTKsBb
GdQGEw333g8Yzcjt9e9rER2rn0jRGcl4Pfllu+c0CPl1+EYI9cwMCw3tXzlZNj7g
YRwGoFp9Kzy3FE4pP/8XfZFtrdYPJ4a6IktinGKHK4HYZVW3r+GAgWcjSe6mAGP1
e0GJ+jm4B3mFS/r+lD3UlrQqGm0Nan0RGwlHUwr1jispMBUcfrTx/UMftjL0S+16
e5M2DY2EoDIapIz8c/K+jA4gjesTKfldZN7Qu0HH9DLthcmhaOtl/gHYlYs+9MYc
yO+3Cbh1k2MidudSV8gkwM+YMbQaPpli5oaCirGg1tZTEQtpbqdP7FGHjaaVBuZV
5nO8Lsu8i0lFeuV9xmahJ1wP4W5YNbupHVTSvOfun7RHiKGQ73ssU8SiM2bX6t8q
YrYbXFwgLSDE8rsj8rQ5am/vy7iGoQ/wq+ka5+hxzw4oSIo7ByRz48Yv8r16taLX
GHgDngvyhNBl0v4BE281cD3ZIGRbgJ+mLZNWfNAecSfxVD2nY5EuiNTfSA3CkNdX
Wfzzi8/X9vs=
=8gsu
-----END PGP SIGNATURE-----

Closed
?