all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#53725] [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH.
@ 2022-02-02 15:52 Vinicius Monego
  2022-03-03 22:46 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Vinicius Monego @ 2022-02-02 15:52 UTC (permalink / raw)
  To: 53725; +Cc: Vinicius Monego

* gnu/packages/video.scm (mlt)[arguments]: Use gexps. Add 'wrap-executable
phase.
[inputs]: Add bash-minimal.
---
Sending to list for comments about the symlink workaround. The linter also complains about alsa-plugins input, but I don't know what to do about it.

 gnu/packages/video.scm | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8a903f6fe1..68cd5d3f83 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3208,18 +3208,34 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
         (base32 "17d4gs46ca3n0qg6z69hl6mmllnqj2id8ccrv8fyz8c5zm55ghqm"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f ;requires "Kwalify"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'override-LDFLAGS
-           (lambda* (#:key outputs #:allow-other-keys)
-             (setenv "LDFLAGS"
-                     (string-append
-                      "-Wl,-rpath="
-                      (assoc-ref outputs "out") "/lib")))))))
+     (list
+      #:tests? #f                       ;requires "Kwalify"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'override-LDFLAGS
+            (lambda _
+              (setenv "LDFLAGS"
+                      (string-append "-Wl,-rpath=" #$output "/lib"))))
+          (add-after 'install 'wrap-executable
+            (lambda _
+              (let* ((frei0r #$(this-package-input "frei0r-plugins"))
+                     (ladspa #$(this-package-input "ladspa"))
+                     ;; In MLT 7, 'melt' symlinks to 'melt-7'.  Try to keep
+                     ;; compatibility with MLT 6 where it's only 'melt'.
+                     (major #$(version-major version))
+                     (exec (if (file-exists?
+                                (string-append #$output "/bin/melt-" major))
+                               (string-append "melt-" major)
+                               "melt")))
+                (wrap-program (string-append #$output "/bin/" exec)
+                  `("FREI0R_PATH" ":" =
+                    (,(string-append frei0r "/lib/frei0r-1")))
+                  `("LADSPA_PATH" ":" =
+                    (,(string-append ladspa "/lib/ladspa"))))))))))
     (inputs
      (list alsa-lib
            `(,alsa-plugins "pulseaudio")
+           bash-minimal
            ffmpeg
            fftw
            frei0r-plugins
-- 
2.30.2





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#53725] [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH.
  2022-02-02 15:52 [bug#53725] [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH Vinicius Monego
@ 2022-03-03 22:46 ` Ludovic Courtès
  2022-03-04  1:34   ` bug#53725: " Vinicius Monego
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2022-03-03 22:46 UTC (permalink / raw)
  To: Vinicius Monego; +Cc: 53725

Hi Vinicius,

Vinicius Monego <monego@posteo.net> skribis:

> * gnu/packages/video.scm (mlt)[arguments]: Use gexps. Add 'wrap-executable
> phase.
> [inputs]: Add bash-minimal.

LGTM, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#53725: [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH.
  2022-03-03 22:46 ` Ludovic Courtès
@ 2022-03-04  1:34   ` Vinicius Monego
  0 siblings, 0 replies; 3+ messages in thread
From: Vinicius Monego @ 2022-03-04  1:34 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 53725-done

On 03/03/2022 7:46 PM, Ludovic Courtès wrote:
> Hi Vinicius,
>
> Vinicius Monego <monego@posteo.net> skribis:
>
>> * gnu/packages/video.scm (mlt)[arguments]: Use gexps. Add 'wrap-executable
>> phase.
>> [inputs]: Add bash-minimal.
> LGTM, thanks!
>
> Ludo’.

Thanks! Pushed this followed by an update to mlt.





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-03-04  1:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-02 15:52 [bug#53725] [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH Vinicius Monego
2022-03-03 22:46 ` Ludovic Courtès
2022-03-04  1:34   ` bug#53725: " Vinicius Monego

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.