guix_mirror_bot pushed a commit to branch gstreamer-updates in repository guix.
commit 31e4e49a9ed7ea2df1095134d3689def3fd5ea58 Author: Maxim Cournoyer <[email protected]> AuthorDate: Thu Feb 26 21:58:16 2026 +0900 gnu: gst-plugins-base: Update to 1.28.1. * gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.28.1. [source]: Apply a patch. [propagated-inputs]: Add libdrm. * gnu/packages/patches/gst-plugins-base-null-pointer.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Id027d1e6ddc5ff331d4d64965266d7a99d859d3b --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 11 +++--- .../patches/gst-plugins-base-null-pointer.patch | 46 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 6267e56038..06a514132f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1580,6 +1580,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ + %D%/packages/patches/gst-plugins-base-null-pointer.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/hare-fallback-cache.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 2e0bc8b088..776505134f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -516,7 +516,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.26.3") + (version "1.28.1") (source (origin (method url-fetch) @@ -524,11 +524,13 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0cvrq9767w0aqzinifbirbc95jg4i4md4b8f4b70hlq217pzkyaf")))) + "15r42ff1mwkj5p3z0dij6d9isi1q02gmjnp8i26xgx9gm71a8ihl")) + (patches (search-patches "gst-plugins-base-null-pointer.patch")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc gstreamer ;required by gstreamer-plugins-base-1.0.pc + libdrm ;required by gstreamer-allocators-1.0.pc libgudev ;required by gstreamer-gl-1.0.pc ;; wayland-client.h is referred to in ;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h @@ -570,9 +572,8 @@ This package provides the core library and elements.") (lambda _ (substitute* "tests/check/meson.build" ;; This test causes nondeterministic failures (see: - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950). - ((".*'elements/appsrc.c'.*") - "")) + ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>). + ((".*'elements/appsrc.c'.*") "")) ;; Some other tests fail on other architectures. #$@(cond ((target-x86-32?) diff --git a/gnu/packages/patches/gst-plugins-base-null-pointer.patch b/gnu/packages/patches/gst-plugins-base-null-pointer.patch new file mode 100644 index 0000000000..72c3a2ecd6 --- /dev/null +++ b/gnu/packages/patches/gst-plugins-base-null-pointer.patch @@ -0,0 +1,46 @@ +From 7d7c9ce06837f20d5585f1bc28a47701d12cf8ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]> +Date: Sun, 1 Mar 2026 10:53:21 +0200 +Subject: [PATCH] glcolorconvert: Fix NULL pointer dereference on buffers + without video meta + +Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4935 +--- + .../gst-libs/gst/gl/gstglcolorconvert.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c +index f2dc2dc7bbb..c13b4df69de 100644 +--- a/gst-libs/gst/gl/gstglcolorconvert.c ++++ b/gst-libs/gst/gl/gstglcolorconvert.c +@@ -3428,10 +3428,12 @@ _init_convert (GstGLColorConvert * convert) + } + + GstVideoMeta *v_meta = gst_buffer_get_video_meta (convert->inbuf); +- if (v_meta->width != convert->priv->padded_width +- || v_meta->height != convert->priv->padded_height) { +- gdouble padded_width = v_meta->width; +- gdouble padded_height = v_meta->height; ++ if ((v_meta && (v_meta->width != convert->priv->padded_width ++ || v_meta->height != convert->priv->padded_height)) || ++ (!v_meta && (convert->in_info.width != convert->priv->padded_width || ++ convert->in_info.height != convert->priv->padded_height))) { ++ gdouble padded_width = v_meta ? v_meta->width : convert->in_info.width; ++ gdouble padded_height = v_meta ? v_meta->height : convert->in_info.height; + gdouble display_width = GST_VIDEO_INFO_WIDTH (&convert->in_info); + gdouble display_height = GST_VIDEO_INFO_HEIGHT (&convert->in_info); + +@@ -3449,8 +3451,8 @@ _init_convert (GstGLColorConvert * convert) + crop_vertices, GL_STATIC_DRAW); + gl->BindBuffer (GL_ARRAY_BUFFER, 0); + +- convert->priv->padded_width = v_meta->width; +- convert->priv->padded_height = v_meta->height; ++ convert->priv->padded_width = padded_width; ++ convert->priv->padded_height = padded_height; + } + + gl->BindTexture (GL_TEXTURE_2D, 0); +-- +GitLab +
