lilyp pushed a commit to branch gnome-team in repository guix. commit 736fe08d2254f6fba4b6bada77c8afd78874195c Author: Liliana Marie Prikler <liliana.prik...@gmail.com> AuthorDate: Mon Oct 28 09:27:57 2024 +0100
gnu: gst-editing-services: Fix build. * gnu/packages/patches/gst-editing-services-fix-api.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gstreamer.scm (gst-editing-services): Use it here. --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 1 + .../patches/gst-editing-services-fix-api.patch | 31 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index 81ee6fa604..6c8d01274c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1552,6 +1552,7 @@ 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 168560d724..2ade8d7986 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1047,6 +1047,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") (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")))) diff --git a/gnu/packages/patches/gst-editing-services-fix-api.patch b/gnu/packages/patches/gst-editing-services-fix-api.patch new file mode 100644 index 0000000000..6745e4ecc2 --- /dev/null +++ b/gnu/packages/patches/gst-editing-services-fix-api.patch @@ -0,0 +1,31 @@ +From f1aedd65f4c276578b767b4555ba7cdf68fe024b Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org> +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 +