From patchwork Wed Feb 2 15:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 36937 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 81E2227BBEB; Wed, 2 Feb 2022 17:28:24 +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,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 44D8B27BBEA for ; Wed, 2 Feb 2022 17:28:24 +0000 (GMT) Received: from localhost ([::1]:45398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFJQd-0000Fv-Cq for patchwork@mira.cbaines.net; Wed, 02 Feb 2022 12:28:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFHwM-00044n-3b for guix-patches@gnu.org; Wed, 02 Feb 2022 10:53:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFHwL-00058Q-Q7 for guix-patches@gnu.org; Wed, 02 Feb 2022 10:53:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nFHwL-0006GW-QR for guix-patches@gnu.org; Wed, 02 Feb 2022 10:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53725] [PATCH] gnu: mlt: Wrap LADSPA_PATH and FREI0R_PATH. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Feb 2022 15:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53725@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164381716824059 (code B ref -1); Wed, 02 Feb 2022 15:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Feb 2022 15:52:48 +0000 Received: from localhost ([127.0.0.1]:53145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFHw8-0006Fz-CL for submit@debbugs.gnu.org; Wed, 02 Feb 2022 10:52:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:34918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFHw5-0006Fr-RP for submit@debbugs.gnu.org; Wed, 02 Feb 2022 10:52:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFHw4-0003dy-3g for guix-patches@gnu.org; Wed, 02 Feb 2022 10:52:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:44319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFHw0-00056J-OI for guix-patches@gnu.org; Wed, 02 Feb 2022 10:52:43 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A1529240104 for ; Wed, 2 Feb 2022 16:52:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1643817157; bh=SufQsEkq5f5uCFoMJ7y+5zWoip+Kpsp+uHy2O/bORA4=; h=From:To:Cc:Subject:Date:From; b=Ubb9CYsQ9Qi0fawc0CoSC+XzvycmYgIOBOAR6kzwmwb7GeFC/E0mRQScxb6Ygbcut 3buW5nZ1OgwJctdCQWu6rRTlrrfujHs9LDvc568kaELBI771A92mXusSURhBNxC7DJ 0DXNfLDcHn3lnJmJjtZCGlrEBfsYPvnS1ltRDL+XETRkj6s0k2CfT0ic2ZxgnoK04G O8xGCikcaArbrPKNdeK6P0Cy2q2jof1jAcsv2lf3Qhyok543c47kB9tINAPP88iZzK DlNKQ30RGaFGGz3rlfkJFM1DnxP8uLE79w3/pvNE8DN9aIluoy4YO43rFDdq6gI64s xxFitollWz/6A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JpmXN5TcXz6tmX; Wed, 2 Feb 2022 16:52:36 +0100 (CET) From: Vinicius Monego Date: Wed, 2 Feb 2022 15:52:21 +0000 Message-Id: <20220202155221.289085-1-monego@posteo.net> MIME-Version: 1.0 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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