gnu: pitivi: Update to 2022.06.0.
* gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/video.scm (pitivi): Update to 2022.06.0.
[version]: Do not prefix with previous semver version.
[inputs]{gst-plugins/selection}: Add comment about cvtracker.
{python-librosa}: New input.
This commit is contained in:
Maxim Cournoyer
parent
47f0b3ad14
commit
fa4a9016be
|
|
@ -1591,7 +1591,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/password-store-tree-compat.patch \
|
||||
%D%/packages/patches/pciutils-hurd-configure.patch \
|
||||
%D%/packages/patches/pciutils-hurd-fix.patch \
|
||||
%D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \
|
||||
%D%/packages/patches/pjproject-install-libpjsua2.patch \
|
||||
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
From b54da52289f9578d7021f466d731cfd48330e5fe Mon Sep 17 00:00:00 2001
|
||||
From: Leo Famulari <leo@famulari.name>
|
||||
Date: Thu, 25 Nov 2021 18:56:44 -0500
|
||||
Subject: [PATCH] Fix build with Meson 0.60.
|
||||
|
||||
https://gitlab.gnome.org/GNOME/pitivi/-/issues/2593
|
||||
|
||||
* data/meson.build: Adjust to changes in Meson 0.60.
|
||||
---
|
||||
data/meson.build | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 2ea82cf..60d2316 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir)
|
||||
install_subdir('videopresets', install_dir: pkgdatadir)
|
||||
install_subdir('gstpresets', install_dir: pkgdatadir)
|
||||
|
||||
-desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
|
||||
+desktop_file = i18n.merge_file(
|
||||
type: 'desktop',
|
||||
output : 'org.pitivi.Pitivi.desktop',
|
||||
input : 'org.pitivi.Pitivi.desktop.in',
|
||||
@@ -25,7 +25,7 @@ if desktop_file_validate.found()
|
||||
)
|
||||
endif
|
||||
|
||||
-appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
|
||||
+appdata_file = i18n.merge_file(
|
||||
type: 'xml',
|
||||
output : 'org.pitivi.Pitivi.appdata.xml',
|
||||
input : 'org.pitivi.Pitivi.appdata.xml.in',
|
||||
@@ -43,7 +43,7 @@ if appstream_util.found()
|
||||
)
|
||||
endif
|
||||
|
||||
-i18n.merge_file('org.pitivi.Pitivi-mime.xml',
|
||||
+i18n.merge_file(
|
||||
output : 'org.pitivi.Pitivi-mime.xml',
|
||||
input : 'org.pitivi.Pitivi-mime.xml.in',
|
||||
po_dir: podir,
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
@ -4323,74 +4323,73 @@ (define-public aegisub
|
|||
; src/MatroskaParser.(c|h) is under bsd-3 with permission from the author
|
||||
|
||||
(define-public pitivi
|
||||
;; Pitivi switched to a non-semantic versioning scheme close before 1.0
|
||||
(let ((latest-semver "0.999.0")
|
||||
(%version "2021.05.0"))
|
||||
(package
|
||||
(name "pitivi")
|
||||
(version (string-append latest-semver "-" %version))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.gnome.org/GNOME/pitivi.git")
|
||||
(commit %version)))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "pitivi-fix-build-with-meson-0.60.patch"))
|
||||
(sha256
|
||||
(base32 "08x2fs2bak1fbmkvjijgx1dsawispv91bpv5j5gkqbv5dfgf7wah"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
itstool
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
glib
|
||||
gst-editing-services
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
(gst-plugins/selection gst-plugins-bad #:plugins
|
||||
'("debugutils" "transcode")
|
||||
#:configure-flags
|
||||
'("-Dintrospection=enabled"))
|
||||
gst-libav
|
||||
gsound
|
||||
gtk+
|
||||
libpeas
|
||||
libnotify
|
||||
pango
|
||||
python
|
||||
python-gst
|
||||
python-numpy
|
||||
python-matplotlib
|
||||
python-pycairo
|
||||
python-pygobject))
|
||||
;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
|
||||
;; otherwise pitivi fails to launch.
|
||||
(propagated-inputs (list librsvg))
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'glib-or-gtk-wrap 'wrap-other-dependencies
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(wrap-program (search-input-file outputs "bin/pitivi")
|
||||
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
|
||||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
|
||||
;; We've only added inputs for what Pitivi deems either
|
||||
;; necessary or optional. Let the user's packages take
|
||||
;; precedence in case they have e.g. the full gst-plugins-bad.
|
||||
`("GST_PLUGIN_SYSTEM_PATH" suffix
|
||||
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
|
||||
(home-page "http://www.pitivi.org")
|
||||
(synopsis "Video editor based on GStreamer Editing Services")
|
||||
(description "Pitivi is a video editor built upon the GStreamer Editing
|
||||
(package
|
||||
(name "pitivi")
|
||||
(version "2022.06.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.gnome.org/GNOME/pitivi.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1wgfi8srblqzd2y6528cyvn56rbdxpwlq0wmwqhabshdk28zyx8d"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
itstool
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
glib
|
||||
gst-editing-services
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
;; TODO: Add the 'cvtracker' plugin after our gstreamer packages
|
||||
;; has been upgraded to version 1.20.
|
||||
(gst-plugins/selection gst-plugins-bad #:plugins
|
||||
'("debugutils" "transcode")
|
||||
#:configure-flags
|
||||
'("-Dintrospection=enabled"))
|
||||
gst-libav
|
||||
gsound
|
||||
gtk+
|
||||
libpeas
|
||||
libnotify
|
||||
pango
|
||||
python
|
||||
python-gst
|
||||
python-librosa
|
||||
python-numpy
|
||||
python-matplotlib
|
||||
python-pycairo
|
||||
python-pygobject))
|
||||
;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
|
||||
;; otherwise pitivi fails to launch.
|
||||
(propagated-inputs (list librsvg))
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'glib-or-gtk-wrap 'wrap-other-dependencies
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(wrap-program (search-input-file outputs "bin/pitivi")
|
||||
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
|
||||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
|
||||
;; We've only added inputs for what Pitivi deems either
|
||||
;; necessary or optional. Let the user's packages take
|
||||
;; precedence in case they have e.g. the full gst-plugins-bad.
|
||||
`("GST_PLUGIN_SYSTEM_PATH" suffix
|
||||
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
|
||||
(home-page "http://www.pitivi.org")
|
||||
(synopsis "Video editor based on GStreamer Editing Services")
|
||||
(description "Pitivi is a video editor built upon the GStreamer Editing
|
||||
Services. It aims to be an intuitive and flexible application that can appeal
|
||||
to newbies and professionals alike.")
|
||||
(license license:lgpl2.1+))))
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public gavl
|
||||
(package
|
||||
|
|
|
|||
Loading…
Reference in a new issue