all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Vinicius Monego <monego@posteo.net>
To: 52247@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#52247] [PATCH] gnu: shotcut: Find ffmpeg and mlt at runtime.
Date: Thu,  2 Dec 2021 16:18:17 +0000	[thread overview]
Message-ID: <20211202161817.554276-1-monego@posteo.net> (raw)

* gnu/packages/video.scm (shotcut)[arguments]<:#phases>: Symlink ffmpeg and
mlt binaries to the Shotcut bin folder and remove unused PATH and MLT_PREFIX
environment variables in the 'wrap-executable phase.
---
fixes 50433

 gnu/packages/video.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index eeabb11bcf..dcc2f59357 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4918,16 +4918,23 @@ transitions, and effects and then export your film to many common formats.")
                     (frei0r (assoc-ref inputs "frei0r-plugins"))
                     (ffmpeg (assoc-ref inputs "ffmpeg"))
                     (jack (assoc-ref inputs "jack"))
+                    (mlt (assoc-ref inputs "mlt"))
                     (sdl2 (assoc-ref inputs "sdl2")))
+               ;; Shotcut looks for ffmpeg and melt executables in the shotcut
+               ;; directory.  Symlink them to be found at runtime.
+               (for-each (lambda (file)
+                           (symlink (string-append ffmpeg "/bin/" file)
+                                    (string-append out "/bin/" file)))
+                         '("ffmpeg" "ffplay" "ffprobe"))
+               (for-each (lambda (file)
+                           (symlink (string-append mlt "/bin/" file)
+                                    (string-append out "/bin/" file)))
+                         '("melt" "melt-7"))
                (wrap-program (string-append out "/bin/shotcut")
-                 `("PATH" ":" prefix
-                   ,(list (string-append ffmpeg "/bin")))
                  `("LD_LIBRARY_PATH" ":" prefix
                    ,(list (string-append jack "/lib" ":" sdl2 "/lib")))
                  `("FREI0R_PATH" ":" =
-                   (,(string-append frei0r "/lib/frei0r-1/")))
-                 `("MLT_PREFIX" ":" =
-                   (,(assoc-ref inputs "mlt"))))))))))
+                   (,(string-append frei0r "/lib/frei0r-1/"))))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)

base-commit: fab80c36720bbdb85730708d0dc5fceabcc22a6e
-- 
2.30.2





             reply	other threads:[~2021-12-02 16:20 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 16:18 Vinicius Monego [this message]
2021-12-02 19:16 ` [bug#52247] [PATCH] gnu: shotcut: Find ffmpeg and mlt at runtime Leo Famulari
2021-12-18 17:02   ` Vinicius Monego
2021-12-18 18:12 ` [bug#52247] [PATCH v2 1/2] " Vinicius Monego
2021-12-18 18:12   ` [bug#52247] [PATCH v2 2/2] gnu: shotcut: Adjust environment variables in 'wrap-program Vinicius Monego
2021-12-26 23:38   ` bug#52247: [PATCH v2 1/2] gnu: shotcut: Find ffmpeg and mlt at runtime Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211202161817.554276-1-monego@posteo.net \
    --to=monego@posteo.net \
    --cc=52247@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.