From patchwork Fri Oct 22 19:17:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 34012 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 8168127BBE3; Fri, 22 Oct 2021 20:18:15 +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,RCVD_IN_MSPIKE_H2,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 51FE727BBE1 for ; Fri, 22 Oct 2021 20:18:14 +0100 (BST) Received: from localhost ([::1]:44178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1me03R-0001wR-Ad for patchwork@mira.cbaines.net; Fri, 22 Oct 2021 15:18:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1me03H-0001us-9c for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1me03G-0004wU-5m for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1me03G-0004he-25 for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51338] [PATCH 2/4] gnu: libopenshot: Update to 0.2.7. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Oct 2021 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51338@debbugs.gnu.org Received: via spool by 51338-submit@debbugs.gnu.org id=B51338.163493024818007 (code B ref 51338); Fri, 22 Oct 2021 19:18:02 +0000 Received: (at 51338) by debbugs.gnu.org; 22 Oct 2021 19:17:28 +0000 Received: from localhost ([127.0.0.1]:33803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1me02h-0004gI-J8 for submit@debbugs.gnu.org; Fri, 22 Oct 2021 15:17:28 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:48291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1me02f-0004fp-H6 for 51338@debbugs.gnu.org; Fri, 22 Oct 2021 15:17:25 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 74C9A5C014D; Fri, 22 Oct 2021 15:17:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 22 Oct 2021 15:17:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=HVPNhcPL2r zuBf5RDOzgaX/01FXD8ha8ku2XfUzBiLY=; b=subxVFc9v2ci8YvJMWjGJGu1Zs +Rw7BqlYN3A7/C4Oc53rgWKUs4VboSZuHBF0qgI7MZORKSvFG2lkCnrbzRxM7Tgd ezITDbRRsLyb0q2PN5qQSTdnMZesiKCb/6Sf6cKxzvCfqeaiwak3G/TOTnmC0yv0 md4cHyYDtl4gK25xE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=HVPNhcPL2rzuBf5RDOzgaX/01FXD8ha8ku2XfUzBiLY=; b=bvODY7ff gy3G/5nxrQ2gu+y+znx9Tx2od0pvmGQAoH/JOFMoJ8EPDFBJwj5RcH88sH93xER5 OGbFzKjPkw3l2/uNS0tatdwNBDhlHqC52wmjceF/ajWOt8PJtkOKBDoZEaN6aR7t wiYERQnfhtge08Ymu1YjZIrUFsH/i9AeZ0sPdZXnGSi38gUpzR+zpqmRy3ACYvUd e19u6l3iyamfdXDo8pz1wR2EGfenbmXSyt2DRVIUA3iVh0GANmlXJSupAdhwnYOo zXtRmZs00E6zm8UxjPWsgjLBAXr3JxaO70nF0uSjABxnz8vAWqkCQ9GgviIBU+cF wguPEE22dqfCxg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvddvkedgudefvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeevhfetgfdtfeekieetleetvdegke fhffekhffhffdtheduvedvtdfhffdvvdelgeenucffohhmrghinhepghhithhhuhgsrdgt ohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <51338@debbugs.gnu.org>; Fri, 22 Oct 2021 15:17:20 -0400 (EDT) From: Leo Famulari Date: Fri, 22 Oct 2021 15:17:14 -0400 Message-Id: X-Mailer: git-send-email 2.33.1 In-Reply-To: <83d86856865883d2f7c03e5224253af91ee22a9c.1634930236.git.leo@famulari.name> References: <83d86856865883d2f7c03e5224253af91ee22a9c.1634930236.git.leo@famulari.name> 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 (libopenshot): Update to 0.2.7. [origin]: Adjust snippet to upstream changes. [inputs]: Add alsa-lib and zlib. [propagated-inputs]: Replace ffmpeg-4.3 with ffmpeg. --- gnu/packages/video.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d2a2a08ee3..168c16492a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4589,7 +4589,7 @@ (define-public vidstab (define-public libopenshot (package (name "libopenshot") - (version "0.2.5") + (version "0.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -4598,11 +4598,11 @@ (define-public libopenshot (file-name (git-file-name name version)) (sha256 (base32 - "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp")) + "0i9bsn8gklm1mvj60l3d3xrxdgy8svpxjfqcwsr308j5zjn30pv8")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir - (substitute* "src/bindings/python/CMakeLists.txt" + (substitute* "bindings/python/CMakeLists.txt" (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) (string-append set " CACHE PATH " "\"Python bindings directory\")"))) @@ -4614,11 +4614,12 @@ (define-public libopenshot ("python" ,python) ("swig" ,swig) ("unittest++" ,unittest-cpp))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("zlib" ,zlib))) (propagated-inputs ;all referenced in installed headers `(("cppzmq" ,cppzmq) - ;; libopenshot doesn't yet build with ffmpeg 4.4 (see: - ;; https://github.com/OpenShot/libopenshot/issues/676). - ("ffmpeg" ,ffmpeg-4.3) + ("ffmpeg" ,ffmpeg) ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio)