lilyp pushed a commit to branch gnome-team
in repository guix.
commit bfe20c84908c26a72c64117484452267a658b823
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Nov 11 15:16:54 2024 +0900
gnu: gst-editing-services: Update to 1.24.9.
* gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.24.9.
[source] <patches>: Delete field.
* gnu/packages/patches/gst-editing-services-fix-api.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: Iae252ef94d788ed553b437517f1a6826b816e55d
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/gstreamer.scm | 9 ++++---
.../patches/gst-editing-services-fix-api.patch | 31 ----------------------
3 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5d72e5da1d..3449280228 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1549,7 +1549,6 @@ dist_patch_DATA =
\
%D%/packages/patches/guile-present-coding.patch \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-build-fixes.patch \
- %D%/packages/patches/gst-editing-services-fix-api.patch \
%D%/packages/patches/gtk2-fix-builder-test.patch \
%D%/packages/patches/gtk2-harden-list-store.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b0c62bfdc8..a94ea79c79 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1045,20 +1045,21 @@ decoders, muxers, and demuxers provided by FFmpeg.")
(define-public gst-editing-services
(package
(name "gst-editing-services")
- (version "1.24.6")
+ (version "1.24.9")
(source (origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/"; name "/"
"gst-editing-services-" version ".tar.xz"))
- (patches (search-patches "gst-editing-services-fix-api.patch"))
(sha256
(base32
- "0rm2w7g1rgbzh3i659lw61hgzfhqk8cmx9y0zkjzwnwxmdfa53qk"))))
+ "04khlbw3wy5zr2s246252zrd4hnzv2x36l5avz0lxif6pr9nwl07"))))
(build-system meson-build-system)
(arguments
(list
- #:tests? #f ; FIXME: 16/23 failing tests.
+ ;; Most of the tests fail (see:
+ ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2489).
+ #:tests? #f
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #~(modify-phases %standard-phases
#$@%common-gstreamer-phases)))
diff --git a/gnu/packages/patches/gst-editing-services-fix-api.patch
b/gnu/packages/patches/gst-editing-services-fix-api.patch
deleted file mode 100644
index 6745e4ecc2..0000000000
--- a/gnu/packages/patches/gst-editing-services-fix-api.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f1aedd65f4c276578b767b4555ba7cdf68fe024b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-Date: Fri, 20 Sep 2024 01:44:53 +0200
-Subject: [PATCH] ges: Fix name of GESFrameCompositionMeta API type
-
-g-ir-scanner 1.82.0 failed with a fatal error due to the wrong
-namespace.
-
-Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3800
-Part-of:
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7554>
----
- .../gst-editing-services/ges/ges-frame-composition-meta.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c
b/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c
-index d8c5a5251309..1ad7b6cfe4c7 100644
---- gst-editing-services/ges/ges-frame-composition-meta.c
-+++ gst-editing-services/ges/ges-frame-composition-meta.c
-@@ -47,7 +47,8 @@ ges_frame_composition_meta_api_get_type (void)
- static const gchar *tags[] = { "video", NULL };
-
- if (g_once_init_enter (&type)) {
-- GType _type = gst_meta_api_type_register ("GstFrameCompositionApi", tags);
-+ GType _type =
-+ gst_meta_api_type_register ("GESFrameCompositionMetaAPI", tags);
- g_once_init_leave (&type, _type);
- }
- return type;
---
-GitLab
-
