guix_mirror_bot pushed a commit to branch ungrafting
in repository guix.

commit cbaa98f0ef83bc9e19ae5330b29162aa3cc21813
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Mon Nov 16 08:56:00 2026 +0100

    gnu: Ungraft gst-plugins-bad.
    
    * gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.28.9.
    [replacement]: Remove.
    [arguments]<#:phases>{adjust-tests}: Also skip “elements/vkdownload.c”.
    (gst-plugins-bad/fixed): Remove variable.
    
    Signed-off-by: Andreas Enge <[email protected]>
---
 gnu/packages/gstreamer.scm | 78 +++-------------------------------------------
 1 file changed, 4 insertions(+), 74 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 08708aee3c4..7333201dc6b 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -760,15 +760,14 @@ model to base your own plug-in on, here it is.")
 (define-public gst-plugins-bad
   (package
     (name "gst-plugins-bad")
-    (version "1.28.1")
-    (replacement gst-plugins-bad/fixed)
+    (version "1.28.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/src/";
                                   name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "18hk8gh97r2cwdazl5ikjwsczk3bkvr4z7nmjc45bdgqhwvmkhan"))
+                "1cgn8cybqims6ld4zdx5i2s272d9qdx3l54gqiw871jgz1xhnkja"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -842,7 +841,8 @@ model to base your own plug-in on, here it is.")
                   ;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
                   ;; no element "vulkanupload"
                   ((".*elements/vkcolorconvert\\.c.*") "")
-                  ((".*elements/vkupload\\.c.*") "")))))
+                  ((".*elements/vkupload\\.c.*") "")
+                  ((".*elements/vkdownload\\.c.*") "")))))
           (add-before 'check 'pre-check
             (lambda _
               ;; Tests require a running X server.
@@ -970,76 +970,6 @@ model to base your own plug-in on, here it is.")
 par compared to the rest.")
     (license license:lgpl2.0+)))
 
-(define gst-plugins-bad/fixed
-  (package
-    (inherit gst-plugins-bad)
-    (name "gst-plugins-bad")
-    (version "1.28.9")
-    (source
-     (origin
-       (inherit (package-source gst-plugins-bad))
-       (uri (string-append "https://gstreamer.freedesktop.org/src/"; name "/"
-                          name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "1cgn8cybqims6ld4zdx5i2s272d9qdx3l54gqiw871jgz1xhnkja"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'adjust-tests
-              (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                (let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
-                                                   "gst-plugins-good")))
-                  (substitute* "tests/check/meson.build"
-                    ;; Make gst-plugin-good available for tests, see
-                    ;; 
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426
-                    (("'GST_PLUGIN_SYSTEM_PATH_1_0', ''")
-                     (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
-                                    gst-plugins-good "/lib/gstreamer-1.0'"))
-
-                    ;; The 'elements_shm.test_shm_live' test sometimes times 
out
-                    ;; (see:
-                    ;; 
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
-                    ((".*'elements/shm\\.c'.*") "")
-
-                    ;; The 'elements_curlhttpsrc' test sometimes times out.
-                    ((".*'elements/curlhttpsrc\\.c'.*") "")
-
-                    ;; The 'mxfdemux' test fails for unknown reasons (see:
-                    ;; 
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
-                    ((".*'elements/mxfdemux.c'.*") "")
-
-                    ;; Unexpected critical/warning, see
-                    ;; 
<https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
-                    ((".*'elements/netsim\\.c'.*") "")
-
-                    ;; TODO: Figure out why this test fails on riscv64-linux.
-                    #$@(if (target-riscv64?)
-                           `((("'elements/viewfinderbin\\.c'\\].*],")
-                              "'elements/viewfinderbin.c'], true, ],"))
-                           '())
-
-                    ;; This test is flaky.
-                    ;; 
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
-                    (("'elements/camerabin\\.c'\\].*],")
-                     "'elements/camerabin.c'], true, ],")
-
-                    ;; 
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
-                    ((".*elements/dtls\\.c.*") "")
-
-                    ;; Unable to create pipeline 'bin.
-                    ;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
-                    ;; no element "vulkanupload"
-                    ((".*elements/vkcolorconvert\\.c.*") "")
-                    ((".*elements/vkupload\\.c.*") "")
-                    ((".*elements/vkdownload\\.c.*") "")))))))))
-    ;; Repair inputs to refer to updated GStreamer in build.
-    ;; Drop this when unbundling.
-    (inputs (modify-inputs inputs
-              (prepend gstreamer/fixed gst-plugins-base/fixed)))
-    (propagated-inputs (list))))
-
 (define-public gst-plugins-rs
   (package
     (name "gst-plugins-rs")

Reply via email to