[bug#33392] [PATCH 0/4] Add OpenShot

[bug#33392] [PATCH 0/4] Add OpenShot

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

Hello Guix,

The following patches add a package for the video-editory "OpenShot".

The first patch fixes an issue in our qtwebkit package which makes `qmake`
unable to find the "webkit" component.  This caused, at least, our
python-pyqt package to not build its webkit bindings.  Once this is fixed
our qutebrowser package works once again :).

Eric Bavier (4):
  qtwebkit: Fix pri install directory.
  gnu: Add libopenshot-audio.
  gnu: Add libopenshot.
  gnu: Add OpenShot.

 gnu/packages/audio.scm |  36 +++++++++++++
 gnu/packages/qt.scm    |  11 +++-
 gnu/packages/video.scm | 111 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 156 insertions(+), 2 deletions(-)

-- 
2.19.1

[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

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 <me@tobias.gr>
 ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; 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")
--
2.19.1

[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2216 bytes --]


ericbavier@centurylink.net writes:

> From: Eric Bavier <bavier@member.fsf.org>
>
> 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 <me@tobias.gr>
>  ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
>  ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
> +;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
>  ;;;
>  ;;; 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")

I've tested this, and this fixed the qtwebkit build for me, which
currently doesn't work on master. So I'm all for merging it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 2599 bytes --]

Hi Christopher,

On Mon, 19 Nov 2018 22:22:58 +0000
Christopher Baines <mail@cbaines.net> wrote:

> ericbavier@centurylink.net writes:
> 
> > From: Eric Bavier <bavier@member.fsf.org>
> >
> > 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 <me@tobias.gr>
> >  ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
> >  ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
> > +;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
> >  ;;;
> >  ;;; 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")  
> 
> I've tested this, and this fixed the qtwebkit build for me, which
> currently doesn't work on master. So I'm all for merging it.

Thanks for testing it.  I assume it was the linker flags that fixed the
build on your machine?  For clarity, I suppose that change should be
moved to a separate patch.  WDYT?

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2636 bytes --]


Eric Bavier <ericbavier@centurylink.net> writes:

>> > From: Eric Bavier <bavier@member.fsf.org>
>> >
>> > 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 <me@tobias.gr>
>> >  ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
>> >  ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
>> > +;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
>> >  ;;;
>> >  ;;; 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")
>>
>> I've tested this, and this fixed the qtwebkit build for me, which
>> currently doesn't work on master. So I'm all for merging it.
>
> Thanks for testing it.  I assume it was the linker flags that fixed the
> build on your machine?  For clarity, I suppose that change should be
> moved to a separate patch.  WDYT?

I don't mind eitherway, I'm just happy that the package builds again
with the patch :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

bug#33390: [PATCH 1/4] qtwebkit: Fix pri install directory.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 2936 bytes --]

On Mon, 19 Nov 2018 22:22:44 -0600
Eric Bavier <ericbavier@centurylink.net> wrote:

> Hi Christopher,
> 
> On Mon, 19 Nov 2018 22:22:58 +0000
> Christopher Baines <mail@cbaines.net> wrote:
> 
> > ericbavier@centurylink.net writes:
> >   
> > > From: Eric Bavier <bavier@member.fsf.org>
> > >
> > > 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 <me@tobias.gr>
> > >  ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
> > >  ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
> > > +;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
> > >  ;;;
> > >  ;;; 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")    
> > 
> > I've tested this, and this fixed the qtwebkit build for me, which
> > currently doesn't work on master. So I'm all for merging it.  
> 
> Thanks for testing it.  I assume it was the linker flags that fixed the
> build on your machine?  For clarity, I suppose that change should be
> moved to a separate patch.  WDYT?

I've split this patch in two and pushed as

0995a5692cb85418b2d5f21c24d46ee4aa9fb7c9 and
ebdb15bc3540b1901f223bc0689bae51a2f88fc4

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#33392] [PATCH 2/4] gnu: Add libopenshot-audio.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* 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 <clement@lassieur.org>
 ;;; Copyright © 2018 Brett Gilio <brettg@posteo.net>
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; 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+)))
--
2.19.1

bug#33392: [PATCH 2/4] gnu: Add libopenshot-audio.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

On Wed, 14 Nov 2018 22:17:13 -0600
ericbavier@centurylink.net wrote:

> From: Eric Bavier <bavier@member.fsf.org>
> 
> * gnu/packages/audio.scm (libopenshot-audio): New variable.
> ---
>  gnu/packages/audio.scm | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)

Pushed in ef8517f29d7412f78e6481b3df56fd81041e3e3a

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#33392] [PATCH 3/4] gnu: Add libopenshot.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* 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 <cameltheman@gmail.com>
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
-;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016, 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -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+)))
--
2.19.1

[bug#33392] [PATCH 3/4] gnu: Add libopenshot.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

On Wed, 14 Nov 2018 22:17:14 -0600
ericbavier@centurylink.net wrote:

> From: Eric Bavier <bavier@member.fsf.org>
> 
> * gnu/packages/video.scm (libopenshot): New variable.
> ---
>  gnu/packages/video.scm | 65 +++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 64 insertions(+), 1 deletion(-)

I've pushed a slightly modified version of this patch in
579a9cdec7673d9007ef924bb345f42527aa0a72.  I was able to enable tests
with a small patch from an upstream pull request.

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#33391] [PATCH 4/4] gnu: Add OpenShot.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* 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+)))
-- 
2.19.1

bug#33391: [PATCH 4/4] gnu: Add OpenShot.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

On Wed, 14 Nov 2018 22:17:15 -0600
ericbavier@centurylink.net wrote:

> From: Eric Bavier <bavier@member.fsf.org>
> 
> * gnu/packages/video.scm (openshot-qt): New variable.
> ---
>  gnu/packages/video.scm | 46 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 46 insertions(+)

Pushed in 69a3fcc086f0582d82f3b2d19ad94e12c67070fa

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#33392] closing: [PATCH 0/4] Add OpenShot

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 32 bytes --]

All patches applied.

`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]