From patchwork Tue Jul 6 18:36:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 31199 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 6035F27BC81; Tue, 6 Jul 2021 19:37:09 +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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 1C4E927BC78 for ; Tue, 6 Jul 2021 19:37:09 +0100 (BST) Received: from localhost ([::1]:36536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0pwS-0007Gp-5Y for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 14:37:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0pwM-0007GK-Go for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0pwM-0000ut-8I for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0pwM-0001A3-7t for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49446] [PATCH 1/4] gnu: rtaudio: Fix include path. References: <20210706183240.134397-1-monego@posteo.net> In-Reply-To: <20210706183240.134397-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 18:37: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.16255966194440 (code B ref 49446); Tue, 06 Jul 2021 18:37:02 +0000 Received: (at 49446) by debbugs.gnu.org; 6 Jul 2021 18:36:59 +0000 Received: from localhost ([127.0.0.1]:50162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwI-00019S-I8 for submit@debbugs.gnu.org; Tue, 06 Jul 2021 14:36:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwG-000198-IC for 49446@debbugs.gnu.org; Tue, 06 Jul 2021 14:36:57 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 22DEE2400FD for <49446@debbugs.gnu.org>; Tue, 6 Jul 2021 20:36:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625596610; bh=Wbn+y56VEPP2SADVVptcb0h56pxSZgAgGsHuG195Ek8=; h=From:To:Cc:Subject:Date:From; b=gOWGVLF2yyBADKgHweWKSGroUaLtXNO2NmTSiNOYqSDYsLkp4PAPYTNpYsa+In5x8 2lYQ1SghzMKc6peO6CqDMH6+xLhr4OQHukpC3nh2DGxdXrjeO5YDhhG1iK5vIUCoOv IiLl3VO2NrKUdZtMZJWd9JlnJ5yBRvQbMhzEse0Lb+6/tRkjbVK9Z19XRot59TJfJz kb3+pt9elVkRBxTywbNZr9HzRZ2YL7HS0/eAQsU5qdYz9RavMeVfqvaxCYMA2gEany /RUro8xw3DPGDk0U1mPhfDV3Kp3ueATxTGxxOEjj0Wdy5DTYaIvwVBO3esUiacrlIe sg3PszdbxCGcQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GKB9D4CvSz9rxQ; Tue, 6 Jul 2021 20:36:48 +0200 (CEST) From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:24 +0000 Message-Id: <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/audio.scm (rtaudio)[arguments]: Add phase 'fix-inc-path to move the header to where pkg-config expects it. * gnu/packages/music.scm (muse-sequencer)[arguments]{#:phases}: Remove 'fix-include. Don't return #t. --- gnu/packages/audio.scm | 14 +++++++++++++- gnu/packages/music.scm | 7 +------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 791e821738..83e6cf860e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Jonathan Frederickson ;;; Copyright © 2020 Giacomo Leidi -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. @@ -2345,6 +2345,18 @@ implementation of the Open Sound Control (@dfn{OSC}) protocol.") (sha256 (base32 "156c2dgh6jrsyfn1y89nslvaxm4yifmxridsb708yvkaym02w2l8")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The header that pkg-config expects is include/rtaudio/RtAudio.h, + ;; but this package installs it as include/RtAudio.h by default. + (add-after 'install 'fix-inc-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include"))) + (mkdir-p (string-append inc "/rtaudio")) + (rename-file (string-append inc "/RtAudio.h") + (string-append inc "/rtaudio/RtAudio.h")))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5100ec8abe..28661c5667 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4841,12 +4841,7 @@ sample library.") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "src") #t)) - (add-after 'chdir 'fix-include - (lambda _ - (substitute* "muse/driver/rtaudio.h" - (("rtaudio/RtAudio.h") "RtAudio.h")) - #t))))) + (lambda _ (chdir "src")))))) (inputs `(("alsa-lib" ,alsa-lib) ("dssi" ,dssi) From patchwork Tue Jul 6 18:36:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 31200 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 CCBF027BC81; Tue, 6 Jul 2021 19:37:10 +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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 47F3927BC78 for ; Tue, 6 Jul 2021 19:37:10 +0100 (BST) Received: from localhost ([::1]:36572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0pwT-0007I6-CN for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 14:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0pwN-0007GS-1H for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0pwM-0000v0-PA for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0pwM-0001AC-OA for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49446] [PATCH 2/4] gnu: mlt: Rename to mlt-6. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 18:37: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.16255966214456 (code B ref 49446); Tue, 06 Jul 2021 18:37:02 +0000 Received: (at 49446) by debbugs.gnu.org; 6 Jul 2021 18:37:01 +0000 Received: from localhost ([127.0.0.1]:50166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwK-00019n-Tn for submit@debbugs.gnu.org; Tue, 06 Jul 2021 14:37:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:37159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwI-00019D-2u for 49446@debbugs.gnu.org; Tue, 06 Jul 2021 14:36:58 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 6606D2400FE for <49446@debbugs.gnu.org>; Tue, 6 Jul 2021 20:36:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625596612; bh=lyr6FhH52Djdxf63jHdsCqSZa+/uneOsy7YKtJonda4=; h=From:To:Cc:Subject:Date:From; b=JdllKwc2RxEcdc1/nK/1Y2NLBi13gALhXwCLxehRxSeZ0mi92IhAfmo/BI0AddKiY A2YLiJjpJNYWzq8c86/6cLxadBC5pypWsJ5es6vwPLwXeB4gVFzBlJey2bmW7/WpVh E0h/s4UjO2IsQZkrG6Lg0UylR+AmK+KD1foritQFYrdF+REdh1W7MbBmfIY+Ki3+DB JSfIy1FU9KglEKHOUP672NAyiC8jmSsxT1xR/Nl6con3BLqwj/hBOGF66V9J3ghy/g HOQG0suSudtf4Ku31e0xNK+SPU9BEqTpJzxUF4+NmPrvTfZaHOyJJ0D6eE2kHv9Lz6 amFj2XvlxeuFQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GKB9H1bHQz9rxQ; Tue, 6 Jul 2021 20:36:50 +0200 (CEST) From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:25 +0000 Message-Id: <20210706183627.134904-2-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): Rename to mlt-6. [build-system]: Use cmake-build-system. [arguments]: Remove #:make-flags. Adjust 'override-LDFLAGS phase. {#:configure-flags}: Remove --enable-gpl3 and --enable-gpl. Set "GTK2_GDKCONFIG_INCLUDE_DIR" and "GTK2_GLIBCONFIG_INCLUDE_DIR". (shotcut): Use mlt-6. * gnu/packages/animation.scm (synfig): Use mlt-6. * gnu/packages/kde.scm (kdenlive): Use mlt-6. This change is to add MLT 7 which will be done in the next commit. --- gpl and gpl3 configure flags are ON by default in CMakeLists.txt. gnu/packages/animation.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/video.scm | 31 +++++++++++++++---------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index bf44f3b8a9..653f37f1a7 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -178,7 +178,7 @@ C++ @dfn{Standard Template Library} (STL).") ("imagemagick" ,imagemagick) ("libxml++" ,libxml++) ("libsigc++" ,libsigc++) - ("mlt" ,mlt) + ("mlt" ,mlt-6) ("openexr" ,openexr) ("pango" ,pango))) (native-inputs diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ebbae237f8..e81abc3abe 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -242,7 +242,7 @@ browser for easy news reading.") ("frei0r-plugins" ,frei0r-plugins) ("ffmpeg" ,ffmpeg) ("rttr" ,rttr) - ("mlt" ,mlt) + ("mlt" ,mlt-6) ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 74c8d3b253..59f532addd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2986,7 +2986,7 @@ 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 +(define-public mlt-6 (package (name "mlt") (version "6.26.1") @@ -2999,25 +2999,24 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (sha256 (base32 "1gz79xvs5jrzqhwhfk0dqdd3xiavnjp4q957h7nb02rij32byb39")))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags '(,(string-append "CC=" (cc-for-target)) - ,(string-append "CXX=" (cxx-for-target))) + `(#:tests? #f ;no tests #:configure-flags - (list "--enable-gpl3" - "--enable-gpl") + (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")) #:phases (modify-phases %standard-phases - (add-after - 'configure 'override-LDFLAGS + (add-before 'configure 'override-LDFLAGS (lambda* (#:key outputs #:allow-other-keys) - (substitute* "config.mak" - (("LDFLAGS\\+=") - (string-append "LDFLAGS+=-Wl,-rpath=" - (assoc-ref outputs "out") - "/lib "))) - #t))))) + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" + (assoc-ref outputs "out") "/lib"))))))) (inputs `(("alsa-lib" ,alsa-lib) ("alsa-plugins" ,alsa-plugins "pulseaudio") @@ -4677,7 +4676,7 @@ transitions, and effects and then export your film to many common formats.") ("lame" ,lame) ("libvpx" ,libvpx) ("libx264" ,libx264) - ("mlt" ,mlt) + ("mlt" ,mlt-6) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) 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") From patchwork Tue Jul 6 18:36:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 31201 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 E4B9C27BC83; Tue, 6 Jul 2021 19:38:19 +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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 D958127BC78 for ; Tue, 6 Jul 2021 19:38:18 +0100 (BST) Received: from localhost ([::1]:38228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0pxZ-0008Oy-Vj for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 14:38:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0pxL-0008MP-D0 for guix-patches@gnu.org; Tue, 06 Jul 2021 14:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0pxK-0000zl-HS 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-0001CL-Hh for guix-patches@gnu.org; Tue, 06 Jul 2021 14:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49446] [PATCH 4/4] gnu: shotcut: Update to 21.06.29. 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.16255966254512 (code B ref 49446); Tue, 06 Jul 2021 18:38:02 +0000 Received: (at 49446) by debbugs.gnu.org; 6 Jul 2021 18:37:05 +0000 Received: from localhost ([127.0.0.1]:50174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwO-0001Ag-RU for submit@debbugs.gnu.org; Tue, 06 Jul 2021 14:37:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwN-00019R-EV for 49446@debbugs.gnu.org; Tue, 06 Jul 2021 14:37:03 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BE96F2400FE for <49446@debbugs.gnu.org>; Tue, 6 Jul 2021 20:36:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625596617; bh=boQOg31RS139DraqdRiDkJ/ZcF0duBRTbZiSklNqfg0=; h=From:To:Cc:Subject:Date:From; b=UvoBusCBx8GLg6u8j7J8jxHQ20qIYeWSsyPtQMiLupcajxeMEJYYt9cWAed+UCUUL Cm4DVjMYsmaR2YMXRbpeFmDOCqMWr5FiA2DawOOEj/mohByGyqTb2XoL3cUOyhJxWD vHRFTcoyHp0Mut9UEOGF5hpeT5JpVWkBRt0Vn8Y/fmwpVTd7l4P7ru9X57JTkKPb8m wArTpNsqJQBXV9fKj8sgJh5/HzTWuHmYxNl9p7+piPoWs+Pj0WhdQiA8ZOxcqeB0uF bDh4yl9pgXvT6HoI1/bMgClwzoeNOGkOIEYoB6sNke6lYwTKdVnLtKDzT4YEvXg7Tx vVFYG9WbE3pxQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GKB9N43vvz9rxT; Tue, 6 Jul 2021 20:36:56 +0200 (CEST) From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:27 +0000 Message-Id: <20210706183627.134904-4-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 (shotcut): Update to 21.06.29. [arguments]{#:phases}: Don't return #t. [inputs]: Use MLT 7. --- gnu/packages/video.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ebe1847050..02bfc6c0b0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4644,7 +4644,7 @@ transitions, and effects and then export your film to many common formats.") (define-public shotcut (package (name "shotcut") - (version "21.03.21") + (version "21.06.29") (source (origin (method git-fetch) @@ -4653,7 +4653,7 @@ transitions, and effects and then export your film to many common formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jb488vynn0vmq22z51bg4hb4617732nva9rg52lzl89v5n8gmsi")))) + (base32 "0384iv2129mpalia39x8mn5xlbgx9ip994700jzjjxdqfq23a9qm")))) (build-system qt-build-system) (arguments `(#:tests? #f ;there are no tests @@ -4682,8 +4682,7 @@ transitions, and effects and then export your film to many common formats.") `("FREI0R_PATH" ":" = (,(string-append frei0r "/lib/frei0r-1/"))) `("MLT_PREFIX" ":" = - (,(assoc-ref inputs "mlt"))))) - #t))))) + (,(assoc-ref inputs "mlt")))))))))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -4696,7 +4695,7 @@ transitions, and effects and then export your film to many common formats.") ("lame" ,lame) ("libvpx" ,libvpx) ("libx264" ,libx264) - ("mlt" ,mlt-6) + ("mlt" ,mlt) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative)