From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QBuNNUjyqGEuigAAgWs5BA (envelope-from ) for ; Thu, 02 Dec 2021 17:20:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IOhhMUjyqGHBGgAA1q6Kng (envelope-from ) for ; Thu, 02 Dec 2021 16:20:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9F66C23F70 for ; Thu, 2 Dec 2021 17:20:24 +0100 (CET) Received: from localhost ([::1]:51482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msoop-000566-Mz for larch@yhetil.org; Thu, 02 Dec 2021 11:20:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msooV-00053Q-0b for guix-patches@gnu.org; Thu, 02 Dec 2021 11:20:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msooU-0004W2-Oo for guix-patches@gnu.org; Thu, 02 Dec 2021 11:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msooU-0004fX-Ko for guix-patches@gnu.org; Thu, 02 Dec 2021 11:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52247] [PATCH] gnu: shotcut: Find ffmpeg and mlt at runtime. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Dec 2021 16:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52247@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163846194717869 (code B ref -1); Thu, 02 Dec 2021 16:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2021 16:19:07 +0000 Received: from localhost ([127.0.0.1]:49056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msonb-0004e9-8B for submit@debbugs.gnu.org; Thu, 02 Dec 2021 11:19:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:52536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msonZ-0004e1-6J for submit@debbugs.gnu.org; Thu, 02 Dec 2021 11:19:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msonZ-0004cZ-0t for guix-patches@gnu.org; Thu, 02 Dec 2021 11:19:05 -0500 Received: from mout02.posteo.de ([185.67.36.66]:59563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msonV-0004Oy-MH for guix-patches@gnu.org; Thu, 02 Dec 2021 11:19:04 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 17A29240105 for ; Thu, 2 Dec 2021 17:18:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638461938; bh=nNEnuItXZzstEpsFlCWizxFfcqhRdM8CWRYfa7PO87Y=; h=From:To:Cc:Subject:Date:From; b=eBm9BGtdfuo+gmpUFmf/a92rLkqTzQFPrNL6g/bm1VRZRlFeCwMX7pdsfZycJXkDv yrzYTBtaXQ7rvJGoAilHCCiyyPSkbZS1dWa1hFAEzfmDp/c53evOUn52v0XiCr44u6 nw+2QTnoLaHLhz496TvMQ3z0S07uco2kPN11yEjOGhpuNH3XLROkbrm9jC1TWJjYs5 xjBrWMpXXkK0G0u5Aej5Hlsf5dK44a6GFpjVSgWIMkNCc/QN/4AVUKb8q+XKtHG57r 3avnAKqhRAY2DKPIPdTSnE79PWWv7zGOBwaX0krlFPMv0QbQiSb+ICg0upegCzYXJd W76rs/SemhDoQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J4h3N5h6pz6tnq; Thu, 2 Dec 2021 17:18:56 +0100 (CET) From: Vinicius Monego Date: Thu, 2 Dec 2021 16:18:17 +0000 Message-Id: <20211202161817.554276-1-monego@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638462024; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=cRBgx5BsctMYR5qst0EubYDGhWuX79DesxrpZyjRLAs=; b=WHMuOqGSN2a9u4eHyOs76sSnJ8asNjknEZvUGPhlSeFfgOM4y97eOCl1b/TmXw+M9/M1Mp y7hmE5ea6u/20yQE+MHai9+C2jidzumVNcrDpuZA8ZSHuQJrDMncIvN8CCVPoKmOjoL0K2 5DkqO3irvNKSLUqzJkkNQrJLGJAMrwvRIBe4d6bib2cd6zOZEGevWF7eiSxfhtTeYTzDUF /5W2xkwVfoME1225wbtlWHVG9jsl33IqTeDOq+jRbwjqPlH0zp7Lx+7p6VbImi6Pj4amPI 8d8qpd/9I68y+upYthST3SMQu59iJZDIz0rgaxYEQe6QNcDvCCAKkI6C8GUtOQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638462024; a=rsa-sha256; cv=none; b=sE8xfM+ABsSvoCJXH6U3IHMgRih5+NW+nUPTsQdsZa3LvTdHXi+xJcXOW5M7utuoRtjb6m vynmRyXa3z9MzG8xWuQAZizaQy25Sdi8HWJpfYZUjPb8yU5prggOG/qjHvWdS9p3lFnC8t 8+cO4R8WfjYMRz24D0IrCbDkNLjVM4pRa5w/k06tlK/KZHhAh1A2Yhszu0wEHRVe4CS3k6 1C6BVs6aPADwFxDOKk+yeWrxXd3BRNml5LC+3MLUACRzSsgDhpyxLszCZVVvWbdo+fVLrd 87Cok4P65zp6h4Nt0sJwl/Lf49MxS+IpldTG7hlDTkzzlZjJqYcHVRu04f/rhA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=eBm9BGtd; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.72 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=eBm9BGtd; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9F66C23F70 X-Spam-Score: -0.72 X-Migadu-Scanner: scn0.migadu.com X-TUID: fOTqJ/Z3MhIQ * 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