[PATCH 0/4] Add OpenShot

  • Done
  • quality assurance status badge
Details
One participant
  • ericbavier
Owner
unassigned
Submitted by
ericbavier
Severity
normal

Debbugs page

ericbavier wrote 6 years ago
(address . guix-patches@gnu.org)(name . Eric Bavier)(address . bavier@member.fsf.org)
20181115041715.15993-1-ericbavier@centurylink.net
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
ericbavier wrote 6 years ago
[PATCH 2/4] gnu: Add libopenshot-audio.
(address . guix-patches@gnu.org)(name . Eric Bavier)(address . bavier@member.fsf.org)
20181115041715.15993-3-ericbavier@centurylink.net
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(+)

Toggle diff (53 lines)
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
ericbavier wrote 6 years ago
[PATCH 3/4] gnu: Add libopenshot.
(address . guix-patches@gnu.org)(name . Eric Bavier)(address . bavier@member.fsf.org)
20181115041715.15993-4-ericbavier@centurylink.net
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(-)

Toggle diff (96 lines)
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
Eric Bavier wrote 6 years ago
Re: [bug#33392] [PATCH 2/4] gnu: Add libopenshot-audio.
(address . 33392-done@debbugs.gnu.org)
20181126200526.5c2a1037@centurylink.net
On Wed, 14 Nov 2018 22:17:13 -0600
ericbavier@centurylink.net wrote:

Toggle quote (7 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlv8pmYACgkQ/XPKxxnT
JWaVfhAAgU0Lo46VqUlIyRqK2J2F0tmdU+u50DX4DwdmZV5zqZbUSETQMmIIrFKP
ivPMwCTRh6ZpZSnoVISTFkIlr8cPubXqgxME2Nnf6Nk8V6RkYX/At4DMocMg0yaM
fhuKl0AIYM9b+NxUtlGDH0d9rBY8NhleurdTCQYHiYsjabZgNEQSEo+y+ds2EEA8
cJ6xx2HpT3/mJrU2Do5lxaGKlPim3sMoAQ3b0DwUHTvz0fwyB/kaGOS2Ic5hBa/g
d6uO0O2i3hic8XLxDxL9bsJy7EPB2tzr6sjdDGHLdi7Gm5ZrnqyN92A1xCubLjah
HW/eWF52InYPQryn3zmT8R5yndPufE0QpjWW4U7cJaA0hMbfAIcyZ0QuCVTwvsup
fSIEfZ4dhVS1yG1Xvfdg8j+MGC4q9rHazgK5DrBVvyGmJVlgKrf7O7sccpCW7TOY
dybRnYPe3KNbxO/0hYExEFNotK6mieg+Iz/Hp/piaPOvz3AcpAwHZ5AgCsJAYPA4
/e7jXFP2kk8iyb9xYYInNgEOYSMsqoEZyhmdWBnsxlYSJO9TP5JStRYhMMpU7yEO
JMKfcg5/6oWCzPvTdzFY/0d//2ppKfS3wdXXVPgUBhlaEa/IYK2ehBJainBqEAhD
EYRH/z5vQh9+ZaZq3jcy9rf+l4WJK5n3iC/xXib+BLOAvw3VX9g=
=fxon
-----END PGP SIGNATURE-----


Closed
Eric Bavier wrote 6 years ago
Re: [bug#33392] [PATCH 3/4] gnu: Add libopenshot.
(address . 33392-done@debbugs.gnu.org)
20181126200700.560c976a@centurylink.net
On Wed, 14 Nov 2018 22:17:14 -0600
ericbavier@centurylink.net wrote:

Toggle quote (7 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlv8psQACgkQ/XPKxxnT
JWaPKQ//WuwVXwtVKJSXaBpKsahLvq60cuijdCuHhxtQmudFxpuX3B/8fWXs6Dk4
eZq/CW3vqt3Sa/+/XovrQJ44HrZXWrZDAzrJ2xp1YTNTR+1+edUTryENezN2NOl8
Vl14Yplg67iRpp53nYZ4E++grzlWF+9/K9G5jLF3pqXVA6BZ8BHlrh9YLLXwGLI5
ckDwZx56eaG4DuQJQomXKfDAfyc3zXwIR8jBLqVyPVf3psupaBJ40XgdHJzDS2dI
ZZXcg4E9ExPSZR9dOM+KvCGQ1yWgvabC8e9sABqQra8rFNBTaCzBCUdZLlJEHj7x
SN+kIiIUzp0TJSAN9FjTZUhC4AMsCUP4iojt+zqOfguK+LnJS600aEBKXyfU9eHK
RAqZYDiVP6DoVCipAcjsF/GnlyWU4s24e1PgjZrD/uamqHFFUuH7ALIIcm3HPgus
cml7Bsk1QQUEuJFZCmZNs5BVnfdjiiGk4GUlBLjG1YpH8+iiZGegWSEYZO0Zxss6
jL/UwQ3zFXLJ6fzd/3ry2Dovr0RvRhT4vF1XOXYG87OGJXOPmgtKELmGivzqdAW2
uhwKROrufG0av6A+CwTUvRDYbM2ZV/Xb9M+enLhtAuErvhau4Y6qIx8LGt+tvCpB
ygrJ5oLH8IAeYVhHyT7FQWMv7DkGBpDNeqkzgqtoWR3gufl702o=
=5JtT
-----END PGP SIGNATURE-----


Closed
Eric Bavier wrote 6 years ago
closing: [PATCH 0/4] Add OpenShot
(address . 33392-close@debbugs.gnu.org)
20181126200907.766aff01@centurylink.net
All patches applied.

`~Eric
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlv8p0MACgkQ/XPKxxnT
JWacEQ/+KoRM/p710rmFsWyWopGuTGLACB0VMUx95kQieVLEqnL5Fv7Kv5REiQ1u
4/HmtGHRVjyn0Ti/1wz9EMkNrQG9H6eU5b5bJaRFtWRshjDeLxZVinaX5PQ7+Jv9
YYCb5BeExELKVM5hTPh3c+2AxnKepAyVXVc+Vw3b5JO6mGIS1RHXO8BOlLbxT5YR
Ah/xQJFEUqh2pi9/Bf6GceRA2ixjWwzT07J408BNPH3i8mXq7yS7Z4xtqFrkStKb
s0u56RTsuae6XLl1PMukDzpCvtkP8/IJh9z1x26k+JneIcw6ZsurvaCjstBmIhtK
WDnVA8Hok69uh1az61x+ctyuYmUZ/onAyt41IAkZvMV0rSduUv81wTzh67syGNEF
HYsmaOUqach3eVBUCCF+xdILf6AiwKbC5/5NrJOsX5O7o83sWl9zEOBWcLSdgtjm
TGHpMSYCIKI+QbftssmRewsAZdspXXDHCROw0gdW0pvnd3itZtNl6pnniX1uWkOy
EqQBPMdrBwdskDfOXIjfPChTmt6e91jF6HJetk97zb7YD71QBJI8I0Uuwu6SSEqn
dpJiduShTskLuaBD+aR8UII96RwedBpTf3jPrbZs0vO7M2MGF+0az5UzYLNCLSTU
1AA6JE7SViQtG6/1WSnGAGPC/LuUubQxoy2Z8Jz/RLpIvdGZ7A0=
=gStO
-----END PGP SIGNATURE-----


?
Your comment

This issue is archived.

To comment on this conversation send an email to 33392@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 33392
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help