From patchwork Tue Jul 6 18:36: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: 31202 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 C028127BC78; Tue, 6 Jul 2021 19:38:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F03F427BC81 for ; Tue, 6 Jul 2021 19:38:18 +0100 (BST) Received: from localhost ([::1]:38232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0pxa-0008P8-24 for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 14:38:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0pxL-0008MD-6d for guix-patches@gnu.org; Tue, 06 Jul 2021 14:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0pxK-0000zk-Dy for guix-patches@gnu.org; Tue, 06 Jul 2021 14:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0pxK-0001CD-5I for guix-patches@gnu.org; Tue, 06 Jul 2021 14:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49446] [PATCH 3/4] gnu: Add MLT 7. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 18:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49446@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49446-submit@debbugs.gnu.org id=B49446.16255966224485 (code B ref 49446); Tue, 06 Jul 2021 18:38:02 +0000 Received: (at 49446) by debbugs.gnu.org; 6 Jul 2021 18:37:02 +0000 Received: from localhost ([127.0.0.1]:50168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwM-0001A7-AC for submit@debbugs.gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwK-00019G-Bt for 49446@debbugs.gnu.org; Tue, 06 Jul 2021 14:37:00 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AC1AD2400FD for <49446@debbugs.gnu.org>; Tue, 6 Jul 2021 20:36:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625596614; bh=0RIuLFx11DiGWBxDsstf54Umq/Ui/NYUc6XziF8rgFk=; h=From:To:Cc:Subject:Date:From; b=ND2jnPmZ3wdGqfwEek1m72BmoAFb0RI7CNo2arxg1KTEDf+3Co8KGET8WJEybENY6 MzVe2w/mCdmZ71HQIpazh3708R034fTAOqrMpbym5QtSUcNifZZmpUfkfW2tJb7NNZ HNOmFJZdjDzBKiwKZG+WTYFE0gKSPLJzzqd6Odn555uS48JSjWYJ5eterlt3ciNB12 0cS59QLvLSwFB5Rr6r27fY2n/UmRCaZGI6lWJWd7PbroQaA8KxFib2r4aVmsdjd7zy +x3C4t8rO+PzIgpz3CEiDkFYJA4YOoNZuHxSbwOV9SLQIOtQLYFwRgcnWtju9UYU6q l9I0zJy7dzr2Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GKB9K34Qcz9rxL; Tue, 6 Jul 2021 20:36:53 +0200 (CEST) From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:26 +0000 Message-Id: <20210706183627.134904-3-monego@posteo.net> In-Reply-To: <20210706183627.134904-1-monego@posteo.net> References: <20210706183627.134904-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 (mlt): New variable. (mlt-6): Inherit from above. --- gnu/packages/video.scm | 60 ++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 59f532addd..ebe1847050 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2986,29 +2986,22 @@ from sites like Twitch.tv and pipes them into a video player of choice.") "This package provides a command-line interface for Twitch.tv") (license license:gpl3+)))) -(define-public mlt-6 +(define-public mlt (package (name "mlt") - (version "6.26.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mltframework/mlt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gz79xvs5jrzqhwhfk0dqdd3xiavnjp4q957h7nb02rij32byb39")))) + (version "7.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mltframework/mlt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13c5miph9jjbz69dhy0zvbkk5zbb05dr3vraaci0d5fdbrlhyscf")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;no tests - #:configure-flags - (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" - (assoc-ref %build-inputs "gtk+") - "/lib/gtk-2.0/include") - (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" - (assoc-ref %build-inputs "glib") - "/lib/glib-2.0/include")) + `(#:tests? #f ;requires "Kwalify" #:phases (modify-phases %standard-phases (add-before 'configure 'override-LDFLAGS @@ -3024,7 +3017,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") ("fftw" ,fftw) ("frei0r-plugins" ,frei0r-plugins) ("gdk-pixbuf" ,gdk-pixbuf) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxml2" ,libxml2) ("jack" ,jack-1) ("ladspa" ,ladspa) @@ -3053,6 +3046,33 @@ functionality of the system is provided via an assortment of ready to use tools, XML authoring components, and an extensible plug-in based API.") (license license:lgpl2.1+))) +(define-public mlt-6 + (package + (inherit mlt) + (name "mlt") + (version "6.26.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mltframework/mlt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gz79xvs5jrzqhwhfk0dqdd3xiavnjp4q957h7nb02rij32byb39")))) + (arguments + `(#:configure-flags + (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" + (assoc-ref %build-inputs "gtk+") + "/lib/gtk-2.0/include") + (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" + (assoc-ref %build-inputs "glib") + "/lib/glib-2.0/include")) + ,@(package-arguments mlt))) + (inputs + `(("gtk+", gtk+-2) + ,@(alist-delete "gtk+" (package-inputs mlt)))))) + (define-public v4l-utils (package (name "v4l-utils")