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 v2 1/2] gnu: shotcut: Find ffmpeg and mlt at runtime.
Date: Sat, 18 Dec 2021 18:12:26 +0000	[thread overview]
Message-ID: <20211218181227.82026-1-monego@posteo.net> (raw)
In-Reply-To: <20211202161817.554276-1-monego@posteo.net>

* gnu/packages/video.scm (shotcut)[arguments]<:#phases>: Add phase
'patch-executable-paths to use full store paths for ffmpeg and mlt.
---
This adds the suggestion from above, using just the string for replacement.

 gnu/packages/video.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4b7251ee23..9b5738358b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4818,9 +4818,20 @@ transitions, and effects and then export your film to many common formats.")
         (base32 "0jgv6wl65gf6c4nmfica8k9vbgn3w3594d1phx1mb7zjvyy9y97k"))))
     (build-system qt-build-system)
     (arguments
-     `(#:tests? #f ;there are no tests
+     `(#:tests? #f                      ;there are no tests
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-executable-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Shotcut expects ffmpeg and melt executables in the shotcut
+             ;; directory.  Use full store paths.
+             (let* ((ffmpeg (assoc-ref inputs "ffmpeg"))
+                    (mlt (assoc-ref inputs "mlt")))
+               (substitute* "src/jobs/ffmpegjob.cpp"
+                 (("\"ffmpeg\"") (string-append "\"" ffmpeg "/bin/ffmpeg\"")))
+               (substitute* "src/jobs/meltjob.cpp"
+                 (("\"melt\"") (string-append "\"" mlt "/bin/melt\""))
+                 (("\"melt-7\"") (string-append "\"" mlt "/bin/melt-7\""))))))
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out")))

base-commit: 86d6c6053c7d1c7a82c83f0daf0f5e09b1ecfb63
-- 
2.30.2





  parent reply	other threads:[~2021-12-18 18:13 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 16:18 [bug#52247] [PATCH] gnu: shotcut: Find ffmpeg and mlt at runtime Vinicius Monego
2021-12-02 19:16 ` Leo Famulari
2021-12-18 17:02   ` Vinicius Monego
2021-12-18 18:12 ` Vinicius Monego [this message]
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=20211218181227.82026-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.