From patchwork Sat Dec 18 18:12:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35392 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 56C9727BBEA; Sat, 18 Dec 2021 18:13:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2049527BBE9 for ; Sat, 18 Dec 2021 18:13:10 +0000 (GMT) Received: from localhost ([::1]:46084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myeCj-00061g-2S for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 13:13:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myeCc-00061Y-Cu for guix-patches@gnu.org; Sat, 18 Dec 2021 13:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myeCc-00083k-4f for guix-patches@gnu.org; Sat, 18 Dec 2021 13:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myeCb-0006oP-Qz for guix-patches@gnu.org; Sat, 18 Dec 2021 13:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52247] [PATCH v2 1/2] gnu: shotcut: Find ffmpeg and mlt at runtime. References: <20211202161817.554276-1-monego@posteo.net> In-Reply-To: <20211202161817.554276-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 18:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52247@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52247-submit@debbugs.gnu.org id=B52247.163985117426153 (code B ref 52247); Sat, 18 Dec 2021 18:13:01 +0000 Received: (at 52247) by debbugs.gnu.org; 18 Dec 2021 18:12:54 +0000 Received: from localhost ([127.0.0.1]:43789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myeCT-0006nl-SJ for submit@debbugs.gnu.org; Sat, 18 Dec 2021 13:12:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:47423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myeCQ-0006nW-Kh for 52247@debbugs.gnu.org; Sat, 18 Dec 2021 13:12:52 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 69BAF240026 for <52247@debbugs.gnu.org>; Sat, 18 Dec 2021 19:12:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639851164; bh=zA5wneQj3wpceVJFZVTnpZCmnPmJoW4bUyBhSBQ+R0g=; h=From:To:Cc:Subject:Date:From; b=q+7gslnq+o2NPcXFBdzVSFV1PiMPqgQNVDbTkRMOO6UtpVB811eiAOlvapDDMDIaG BbHFCPOgcbP7ZFLhjCfA6mHchqsPRd5cyhS5KYFe9XAMh7TOWbMuT78vUX0PrbDS0+ NWdozEjS4W0bPRxTPD77REFocMFwuulJj6sZ6ZGoioADWJyYNNkZmAO1JIDb99P0as Pt9Khtp6IpaFAg+Ep3kEyJ7SB4pk90t8cvrJZK77SRj/dTt6tJXO22MVMFHqgvsqdk F9iiqJYIj77IQ9+xtNwKvUMTisaenFdTdoCgD+CIFrSm47p0EpuLhxDJ0xPlRF7upz Y3uLsWQlERxhw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGYqH1qdSz6tmL; Sat, 18 Dec 2021 19:12:42 +0100 (CET) From: Vinicius Monego Date: Sat, 18 Dec 2021 18:12:26 +0000 Message-Id: <20211218181227.82026-1-monego@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 86d6c6053c7d1c7a82c83f0daf0f5e09b1ecfb63 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")))