GNU bug report logs - #70486
[PATCH 0/5] Clean up lsp-plugins + update it to 1.2.15

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 70486 in the body.
You can then email your comments to 70486 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/5] Clean up lsp-plugins + update it to 1.2.15
Date: Sat, 20 Apr 2024 23:54:12 +0200

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

Message #8 received at 70486 <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: 70486 <at> debbugs.gnu.org
Subject: [PATCH 1/5] gnu: lsp-plugins: Update to 1.2.15.
Date: Sat, 20 Apr 2024 23:58:30 +0200

* 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(-)

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 <at> gmail.com>
 ;;; Copyright © 2023 Yovan Naumovski <yovan <at> gorski.stream>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2024 Parnikkapore <poomklao <at> 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

Message #11 received at 70486 <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: 70486 <at> debbugs.gnu.org
Subject: [PATCH 2/5] gnu: lsp-plugins: Use new package style.
Date: Sat, 20 Apr 2024 23:58:31 +0200

* 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(-)

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

Message #14 received at 70486 <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: 70486 <at> debbugs.gnu.org
Subject: [PATCH 3/5] gnu: lsp-plugins: Update build environment variables
Date: Sat, 20 Apr 2024 23:58:32 +0200

* 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(-)

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

Message #17 received at 70486 <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: 70486 <at> debbugs.gnu.org
Subject: [PATCH 4/5] gnu: lsp-plugins: Enable all features.
Date: Sat, 20 Apr 2024 23:58:33 +0200

* 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(-)

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

Message #20 received at 70486 <at> debbugs.gnu.org (full text, mbox):

From: Parnikkapore <poomklao <at> yahoo.com>
To: 70486 <at> debbugs.gnu.org
Subject: [PATCH 5/5] gnu: lsp-plugins: Split outputs.
Date: Sat, 20 Apr 2024 23:58:34 +0200

* 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(-)

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

Message #25 received at 70486-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Parnikkapore via Guix-patches via <guix-patches <at> gnu.org>
Cc: 70486-done <at> debbugs.gnu.org, Parnikkapore <poomklao <at> yahoo.com>
Subject: Re: [bug#70486] [PATCH 0/5] Clean up lsp-plugins + update it to 1.2.15
Date: Fri, 26 Apr 2024 17:32:31 +0100

[Message part 1 (text/plain, inline)]

Parnikkapore via Guix-patches via <guix-patches <at> gnu.org> writes:

> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.