guix_mirror_bot pushed a commit to branch ungrafting
in repository guix.
commit feb75ba328883b45c204fb2876d370d065456dd1
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Mon Nov 16 08:51:13 2026 +0100
gnu: Ungraft gst-plugins-base.
* gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.28.9.
[replacement]: Remove.
[source]<patches>: Remove
(gst-plugins-base/fixed): Remove variable.
* gnu/packages/patches/gst-plugins-base-null-pointer.patch: Delete file.
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/gstreamer.scm | 21 +---------
.../patches/gst-plugins-base-null-pointer.patch | 46 ----------------------
2 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 9ac857169ee..491ef55d8e8 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -522,8 +522,7 @@ This package provides the core library and elements.")
(define-public gst-plugins-base
(package
(name "gst-plugins-base")
- (replacement gst-plugins-base/fixed)
- (version "1.28.1")
+ (version "1.28.9")
(source
(origin
(method url-fetch)
@@ -531,8 +530,7 @@ This package provides the core library and elements.")
name "-" version ".tar.xz"))
(sha256
(base32
- "15r42ff1mwkj5p3z0dij6d9isi1q02gmjnp8i26xgx9gm71a8ihl"))
- (patches (search-patches "gst-plugins-base-null-pointer.patch"))))
+ "1hfxgf29wklvqq08nbijrqmyb7rc0cn9dsy0cgvsxri0nmladzf1"))))
(build-system meson-build-system)
(propagated-inputs
(list glib ;required by gstreamer-sdp-1.0.pc
@@ -632,21 +630,6 @@ This package provides the core library and elements.")
for the GStreamer multimedia library.")
(license license:lgpl2.0+)))
-(define gst-plugins-base/fixed
- (package
- (inherit gst-plugins-base)
- (name "gst-plugins-base")
- (version "1.28.9")
- (source
- (origin
- (inherit (package-source gst-plugins-base))
- (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1hfxgf29wklvqq08nbijrqmyb7rc0cn9dsy0cgvsxri0nmladzf1"))
- (patches (list))))))
-
(define-public gst-plugins-good
(package
(name "gst-plugins-good")
diff --git a/gnu/packages/patches/gst-plugins-base-null-pointer.patch
b/gnu/packages/patches/gst-plugins-base-null-pointer.patch
deleted file mode 100644
index 72c3a2ecd61..00000000000
--- a/gnu/packages/patches/gst-plugins-base-null-pointer.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-