diff mbox series

[bug#42997,1/2] gnu: muse-sequencer: Update to 3.1.1.

Message ID 20200823151551.16314-1-monego@posteo.net
State Accepted
Headers show
Series [bug#42997,1/2] gnu: muse-sequencer: Update to 3.1.1. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Vinicius Monego Aug. 23, 2020, 3:15 p.m. UTC
* gnu/packages/music.scm (muse-sequencer): Update to 3.1.1.
[arguments]: Set CMAKE_BUILD_TYPE to Release. Add stage to set LDFLAGS.
Add stage to wrap executable.
[inputs]: Sort alphabetically.
---
This package is broken in the CI. I had to update the version to fix.

There are still some rough edges, but it builds and is somewhat usable.
 gnu/packages/music.scm | 44 +++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

Comments

Leo Famulari Aug. 23, 2020, 6:22 p.m. UTC | #1
On Sun, Aug 23, 2020 at 12:15:51PM -0300, Vinicius Monego wrote:
> * gnu/packages/music.scm (muse-sequencer): Update to 3.1.1.

Thanks for these patches!

> [arguments]: Set CMAKE_BUILD_TYPE to Release. Add stage to set LDFLAGS.
> Add stage to wrap executable.
> [inputs]: Sort alphabetically.

> +         (add-before 'configure 'set-LDFLAGS
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (setenv "LDFLAGS"
> +                     (string-append
> +                      "-Wl,-rpath=" (assoc-ref outputs "out")
> +                      "/lib/muse-3.1/modules"))))

Does this phase actually work? While building, I noticed these messages:

------
starting phase `validate-runpath'
validating RUNPATH of 54 binaries in "/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib"...
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/converters/rubberband_converter.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/converters/src_converter.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/converters/zita_resampler_converter.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libaudio_converter_plugin.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_al.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_arranger.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_audio_convert.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_awl.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_cliplist.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_components.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_core.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_ctrl.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_driver.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_evdata_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_icons.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_instruments.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_latency_compensator_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_liste.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_lv2host_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_marker.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_master.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_memory_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_midi_controller_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_midiedit.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_midnam_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_mixer.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_mpevent_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_mplugins.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_plugin_cache_reader_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_plugin_cache_writer_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_plugin_list_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_plugin_rdf_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_plugin_scan_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_remote.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_simpler_plugin.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_simpler_plugingui.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_string.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_synti.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_sysex_helper_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_time_stretch_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_wave_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_waveedit.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_wavepreview_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_widgets.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_widgets_functiondialogs.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/modules/libmuse_xml_module.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/plugins/doublechorus.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/plugins/freeverb.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/plugins/pandelay.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/synthi/deicsonze.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/synthi/fluid_synth.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/synthi/organ.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/synthi/simpledrums.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/lib/muse-3.1/synthi/vam.so: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
validating RUNPATH of 3 binaries in "/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/bin"...
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/bin/.muse3-real: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/bin/grepmidi: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
/gnu/store/47x594yg113xrj8qp55srjvfvgb5qiv1-muse-sequencer-3.1.1/bin/muse_plugin_scan: warning: RUNPATH contains bogus entries: ("lib/muse-3.1/modules")
Vinicius Monego Aug. 24, 2020, 4:46 p.m. UTC | #2
Leo Famulari writes:

>> +         (add-before 'configure 'set-LDFLAGS
>> +           (lambda* (#:key inputs outputs #:allow-other-keys)
>> +             (setenv "LDFLAGS"
>> +                     (string-append
>> +                      "-Wl,-rpath=" (assoc-ref outputs "out")
>> +                      "/lib/muse-3.1/modules"))))
>
> Does this phase actually work?

Without this phase the validate-runpath phase will fail. If
validate-runpath is deleted, the executable will not find the 
shared
libraries (libmuse*) in that folder and will not start. With this 
phase
it finds the libraries and starts, despite the warning.

There are some segfaults and some UI elements are not loading 
(e.g. the
"Add synth" in the right-click menu and the plugin 
configuration). I'm going to
pass the torch to the next contributor. I hope these patches will 
save some work.
Ludovic Courtès Dec. 18, 2020, 1:13 p.m. UTC | #3
Vinicius Monego <monego@posteo.net> skribis:

> * gnu/packages/music.scm (muse-sequencer): Update to 3.1.1.
> [arguments]: Set CMAKE_BUILD_TYPE to Release. Add stage to set LDFLAGS.
> Add stage to wrap executable.
> [inputs]: Sort alphabetically.

Hi!  This update happened independently in commit
5525aea7cf1444fe65dd96ce1d413c7f7331d67b.

Ludo’.
diff mbox series

Patch

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ae8579cb47..7cc6d7b1ea 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -29,6 +29,7 @@ 
 ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4127,7 +4128,7 @@  sample library.")
 (define-public muse-sequencer
   (package
     (name "muse-sequencer")
-    (version "3.0.0")
+    (version "3.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4139,7 +4140,7 @@  sample library.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1nninz8qyqlxxjdnrm79y3gr3056pga9l2fsqh674jd3cjvafya3"))))
+                "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; there is no test target
@@ -4147,27 +4148,44 @@  sample library.")
        (list "-DENABLE_LV2_SUPPLIED=OFF"
              "-DENABLE_RTAUDIO=OFF"    ; FIXME: not packaged
              "-DENABLE_INSTPATCH=OFF"  ; FIXME: not packaged
-             "-DENABLE_VST_NATIVE=OFF")
+             "-DENABLE_VST_NATIVE=OFF"
+             "-DCMAKE_BUILD_TYPE=Release")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'chdir
-           (lambda _ (chdir "muse3"))))))
+           (lambda _ (chdir "muse3")))
+         ;; Fix validate-runpath stage.
+         (add-before 'configure 'set-LDFLAGS
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (setenv "LDFLAGS"
+                     (string-append
+                      "-Wl,-rpath=" (assoc-ref outputs "out")
+                      "/lib/muse-3.1/modules"))))
+         ;; Ensure that icons are found at runtime.
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/muse3")
+                 `("QT_PLUGIN_PATH" prefix
+                   ,(list (string-append (assoc-ref inputs "qtsvg")
+                                         "/lib/qt5/plugins/"))))))))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("lash" ,lash)
-       ("jack" ,jack-1)
-       ("liblo" ,liblo)
        ("dssi" ,dssi)
+       ("fluidsynth" ,fluidsynth)
+       ("jack" ,jack-1)
        ("ladspa" ,ladspa)
-       ("lv2" ,lv2)
-       ("lilv" ,lilv)
-       ("sord" ,sord)
-       ("libsndfile" ,libsndfile)
+       ("lash" ,lash)
+       ("liblo" ,liblo)
        ("libsamplerate" ,libsamplerate)
-       ("fluidsynth" ,fluidsynth)
+       ("libsndfile" ,libsndfile)
+       ("lilv" ,lilv)
+       ("lv2" ,lv2)
        ("pcre" ,pcre)
+       ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg)
+       ("sord" ,sord)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))