[PATCH 1/4] gnu: mlt: Update license.

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • Vinicius Monego
Owner
unassigned
Submitted by
Vinicius Monego
Severity
normal
V
V
Vinicius Monego wrote on 25 Apr 2021 20:15
(address . guix-patches@gnu.org)(name . Vinicius Monego)(address . monego@posteo.net)
20210425181501.167561-1-monego@posteo.net
* gnu/packages/video.scm (mlt)[license]: Change from gpl3 to lgpl2.1+.
---
This is the license in the COPYING file for the past 5 years.

gnu/packages/video.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 571dbb70c6..fc16ea75fd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -42,7 +42,7 @@
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
@@ -3011,7 +3011,7 @@ broadcasting. It provides a toolkit for broadcasters, video editors, media
players, transcoders, web streamers and many more types of applications. The
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:gpl3)))
+ (license license:lgpl2.1+)))
(define-public v4l-utils
(package
--
2.31.1
V
V
Vinicius Monego wrote on 25 Apr 2021 20:17
[PATCH 2/4] gnu: mlt: Update to 6.26.1.
(address . 48020@debbugs.gnu.org)(name . Vinicius Monego)(address . monego@posteo.net)
20210425181724.167792-1-monego@posteo.net
* gnu/packages/video.scm (mlt): Update to 6.26.1.
---
gnu/packages/video.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index fc16ea75fd..c86c681cdd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2954,7 +2954,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
(define-public mlt
(package
(name "mlt")
- (version "6.22.1")
+ (version "6.26.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2963,7 +2963,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
(file-name (git-file-name name version))
(sha256
(base32
- "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"))))
+ "1gz79xvs5jrzqhwhfk0dqdd3xiavnjp4q957h7nb02rij32byb39"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
--
2.31.1
V
V
Vinicius Monego wrote on 25 Apr 2021 20:17
[PATCH 3/4] gnu: mlt: Add optional dependencies.
(address . 48020@debbugs.gnu.org)(name . Vinicius Monego)(address . monego@posteo.net)
20210425181724.167792-2-monego@posteo.net
* gnu/packages/video.scm (mlt)[inputs]: Add alsa-plugins:pulseaudio,
libebur128, rtaudio, sdl2, sdl2-image, sox, vidstab. Remove sdl.
---
alsa-plugins is required for Shotcut.

gnu/packages/video.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c86c681cdd..e0d5e30a13 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2984,6 +2984,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
+ ("alsa-plugins" ,alsa-plugins "pulseaudio")
("ffmpeg" ,ffmpeg)
("fftw" ,fftw)
("frei0r-plugins" ,frei0r-plugins)
@@ -2992,6 +2993,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
("libxml2" ,libxml2)
("jack" ,jack-1)
("ladspa" ,ladspa)
+ ("libebur128" ,libebur128)
("libexif" ,libexif)
("libvorbis" ,libvorbis)
("rubberband" ,rubberband)
@@ -2999,8 +3001,11 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
- ("sdl" ,sdl)
- ("sox" ,sox)))
+ ("rtaudio" ,rtaudio)
+ ("sdl2" ,sdl2)
+ ("sdl2-image" ,sdl2-image)
+ ("sox" ,sox)
+ ("vidstab" ,vidstab)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.mltframework.org/")
--
2.31.1
V
V
Vinicius Monego wrote on 25 Apr 2021 20:17
[PATCH 4/4] gnu: Add shotcut.
(address . 48020@debbugs.gnu.org)(name . Vinicius Monego)(address . monego@posteo.net)
20210425181724.167792-3-monego@posteo.net
* gnu/packages/video.scm (shotcut): New variable.
---
gnu/packages/video.scm | 77 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)

Toggle diff (97 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e0d5e30a13..d702fc27bd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -85,6 +85,7 @@
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix build-system waf)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
@@ -4572,6 +4573,82 @@ 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+)))
+(define-public shotcut
+ (package
+ (name "shotcut")
+ (version "21.03.21")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mltframework/shotcut")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jb488vynn0vmq22z51bg4hb4617732nva9rg52lzl89v5n8gmsi"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f ;there are no tests
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (invoke "qmake"
+ (string-append "PREFIX=" out)
+ "QMAKE_LRELEASE=lrelease"
+ "QMAKE_LUPDATE=lupdate"
+ "shotcut.pro"))))
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (frei0r (assoc-ref inputs "frei0r-plugins"))
+ (ffmpeg (assoc-ref inputs "ffmpeg"))
+ (jack (assoc-ref inputs "jack"))
+ (sdl2 (assoc-ref inputs "sdl2")))
+ (wrap-program (string-append out "/bin/shotcut")
+ `("PATH" ":" prefix
+ ,(list (string-append ffmpeg "/bin")))
+ `("LD_LIBRARY_PATH" ":" prefix
+ ,(list (string-append jack "/lib" ":" sdl2 "/lib")))
+ `("FREI0R_PATH" ":" =
+ (,(string-append frei0r "/lib/frei0r-1/")))
+ `("MLT_PREFIX" ":" =
+ (,(assoc-ref inputs "mlt")))))
+ #t)))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qmake" ,qttools)))
+ (inputs
+ `(("ffmpeg" ,ffmpeg)
+ ("frei0r-plugins" ,frei0r-plugins)
+ ("jack" ,jack-1)
+ ("ladspa" ,ladspa)
+ ("lame" ,lame)
+ ("libvpx" ,libvpx)
+ ("libx264" ,libx264)
+ ("mlt" ,mlt)
+ ("pulseaudio" ,pulseaudio)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtmultimedia" ,qtmultimedia)
+ ("qtquickcontrols" ,qtquickcontrols)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("qtsvg" ,qtsvg)
+ ("qtwebkit" ,qtwebkit)
+ ("qtwebsockets" ,qtwebsockets)
+ ("qtx11extras" ,qtx11extras)
+ ("sdl2" ,sdl2)))
+ (home-page "https://www.shotcut.org/")
+ (synopsis "Video editor built on the MLT framework")
+ (description
+ "Shotcut is a video editor built on the MLT framework. Features include
+a wide range of formats through @code{ffmpeg}, 4k resolution support, webcam
+and audio capture, network stream playback, and many more.")
+ (license license:gpl3+)))
+
(define-public dav1d
(package
(name "dav1d")
--
2.31.1
E
E
Efraim Flashner wrote on 21 Jun 2021 16:20
Re: [bug#48020] [PATCH 1/4] gnu: mlt: Update license.
(name . Vinicius Monego)(address . monego@posteo.net)(address . 48020-done@debbugs.gnu.org)
YNCgRmTRxRyEuIMY@3900XT
Looks like this patch fell through the cracks. Patches pushed!

--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmDQoEYACgkQQarn3Mo9
g1EpLg/+MGfmlvCS6I4eC/JSDdtO2E6BJpagifsWrz9+v9CppmT9bXFNBj9x6fXM
klv/Ksd5gblCEpquiQzT3vrfSfROkbltCQM8/Psf1745drYfwmlX1mJ6YO/3J/PQ
nsbIlN0ZUhrVaAEzSID6tOTqhm+7hUGAnuO2/q0S7vhFfMSQq5RwjjAJj9oh9kcR
yaUVqMwG9gW2RB0L4DiSy6osuxkX/U5jz/WzBBDiegFg/wsEgP5XLyBnZXzI0SBh
/+Dixg2qJMpozlkLMpqOuvs71gkoFrWDDpcTeHOf5LJrUszsNXWf7JQC/MIepM1U
o3uadQMxWvnXkv9QRpw8eEZEcAMJ+s0xVi3NnXQcXAYLpjLmYWXJv1wInZv+VvMQ
+0XkeC/VGCusCL63Msw35BBkmSZhy0c8eRp+elQPTCgkR77ntcE+VSX1Ky8lwEiO
s42IF0D6ntGiOXPOnyDBJuSEXrc+cycdW1hNg5TbL8MP2XWDXEIDNTgjV7SBUeps
GIL8SPqETeP+w4Bl1iOi+mFJHXrFpbgGyCT6G6ncqtvVh9ubM0avjEYzwVmqTPdc
fvRoxiujimVHgp/7IM7alk+ytgEsLhyKCfmQHpWrtSkvQZcDJyKmZYyo6DPFc3vx
Zm8inyS9Nr28wS2vSwPysrcWEpTn+9m77tQXq+dwFZJnOALmAmY=
=VSzc
-----END PGP SIGNATURE-----


Closed
?