gnu: kdenlive: Update to 20.04.1.

* gnu/packages/kde.scm (kdenlive): Update to 20.04.1.
[propagated-inputs]: Move mlt to ...
[inputs]: ... here and add rttr, qtmultimedia, qtquickcontrols2.
[arguments]: Add MLT_PREFIX to wrap-program.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Michael Rohleder 2020-08-08 20:12:33 +02:00 committed by Mathieu Othacehe
parent 0b8c7e4bb5
commit a2954e2a44
No known key found for this signature in database
GPG key ID: 8354763531769CA6

View file

@ -9,6 +9,7 @@
;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,6 +41,7 @@
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages cpp)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
@ -132,7 +134,7 @@ This package contains GUI widgets for baloo.")
(list license:lgpl2.1+ license:fdl1.2+)))) (list license:lgpl2.1+ license:fdl1.2+))))
(define-public kdenlive (define-public kdenlive
(let ((version "18.08.1")) (let ((version "20.04.1"))
(package (package
(name "kdenlive") (name "kdenlive")
(version version) (version version)
@ -140,24 +142,25 @@ This package contains GUI widgets for baloo.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "git://anongit.kde.org/kdenlive.git") (url "https://anongit.kde.org/kdenlive.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0ifnaclsz7w08mc485i3j1kkcpd1m8q5qamckrfwc375ac13xf4g")))) "0n0x34xmcn0k87rqnz0mk462b3al4gq56kn4m00rr428hafscdz7"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools))) ("qttools" ,qttools)))
(propagated-inputs
`(("mlt" ,mlt)))
(inputs (inputs
`(("shared-mime-info" ,shared-mime-info) `(("shared-mime-info" ,shared-mime-info)
("frei0r-plugins" ,frei0r-plugins) ("frei0r-plugins" ,frei0r-plugins)
("rttr" ,rttr)
("mlt" ,mlt)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtscript" ,qtscript) ("qtscript" ,qtscript)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtmultimedia" ,qtmultimedia)
("kparts" ,kparts) ("kparts" ,kparts)
("knotifications" ,knotifications) ("knotifications" ,knotifications)
("karchive" ,karchive) ("karchive" ,karchive)
@ -171,16 +174,19 @@ This package contains GUI widgets for baloo.")
("kdeclarative" ,kdeclarative) ("kdeclarative" ,kdeclarative)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative" ,qtdeclarative)
("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2)
("kiconthemes" ,kiconthemes) ("kiconthemes" ,kiconthemes)
("qtgraphicaleffects" ,qtgraphicaleffects) ("qtgraphicaleffects" ,qtgraphicaleffects)
("kplotting" ,kplotting))) ("kplotting" ,kplotting)))
(arguments (arguments
`(#:phases `(#:tests? #f ;TODO needs X
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(qtquickcontrols (assoc-ref inputs "qtquickcontrols")) (qtquickcontrols (assoc-ref inputs "qtquickcontrols"))
(qtquickcontrols2 (assoc-ref inputs "qtquickcontrols2"))
(qtbase (assoc-ref inputs "qtbase")) (qtbase (assoc-ref inputs "qtbase"))
(qtdeclarative (assoc-ref inputs "qtdeclarative")) (qtdeclarative (assoc-ref inputs "qtdeclarative"))
(frei0r (assoc-ref inputs "frei0r-plugins")) (frei0r (assoc-ref inputs "frei0r-plugins"))
@ -197,7 +203,10 @@ This package contains GUI widgets for baloo.")
(,(string-append qtbase "/lib/qt5/plugins/platforms"))) (,(string-append qtbase "/lib/qt5/plugins/platforms")))
`("QML2_IMPORT_PATH" ":" prefix `("QML2_IMPORT_PATH" ":" prefix
(,(string-append qtquickcontrols qml) (,(string-append qtquickcontrols qml)
,(string-append qtdeclarative qml))))) ,(string-append qtquickcontrols2 qml)
,(string-append qtdeclarative qml)))
`("MLT_PREFIX" ":" =
(,(assoc-ref inputs "mlt")))))
#t))))) #t)))))
(home-page "https://kdenlive.org") (home-page "https://kdenlive.org")
(synopsis "Non-linear video editor") (synopsis "Non-linear video editor")