From 5e6abeee989db65fb235e76b64b2f3f0e3bb7d74 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 25 Apr 2021 18:15:01 +0000 Subject: gnu: mlt: Update license. * gnu/packages/video.scm (mlt)[license]: Change from gpl3 to lgpl2.1+. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6e6f84ec68..55d1967444 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Alex McGrath ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Ivan Kozlov @@ -3041,7 +3041,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 -- cgit 1.4.1 From 6b183cd47d620428f0286faa6fdeffcdd89e9a77 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 25 Apr 2021 18:17:22 +0000 Subject: gnu: mlt: Update to 6.26.1. * gnu/packages/video.scm (mlt): Update to 6.26.1. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 55d1967444..04c79dffb5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2984,7 +2984,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 @@ -2993,7 +2993,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 -- cgit 1.4.1 From 49e8fa4a3d0e170788338dea9a5d2e2fd33adec1 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 25 Apr 2021 18:17:23 +0000 Subject: gnu: mlt: Add optional dependencies. * gnu/packages/video.scm (mlt)[inputs]: Add alsa-plugins:pulseaudio, libebur128, rtaudio, sdl2, sdl2-image, sox, vidstab. Remove sdl. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 04c79dffb5..987d75f0b7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3014,6 +3014,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) @@ -3022,6 +3023,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) @@ -3029,8 +3031,11 @@ from sites like Twitch.tv and pipes them into a video player of choice.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("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/") -- cgit 1.4.1 From 0b1cf40dce8e2f2d8651a2a2dc00cfb7026c8014 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 25 Apr 2021 18:17:24 +0000 Subject: gnu: Add shotcut. * gnu/packages/video.scm (shotcut): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 987d75f0b7..444eee849e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -86,6 +86,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) @@ -4607,6 +4608,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) + ("qttools" ,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-5) + ("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") -- cgit 1.4.1 From 5506b841d18fa415321c22b7e2b7eec9f6ce50d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 21 Jun 2021 17:08:14 +0300 Subject: gnu: mlt: Don't hardcode gcc value. * gnu/packages/video.scm (mlt)[arguments]: Adjust make-flags to use cc-for-target, cxx-for-target. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 444eee849e..fbc468eab7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2998,7 +2998,8 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc" "CXX=g++") + #:make-flags '(,(string-append "CC=" (cc-for-target)) + ,(string-append "CXX=" (cxx-for-target))) #:configure-flags (list "--enable-gpl3" "--enable-gpl") -- cgit 1.4.1