From patchwork Thu Nov 15 04:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 207 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 7AD4E1680E; Thu, 15 Nov 2018 04:18:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,MIME_QP_LONG_LINE, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 1A1B91680B for ; Thu, 15 Nov 2018 04:18:22 +0000 (GMT) Received: from localhost ([::1]:36014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96j-00041J-CF for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 23:18:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96U-0003vj-1y for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96Q-000895-Ra for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN96Q-000891-OU for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN96Q-0006r9-JX for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Nov 2018 04:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33390@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154225548126326 (code B ref -1); Thu, 15 Nov 2018 04:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2018 04:18:01 +0000 Received: from localhost ([127.0.0.1]:52800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96K-0006qO-JD for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96I-0006pr-8b for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96B-000813-CC for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:55788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN96A-00080b-Eh for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN969-0003uf-7h for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN965-0007wZ-El for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:45 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:19913 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN963-0007uZ-En for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:41 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1542255453; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=AVZ8ouCBQwHadA5350gN/PrhTNw=; b=j7pfA+4tZwmFLkK5Kjqn6jhfDfBM/4iybNLkhwypJBlpNHoqlyO600huh86b0DqE qJO2GzjH0wfJGcSC12tpNqJoF9MDCpnRa+jd0TeVK04pi+3KU0+AuQ5IJ20geMK6 Y/tUx42lRWsWWlhKe0TLZ7uf24CEI5dseNZ0+AqnnNjzESgUwH68J0/EmlFIOlxG 47nnAkewfQQ/mVUoWEb9W8yyBHr0EtDPE5gAUQqgszbErRS5pTzlEXrqkw81QQoP jgG1H3lM+Om3Xt2kmhmRuBbuRCvGsZ0f0uj/o0P9ric5KzpbYjk2uqRPzr5EbY0Z lr1lLLZl9sx2JhLvvOjQfQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=X+wQEybe c=1 sm=1 tr=0 a=Bk8UOtVc4jldDOnqC3PU2w==:117 a=Bk8UOtVc4jldDOnqC3PU2w==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=JHtHm7312UAA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=TzMppCOWAAAA:8 a=Q1sTgoEvAAAA:8 a=zGsBNCykNUDjBY_J4_8A:9 a=QEXdDO2ut3YA:10 a=_Qgj-RFg6mImvLaOgLPg:22 a=ovI62r0dVwRwEkuYY2kh:22 a=FkGh3qDytyf094M0uOEt:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.109.182] ([97.116.109.182:50166] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id FA/19-31529-D53FCEB5; Wed, 14 Nov 2018 23:17:33 -0500 From: ericbavier@centurylink.net Date: Wed, 14 Nov 2018 22:17:12 -0600 Message-Id: <20181115041715.15993-2-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115041715.15993-1-ericbavier@centurylink.net> References: <20181115041715.15993-1-ericbavier@centurylink.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier This lets qmake find qtwebkit components, allowing packages like python-pyqt to find qtwebkit and enable support. * gnu/packages/qt.scm (qtwebkit)[arguments]: Add "ECM_MKSPECS_INSTALL_DIR" to #:configure-flags. Link with "--no-keep-memory". --- gnu/packages/qt.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d48769982..36f8aef69 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -2171,7 +2172,15 @@ different kinds of sliders, and much more.") #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" "-DPORT=Qt" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON"))) + "-DUSE_SYSTEM_MALLOC=ON" + ;; XXX: relative dir installs to build dir? + (string-append "-DECM_MKSPECS_INSTALL_DIR=" + %output "/lib/qt5/mkspecs/modules") + ;; Sacrifice a little speed in order to link + ;; libraries and test executables in a + ;; reasonable amount of memory. + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content") From patchwork Thu Nov 15 04:17:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 209 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 D5B111680E; Thu, 15 Nov 2018 04:19:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,MIME_QP_LONG_LINE, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 67E681680B for ; Thu, 15 Nov 2018 04:19:09 +0000 (GMT) Received: from localhost ([::1]:36021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN97U-0004J5-LG for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 23:19:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN97R-0004IS-UU for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN97O-00009k-M4 for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN97O-00009g-J5 for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN97O-0006tZ-Dh for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33392] [PATCH 2/4] gnu: Add libopenshot-audio. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Nov 2018 04:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154225548626427 (code B ref -1); Thu, 15 Nov 2018 04:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2018 04:18:06 +0000 Received: from localhost ([127.0.0.1]:52806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96Q-0006r0-0W for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96I-0006pt-8S for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96B-00081A-An for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:35818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN96A-00080X-BV for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN969-0003uh-7j for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN967-0007yp-Dy for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:45 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:19499 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN965-0007sN-JD for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:43 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1542255454; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=EHFlhcznQWWH0yQVmJyu3iuJ5SE=; b=UZxR3mfQ+uFkCTSuxoNHvbWhkpQzo7yh9kwSatvcQbE4E7C7VD7Al864ai/aHRkf VDMX16Lgtp2EeL96p9ooTvKztzOrB99jVJ0RQAlrXeJxdzeGP2RYSuj09Ys0EVcT UH1xO9rGRBE8j0MomiWmsyPgBMwqD2YtrlrqcKcxjwb30cGojzEmwvjh+PcKtfLr Trp1/MkAEywRXZA5Xj8eQlVSbErPyE+re1M9WntqERKAHGV9Zcj9k2utuJYk9Sfb hC0omvGEQ7Y7EUdkhvuMtYv0mLoLeAeVqCY+SML1qQQRc6paSnncgQkG+C3b65dI 57uRVGvQKBU7hUodcrMZEQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=X+wQEybe c=1 sm=1 tr=0 a=Bk8UOtVc4jldDOnqC3PU2w==:117 a=Bk8UOtVc4jldDOnqC3PU2w==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=JHtHm7312UAA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=aoDTYKXZAAAA:8 a=uChsZFC9AAAA:8 a=ZLGELXoPAAAA:8 a=7i8xPVWyAAAA:20 a=BGnDuQ0BAAAA:8 a=dvf_F9A5r6ZsxQ7JNawA:9 a=QEXdDO2ut3YA:10 a=_Qgj-RFg6mImvLaOgLPg:22 a=3TMSKNOjTrc1VE3cRZ_u:22 a=ULtXvzFHYWHLyBAuiDia:22 a=CFiPc5v16LZhaT-MVE1c:22 a=zpPWWtfdO8E6YsT3D8dl:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.109.182] ([97.116.109.182:50166] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id 9C/19-31529-E53FCEB5; Wed, 14 Nov 2018 23:17:34 -0500 From: ericbavier@centurylink.net Date: Wed, 14 Nov 2018 22:17:13 -0600 Message-Id: <20181115041715.15993-3-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115041715.15993-1-ericbavier@centurylink.net> References: <20181115041715.15993-1-ericbavier@centurylink.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier * gnu/packages/audio.scm (libopenshot-audio): New variable. --- gnu/packages/audio.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ee18b0022..16cb942a7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Brett Gilio ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -3515,3 +3516,38 @@ using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.") (synopsis "Pro-quality GM soundfont") (description "Fluid-3 is Frank Wen's pro-quality GM soundfont.") (license license:expat)))) + +(define-public libopenshot-audio + (package + (name "libopenshot-audio") + (version "0.1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/libopenshot-audio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys")))) + (build-system cmake-build-system) + (inputs + `(("alsa-lib" ,alsa-lib) + ;; The following are for JUCE GUI components: + ("libx11" ,libx11) + ("freetype" ,freetype) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor))) + (arguments + `(#:tests? #f ;there are no tests + #:configure-flags + (list (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs "freetype") + "/include/freetype2")))) + (home-page "https://openshot.org") + (synopsis "Audio editing and playback for OpenShot") + (description "OpenShot Audio Library (libopenshot-audio) allows +high-quality editing and playback of audio, and is based on the JUCE +library.") + (license license:lgpl3+))) From patchwork Thu Nov 15 04:17:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 208 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 4CA261680E; Thu, 15 Nov 2018 04:19:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,MIME_QP_LONG_LINE, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 9E1431680B for ; Thu, 15 Nov 2018 04:19:08 +0000 (GMT) Received: from localhost ([::1]:36020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN97T-0004Id-U6 for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 23:19:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN97R-0004IR-UL for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN97P-00009x-6l for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN97P-00009o-2w for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN97O-0006ti-Uq for guix-patches@gnu.org; Wed, 14 Nov 2018 23:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33392] [PATCH 3/4] gnu: Add libopenshot. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Nov 2018 04:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154225549126437 (code B ref -1); Thu, 15 Nov 2018 04:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2018 04:18:11 +0000 Received: from localhost ([127.0.0.1]:52814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96U-0006sD-Bg for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96I-0006pu-8Y for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96B-00081F-Aq for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:56807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN96A-00080j-Jp for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN969-0003ug-7i for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN967-0007yu-EP for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:45 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:19913 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN965-0007uZ-K6 for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:43 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1542255456; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=uvEr3xPoLuIalcbVmL4pOVxNxRc=; b=jVOyomVd9I6jDdY680vOgjkm71qMOpcZEZw4PzKppc1f740nZAS7SLgskMuA8YzA k6yuL174pQV3UfvvobC2uyYqXgG/Qk3ARmZRM1kK0zEU02dPGddHDeJIbZjzdlKI GqRCVoqv5MjR1k9sSWpoTvhLsgl8qWnD/sFfWEa/ZDVDhTaAO7O1+ZOwNZOgxA1q ow2JF5YIFw1fp11vqDJqZfgmO4Xap0Je+XBUvNuk6/ZnlyUIZd3wiEryEwL6vQjO TQ7A/lIUlPgJ8yN7EG+phFM7SO9OWKNZM4frFzvCS1bFDXam4OKng+mwYgEvCMt4 h0pFeoo+ez6D6NAUdfboUA==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=X+wQEybe c=1 sm=1 tr=0 a=Bk8UOtVc4jldDOnqC3PU2w==:117 a=Bk8UOtVc4jldDOnqC3PU2w==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=JHtHm7312UAA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=pGLkceISAAAA:8 a=zeAeT-1tAAAA:8 a=mDV3o1hIAAAA:8 a=Byx-y9mGAAAA:8 a=7i8xPVWyAAAA:20 a=BGnDuQ0BAAAA:8 a=oBZfcFXRSfKsuE1lzPwA:9 a=QEXdDO2ut3YA:10 a=_Qgj-RFg6mImvLaOgLPg:22 a=q4mi67SYSo5Z2N87e4-W:22 a=_FVE-zBwftR9WsbkzFJk:22 a=zpPWWtfdO8E6YsT3D8dl:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.109.182] ([97.116.109.182:50166] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id CD/19-31529-F53FCEB5; Wed, 14 Nov 2018 23:17:35 -0500 From: ericbavier@centurylink.net Date: Wed, 14 Nov 2018 22:17:14 -0600 Message-Id: <20181115041715.15993-4-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115041715.15993-1-ericbavier@centurylink.net> References: <20181115041715.15993-1-ericbavier@centurylink.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier * gnu/packages/video.scm (libopenshot): New variable. --- gnu/packages/video.scm | 65 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a482ef251..31684dd2f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016 Eric Bavier +;;; Copyright © 2016, 2017 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -112,6 +112,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -128,6 +129,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages ssh) + #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -3076,3 +3078,64 @@ as surfing, skiing, riding and walking while shooting videos are especially prone to erratic camera shakes. Vidstab targets these video contents to help create smoother and stable videos.") (license license:gpl2+))) + +(define-public libopenshot + (package + (name "libopenshot") + (version "0.2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/libopenshot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd")) + (modules '((guix build utils))) + (snippet '(begin + ;; Allow overriding of the python installation dir + (substitute* "src/bindings/python/CMakeLists.txt" + (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) + (string-append set " CACHE PATH " + "\"Python bindings directory\")"))) + #t)))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python) + ("swig" ,swig) + ("unittest++" ,unittest-cpp))) + (propagated-inputs ;all referenced in installed headers + `(("cppzmq" ,cppzmq) + ("ffmpeg" ,ffmpeg) + ("imagemagick" ,imagemagick) + ("jsoncpp" ,jsoncpp) + ("libopenshot-audio" ,libopenshot-audio) + ("qt" ,qt) ;widgets, core, gui, multimedia, and multimediawidgets + ("zeromq" ,zeromq))) + (arguments + `(#:tests? #f ;XXX: https://github.com/OpenShot/libopenshot/issues/175 + #:configure-flags + (list (string-append "-DPYTHON_MODULE_PATH:PATH=" %output "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages") + "-DUSE_SYSTEM_JSONCPP:BOOL=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-vars + (lambda* (#:key inputs #:allow-other-keys) + (setenv "LIBOPENSHOT_AUDIO_DIR" + (assoc-ref inputs "libopenshot-audio")) + (setenv "ZMQDIR" + (assoc-ref inputs "zeromq")) + (setenv "UNITTEST_DIR" + (string-append (assoc-ref inputs "unittest++") + "/include/UnitTest++")) + #t))))) + (home-page "https://openshot.org") + (synopsis "Video-editing, animation, and playback library") + (description "OpenShot Library (libopenshot) is a powerful C++ video +editing library with a multi-threaded and feature rich video editing +API. It includes bindings for Python, Ruby, and other languages.") + (license license:lgpl3+))) From patchwork Thu Nov 15 04:17:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 206 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 21FF21680E; Thu, 15 Nov 2018 04:18:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 890541680D for ; Thu, 15 Nov 2018 04:18:10 +0000 (GMT) Received: from localhost ([::1]:36013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96X-0003wG-9g for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 23:18:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96U-0003vi-1d for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96R-00089Q-N7 for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48550) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN96R-00089H-JD for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN96R-0006rO-Dc for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33391] [PATCH 4/4] gnu: Add OpenShot. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Nov 2018 04:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33391@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154225548126343 (code B ref -1); Thu, 15 Nov 2018 04:18:03 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2018 04:18:01 +0000 Received: from localhost ([127.0.0.1]:52802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96P-0006qZ-8H for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96I-0006pv-8U for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96B-00081O-Br for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:52287) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN96A-00080d-Hm for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN969-0003ud-7d for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN967-0007z9-O8 for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:45 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:19499 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN967-0007sN-Ij for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:43 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1542255457; h=From:Subject:Date:To:MIME-Version; bh=o0nwt4nrPeUQbmeLa3+Zl3CUTgU=; b=WCKD8xi+Hg7IvxcTFZpn/f3ZKpFvxLEF+t3ktHE+cZ/fNtkUrEM8cUL6gKa01FUV /d0v52ZRigr8yXkQ117utiPdLAIO8u51yQAOOgKDLDH8vY6zfFUKAaZHE+8WbEjQ wHOIfb05/SM3pN9vMO/TqioE3nRwTH2lP0Syi77zXudpyi2kLm/Zqt1I+X8VfSiL aXdTZZVsRcKeA2EQlbr5toHw/JQWEiavwDp2J7rq53Sg9/C0mjmaOn+WGMVWJGie auMX9v9ZFKMcHheutwOoBx2lRPcgxyK2LH2h7pZILFXCDsYtUzErXP17TLzUrPrb rbbHrKNgUUmF8UmUwrm8Dw==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=X+wQEybe c=1 sm=1 tr=0 a=Bk8UOtVc4jldDOnqC3PU2w==:117 a=Bk8UOtVc4jldDOnqC3PU2w==:17 a=KGjhK52YXX0A:10 a=JHtHm7312UAA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=7i8xPVWyAAAA:20 a=BGnDuQ0BAAAA:8 a=KH1jNnbNS5by7G7HCY8A:9 a=_Qgj-RFg6mImvLaOgLPg:22 a=zpPWWtfdO8E6YsT3D8dl:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.109.182] ([97.116.109.182:50166] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id BF/19-31529-163FCEB5; Wed, 14 Nov 2018 23:17:37 -0500 From: ericbavier@centurylink.net Date: Wed, 14 Nov 2018 22:17:15 -0600 Message-Id: <20181115041715.15993-5-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115041715.15993-1-ericbavier@centurylink.net> References: <20181115041715.15993-1-ericbavier@centurylink.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier * gnu/packages/video.scm (openshot-qt): New variable. --- gnu/packages/video.scm | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 31684dd2f..b634394d0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3139,3 +3139,49 @@ create smoother and stable videos.") editing library with a multi-threaded and feature rich video editing API. It includes bindings for Python, Ruby, and other languages.") (license license:lgpl3+))) + +(define-public openshot + (package + (name "openshot") + (version "2.4.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/openshot-qt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2")))) + (build-system python-build-system) + (inputs + `(("ffmpeg" ,ffmpeg) + ("libopenshot" ,libopenshot) + ("python" ,python) + ("python-pyqt" ,python-pyqt) + ("python-pyzmq" ,python-pyzmq) + ("python-requests" ,python-requests) + ("qtsvg" ,qtsvg))) + (arguments + `(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (delete 'build) ;install phase does all the work + (add-before 'install 'set-tmp-home + (lambda _ + ;; src/classes/info.py "needs" to create several + ;; directories in $HOME when loaded during build + (setenv "HOME" "/tmp") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/openshot-qt") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins/"))))))))) + (home-page "https://openshot.org") + (synopsis "Video editor") + (description "OpenShot takes your videos, photos, and music files and +helps you create the film you have always dreamed of. Easily add sub-titles, +transitions, and effects and then export your film to many common formats.") + (license license:gpl3+)))