From 864a7478e85d99f08122b0120ad695164ee55dbe Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 8 Feb 2023 08:54:33 -0500
Subject: gnu: gstreamer: Do not reference Python.

* gnu/packages/gstreamer.scm (gstreamer) [native-inputs]: Replace
python-wrapper with python.
[arguments]: List python in #:disallowed-references.  Add a
'do-not-capture-python phase.
---
 gnu/packages/gstreamer.scm | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index f33a30a02b..7aa9500620 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -475,28 +475,40 @@ (define-public gstreamer
          "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0"))))
     (build-system meson-build-system)
     (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               #$@%common-gstreamer-phases
-               #$@(if (string-prefix? "i686" (or (%current-target-system)
-                                                 (%current-system)))
-                      ;; FIXME: These tests consistently fail in the Guix CI:
-                      ;;   https://issues.guix.gnu.org/57868
-                      '((add-after 'unpack 'disable-systemclock-test
-                          (lambda _
-                            (substitute* "tests/check/gst/gstsystemclock.c"
-                              (("tcase_add_test \\(tc_chain, \
+     (list
+      #:disallowed-references (list python)
+      #:phases
+      #~(modify-phases %standard-phases
+          #$@%common-gstreamer-phases
+          #$@(if (string-prefix? "i686" (or (%current-target-system)
+                                            (%current-system)))
+                 ;; FIXME: These tests consistently fail in the Guix CI:
+                 ;;   https://issues.guix.gnu.org/57868
+                 '((add-after 'unpack 'disable-systemclock-test
+                     (lambda _
+                       (substitute* "tests/check/gst/gstsystemclock.c"
+                         (("tcase_add_test \\(tc_chain, \
 test_stress_cleanup_unschedule.*")
-                               "")
-                              (("tcase_add_test \\(tc_chain, \
+                          "")
+                         (("tcase_add_test \\(tc_chain, \
 test_stress_reschedule.*")
-                               "")))))
-                      '()))))
+                          "")))))
+                 '())
+          (add-after 'patch-shebangs 'do-not-capture-python
+            (lambda _
+              ;; The patch-source-shebangs phase causes the following build
+              ;; script to reference Python in its shebang, which is
+              ;; unnecessary.
+              (substitute* (string-append #$output
+                                          "/libexec/gstreamer-1.0/"
+                                          "gst-plugins-doc-cache-generator")
+                (((which "python3"))
+                 "/usr/bin/env python3")))))))
     (propagated-inputs
      ;; In gstreamer-1.0.pc:
      ;;   Requires: glib-2.0, gobject-2.0
      ;;   Requires.private: gmodule-no-export-2.0 libunwind libdw
-     (list elfutils ; libdw
+     (list elfutils                     ;libdw
            glib libunwind))
     (native-inputs
      (list bash-completion
@@ -506,7 +518,7 @@ (define-public gstreamer
            gobject-introspection
            perl
            pkg-config
-           python-wrapper))
+           python))
     (inputs
      (list gmp libcap
            ;; For tests.
-- 
cgit v1.2.3


From 525c24ab2b05f27c6e0ebdad4fc22964a737d572 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:17:54 -0400
Subject: gnu: gstreamer: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gstreamer): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 7aa9500620..aa64ca2673 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages gstreamer)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages compression)
@@ -463,7 +464,7 @@ (define %common-gstreamer-phases
 (define-public gstreamer
   (package
     (name "gstreamer")
-    (version "1.20.3")
+    (version "1.22.1")
     (source
      (origin
        (method url-fetch)
@@ -472,22 +473,22 @@ (define-public gstreamer
              version ".tar.xz"))
        (sha256
         (base32
-         "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0"))))
+         "0wg7zlj2pqkkxk71a1mwi4lc960ifv4n7spwzlakcxi6z5csfg6d"))))
     (build-system meson-build-system)
     (arguments
-     (list
-      #:disallowed-references (list python)
-      #:phases
-      #~(modify-phases %standard-phases
-          #$@%common-gstreamer-phases
-          #$@(if (string-prefix? "i686" (or (%current-target-system)
-                                            (%current-system)))
-                 ;; FIXME: These tests consistently fail in the Guix CI:
-                 ;;   https://issues.guix.gnu.org/57868
-                 '((add-after 'unpack 'disable-systemclock-test
-                     (lambda _
-                       (substitute* "tests/check/gst/gstsystemclock.c"
-                         (("tcase_add_test \\(tc_chain, \
+     (list #:disallowed-references (list python)
+           #:meson meson-0.63
+           #:phases
+           #~(modify-phases %standard-phases
+               #$@%common-gstreamer-phases
+               #$@(if (string-prefix? "i686" (or (%current-target-system)
+                                                 (%current-system)))
+                      ;; FIXME: These tests consistently fail in the Guix CI:
+                      ;;   https://issues.guix.gnu.org/57868
+                      '((add-after 'unpack 'disable-systemclock-test
+                          (lambda _
+                            (substitute* "tests/check/gst/gstsystemclock.c"
+                              (("tcase_add_test \\(tc_chain, \
 test_stress_cleanup_unschedule.*")
                           "")
                          (("tcase_add_test \\(tc_chain, \
-- 
cgit v1.2.3


From 8679c16f3a2646100d9dc952c2716617d0b0428c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:18:13 -0400
Subject: gnu: gstreamer-docs: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gstreamer-docs): Update to 1.22.1.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index aa64ca2673..10532113e5 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -404,7 +404,7 @@ (define-public orc
 (define-public gstreamer-docs
   (package
     (name "gstreamer-docs")
-    (version "1.20.3")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -412,7 +412,7 @@ (define-public gstreamer-docs
                     "/gstreamer-docs-" version ".tar.xz"))
               (sha256
                (base32
-                "1gziccq5f4fy23q6dm8nwbmzh68gn9rfbqw0xcn4r8yn82545z3k"))))
+                "1w7zc2162pwmslxsql0gaqs18jls7q885d0y5mxpifbxwl9hkjpy"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3


From 4adefb3febbc63c455bb2b1e067d23d158dfbd68 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:18:31 -0400
Subject: gnu: gst-plugins-base: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 10532113e5..d5670e0d1f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -546,7 +546,7 @@ (define-public gstreamer
 (define-public gst-plugins-base
   (package
     (name "gst-plugins-base")
-    (version "1.20.3")
+    (version "1.22.1")
     (source
      (origin
       (method url-fetch)
@@ -554,7 +554,7 @@ (define-public gst-plugins-base
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y"))))
+        "0s8wh2il395y3gp4ryqfj4sd53c1dv521vx4ryyqssv4qnnaxg2r"))))
     (build-system meson-build-system)
     (propagated-inputs
      (list glib                     ;required by gstreamer-sdp-1.0.pc
@@ -593,6 +593,7 @@ (define-public gst-plugins-base
            xorg-server-for-tests))
     (arguments
      (list
+      #:meson meson-0.63
       #:phases
       #~(modify-phases %standard-phases
           #$@%common-gstreamer-phases
-- 
cgit v1.2.3


From 458a9b6460e02e5d12d84a7c6388d07396edd294 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:18:48 -0400
Subject: gnu: gst-plugins-good: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index d5670e0d1f..4c53d06560 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -646,7 +646,7 @@ (define-public gst-plugins-base
 (define-public gst-plugins-good
   (package
     (name "gst-plugins-good")
-    (version "1.20.3")
+    (version "1.22.1")
     (source
      (origin
        (method url-fetch)
@@ -655,10 +655,11 @@ (define-public gst-plugins-good
          "https://gstreamer.freedesktop.org/src/" name "/"
          name "-" version ".tar.xz"))
        (sha256
-        (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq"))))
+        (base32 "1k3l17kzyzfqv8imph7vc227vzz7jamk42g9xcm09zdlai311ya4"))))
     (build-system meson-build-system)
     (arguments
      (list
+      #:meson meson-0.63
       #:glib-or-gtk? #t              ; To wrap binaries and/or compile schemas
       #:phases
       #~(modify-phases %standard-phases
-- 
cgit v1.2.3


From b01cb18287ab7ae1549a8c53328cc30bf6eab4a7 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:19:12 -0400
Subject: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests.

* gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.22.1.
[arguments]: Use meson-0.63.  Remove the disable-asfmux-test and reinstate the
msdkh264enc, svthevcenc, dash_mpd and curlhttpsrc tests.
---
 gnu/packages/gstreamer.scm | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 4c53d06560..4b14d38339 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -761,14 +761,14 @@ (define-public gst-plugins-good-qt
 (define-public gst-plugins-bad
   (package
     (name "gst-plugins-bad")
-    (version "1.20.3")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/src/"
                                   name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0kys6m5hg5bc30wfg8qa3s7dmkdz3kj1j8lhvn3267fxalxw24bs"))
+                "03lza1gq1j5gpz13fql47aaljs9k7qih02j2zzwnd1nr4brbcf9g"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -777,21 +777,12 @@ (define-public gst-plugins-bad
     (build-system meson-build-system)
     (arguments
      (list
+      #:meson meson-0.63
       #:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled")
       #:glib-or-gtk? #t              ; To wrap binaries and/or compile schemas
       #:phases
       #~(modify-phases %standard-phases
           #$@%common-gstreamer-phases
-          #$@(if (string-prefix? "arm" (or (%current-target-system)
-                                           (%current-system)))
-                 ;; Disable test that fails on ARMv7.
-                 ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188
-                 `((add-after 'unpack 'disable-asfmux-test
-                     (lambda _
-                       (substitute* "tests/check/meson.build"
-                         (("\\[\\['elements/asfmux\\.c'\\]\\],")
-                          "")))))
-                 '())
           (add-after 'unpack 'adjust-tests
             (lambda* (#:key native-inputs inputs #:allow-other-keys)
               (let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
@@ -803,18 +794,11 @@ (define-public gst-plugins-bad
                    (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
                                   gst-plugins-good "/lib/gstreamer-1.0'"))
 
-                  ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
-                  ((".*elements/msdkh264enc\\.c.*") "")
-                  ((".*elements/svthevcenc\\.c.*") "")
-
                   ;; The 'elements_shm.test_shm_live' test sometimes times out
                   ;; (see:
                   ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
                   ((".*'elements/shm\\.c'.*") "")
 
-                  ;; FIXME: Why is this failing.
-                  ((".*elements/dash_mpd\\.c.*") "")
-
                   ;; This test is flaky on at least some architectures.
                   ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
                   #$@(if (member (%current-system)
@@ -823,9 +807,6 @@ (define-public gst-plugins-bad
                             "'elements/camerabin.c'], true, ],"))
                          '())
 
-                  ;; These tests are flaky and occasionally time out:
-                  ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
-                  ((".*elements/curlhttpsrc\\.c.*") "")
                   ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
                   ((".*elements/dtls\\.c.*") ""))
                 (substitute* "tests/check/elements/zxing.c"
-- 
cgit v1.2.3


From 981ce89ec0ff193147d86f95ccd664fded48338e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:20:37 -0400
Subject: gnu: gst-plugins-ugly: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gst-plugins-ugly): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 4b14d38339..b2a78a5556 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -945,7 +945,7 @@ (define-public gst-plugins-bad
 (define-public gst-plugins-ugly
   (package
     (name "gst-plugins-ugly")
-    (version "1.20.3")
+    (version "1.22.1")
     (source
      (origin
        (method url-fetch)
@@ -953,10 +953,11 @@ (define-public gst-plugins-ugly
         (string-append "https://gstreamer.freedesktop.org/src/"
                        name "/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc"))))
+        (base32 "1hhmi1jds1lcdr0w9jmi1ys0nkyfbpvb2jvw7k5f3g416khxkcsa"))))
     (build-system meson-build-system)
     (arguments
-     (list #:glib-or-gtk? #t         ; To wrap binaries and/or compile schemas
+     (list #:meson meson-0.63
+           #:glib-or-gtk? #t         ; To wrap binaries and/or compile schemas
            #:phases
            #~(modify-phases %standard-phases
                #$@%common-gstreamer-phases
-- 
cgit v1.2.3


From 96896e504be9a9f896de8ec5a7b37629c3073beb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:20:55 -0400
Subject: gnu: gst-libav: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gst-libav): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b2a78a5556..42bbe3241b 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1003,7 +1003,7 @@ (define-public gst-plugins-ugly
 (define-public gst-libav
   (package
     (name "gst-libav")
-    (version "1.20.3")
+    (version "1.22.1")
     (source
      (origin
        (method url-fetch)
@@ -1012,8 +1012,9 @@ (define-public gst-libav
          "https://gstreamer.freedesktop.org/src/" name "/"
          name "-" version ".tar.xz"))
        (sha256
-        (base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z"))))
+        (base32 "1yxmc3jchqyw0gcc5193640xf70s2dl55nzqh6jbghrsvhjyhn69"))))
     (build-system meson-build-system)
+    (arguments (list #:meson meson-0.63))
     (native-inputs
      (list perl pkg-config python-wrapper ruby))
     (inputs
-- 
cgit v1.2.3


From 4737db6fdc9660fb501884d6b8cce220b83d1248 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:21:09 -0400
Subject: gnu: gst-editing-services: Update to 1.22.1.

* gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 42bbe3241b..9fb68a6cfb 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1030,7 +1030,7 @@ (define-public gst-libav
 (define-public gst-editing-services
   (package
     (name "gst-editing-services")
-    (version "1.20.3")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1038,10 +1038,11 @@ (define-public gst-editing-services
                     "gst-editing-services-" version ".tar.xz"))
               (sha256
                (base32
-                "18msiadg6wi1636ylp02yfiwphxlz39gh3vbxchl9qpvd7g9dn2z"))))
+                "0f0l2qanwi8msv16aqi3xxpslw9wn4rg1ibix6hbk940xw45x7hg"))))
     (build-system meson-build-system)
     (arguments
      (list
+      #:meson meson-0.63
       #:tests? #f                    ; FIXME: 16/23 failing tests.
       #:glib-or-gtk? #t              ; To wrap binaries and/or compile schemas
       #:phases #~(modify-phases %standard-phases
-- 
cgit v1.2.3


From 0a6e9b54548ea27d5a2c63356720eca6e0d2c461 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 Mar 2023 14:21:20 -0400
Subject: gnu: python-gst: Update to 1.22.1.

* gnu/packages/gstreamer.scm (python-gst): Update to 1.22.1.
[arguments]: Use meson-0.63.
---
 gnu/packages/gstreamer.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 9fb68a6cfb..74df3e69e2 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1099,7 +1099,7 @@ (define-public gst-plugins-bad-minimal
 (define-public python-gst
   (package
     (name "python-gst")
-    (version "1.20.3")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1107,10 +1107,11 @@ (define-public python-gst
                     "gst-python-" version ".tar.xz"))
               (sha256
                (base32
-                "1p6g05k88nbbv5x9madsvphxcdkfl1z0lmp39p6bhmg9x8h82d6v"))))
+                "1fryl7rifgjkcc3wsfn4c3as3znhr8y8jnsib8kn8nk83m28l04n"))))
     (build-system meson-build-system)
     (arguments
      (list
+      #:meson meson-0.63
       #:modules `((guix build meson-build-system)
                   (guix build utils)
                   ((guix build python-build-system) #:prefix python:))
-- 
cgit v1.2.3


From 5f64f7abca4d59130616e87263b8a8c2a3769c3a Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 1 Apr 2023 22:11:19 -0400
Subject: gnu: gstreamer: Fix indentation.

* gnu/packages/gstreamer.scm (gstreamer): Fix indentation.
---
 gnu/packages/gstreamer.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 74df3e69e2..38845b83af 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -490,21 +490,21 @@ (define-public gstreamer
                             (substitute* "tests/check/gst/gstsystemclock.c"
                               (("tcase_add_test \\(tc_chain, \
 test_stress_cleanup_unschedule.*")
-                          "")
-                         (("tcase_add_test \\(tc_chain, \
+                               "")
+                              (("tcase_add_test \\(tc_chain, \
 test_stress_reschedule.*")
-                          "")))))
-                 '())
-          (add-after 'patch-shebangs 'do-not-capture-python
-            (lambda _
-              ;; The patch-source-shebangs phase causes the following build
-              ;; script to reference Python in its shebang, which is
-              ;; unnecessary.
-              (substitute* (string-append #$output
-                                          "/libexec/gstreamer-1.0/"
-                                          "gst-plugins-doc-cache-generator")
-                (((which "python3"))
-                 "/usr/bin/env python3")))))))
+                               "")))))
+                      '())
+               (add-after 'patch-shebangs 'do-not-capture-python
+                 (lambda _
+                   ;; The patch-source-shebangs phase causes the following build
+                   ;; script to reference Python in its shebang, which is
+                   ;; unnecessary.
+                   (substitute* (string-append
+                                 #$output "/libexec/gstreamer-1.0/"
+                                 "gst-plugins-doc-cache-generator")
+                     (((which "python3"))
+                      "/usr/bin/env python3")))))))
     (propagated-inputs
      ;; In gstreamer-1.0.pc:
      ;;   Requires: glib-2.0, gobject-2.0
-- 
cgit v1.2.3


From f346327172051b28e78e66f0ea5fd07d5b9ba490 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 1 Apr 2023 22:13:18 -0400
Subject: gnu: gst-plugins-good: Skip the test_video_caps_late test.

* gnu/packages/gstreamer.scm (gst-plugins-good)
[arguments]: Skip the test_video_caps_late test in the skip-failing-tests
phase.
---
 gnu/packages/gstreamer.scm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 38845b83af..a89233bbac 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -674,6 +674,11 @@ (define libsoup
                  (string-append prefix "\"" libsoup "\"\n")))))
           (add-after 'unpack 'skip-failing-tests
             (lambda _
+              (substitute* "tests/check/elements/flvmux.c"
+                ;; This test randomly times out (see:
+                ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/786).
+                ((".*tcase_add_test.*test_video_caps_late.*")
+                 ""))
               (substitute* "tests/check/meson.build"
                 ;; Reported as shaky upstream, see
                 ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
-- 
cgit v1.2.3


From 22707f55abc1fc5ee105dfc59f589d333ff0eee9 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:17 -0400
Subject: gnu: gstreamer-docs: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gstreamer-docs): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index a89233bbac..b6e268884d 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -404,7 +404,7 @@ (define-public orc
 (define-public gstreamer-docs
   (package
     (name "gstreamer-docs")
-    (version "1.22.1")
+    (version "1.22.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -412,7 +412,7 @@ (define-public gstreamer-docs
                     "/gstreamer-docs-" version ".tar.xz"))
               (sha256
                (base32
-                "1w7zc2162pwmslxsql0gaqs18jls7q885d0y5mxpifbxwl9hkjpy"))))
+                "1fljaydlinzw9jf5nkhwf7ihfzd5250k2cv220mi8dxxf7rgn18y"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3


From 3f409cff3a063570aa46edfe0f424735649e884e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:27 -0400
Subject: gnu: gstreamer: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gstreamer): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b6e268884d..1c8e93ffb1 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -464,7 +464,7 @@ (define %common-gstreamer-phases
 (define-public gstreamer
   (package
     (name "gstreamer")
-    (version "1.22.1")
+    (version "1.22.2")
     (source
      (origin
        (method url-fetch)
@@ -473,7 +473,7 @@ (define-public gstreamer
              version ".tar.xz"))
        (sha256
         (base32
-         "0wg7zlj2pqkkxk71a1mwi4lc960ifv4n7spwzlakcxi6z5csfg6d"))))
+         "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj"))))
     (build-system meson-build-system)
     (arguments
      (list #:disallowed-references (list python)
-- 
cgit v1.2.3


From c53f8afa4f2b085af8582fbcacf4d4aa8d023721 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:41 -0400
Subject: gnu: gst-plugins-base: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 1c8e93ffb1..307f71793a 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -546,7 +546,7 @@ (define-public gstreamer
 (define-public gst-plugins-base
   (package
     (name "gst-plugins-base")
-    (version "1.22.1")
+    (version "1.22.2")
     (source
      (origin
       (method url-fetch)
@@ -554,7 +554,7 @@ (define-public gst-plugins-base
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0s8wh2il395y3gp4ryqfj4sd53c1dv521vx4ryyqssv4qnnaxg2r"))))
+        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
     (build-system meson-build-system)
     (propagated-inputs
      (list glib                     ;required by gstreamer-sdp-1.0.pc
-- 
cgit v1.2.3


From 7bd4e43ec0b14f65e26e68b2a95e7abaa72a2d8e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:42 -0400
Subject: gnu: gst-plugins-good: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 307f71793a..a84630bda2 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -646,7 +646,7 @@ (define-public gst-plugins-base
 (define-public gst-plugins-good
   (package
     (name "gst-plugins-good")
-    (version "1.22.1")
+    (version "1.22.2")
     (source
      (origin
        (method url-fetch)
@@ -655,7 +655,7 @@ (define-public gst-plugins-good
          "https://gstreamer.freedesktop.org/src/" name "/"
          name "-" version ".tar.xz"))
        (sha256
-        (base32 "1k3l17kzyzfqv8imph7vc227vzz7jamk42g9xcm09zdlai311ya4"))))
+        (base32 "1p8cpkk4dynglw0xswqyf57xl5fnxmb3xld71kv35cpj4nacb33w"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From e1e6ccf8e366ca713498712199165953c6b74d99 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:42 -0400
Subject: gnu: gst-plugins-bad: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index a84630bda2..a24ed55e22 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -766,14 +766,14 @@ (define-public gst-plugins-good-qt
 (define-public gst-plugins-bad
   (package
     (name "gst-plugins-bad")
-    (version "1.22.1")
+    (version "1.22.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/src/"
                                   name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "03lza1gq1j5gpz13fql47aaljs9k7qih02j2zzwnd1nr4brbcf9g"))
+                "03rd09wsrf9xjianpnnvamb4n3lndhd4x31srqsqab20wcfaz3rx"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
cgit v1.2.3


From 8480a784f2f57e57f03fe3afc8043bcb76097db9 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:42 -0400
Subject: gnu: gst-plugins-ugly: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-plugins-ugly): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index a24ed55e22..bf0ba11c1f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -950,7 +950,7 @@ (define-public gst-plugins-bad
 (define-public gst-plugins-ugly
   (package
     (name "gst-plugins-ugly")
-    (version "1.22.1")
+    (version "1.22.2")
     (source
      (origin
        (method url-fetch)
@@ -958,7 +958,7 @@ (define-public gst-plugins-ugly
         (string-append "https://gstreamer.freedesktop.org/src/"
                        name "/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "1hhmi1jds1lcdr0w9jmi1ys0nkyfbpvb2jvw7k5f3g416khxkcsa"))))
+        (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g"))))
     (build-system meson-build-system)
     (arguments
      (list #:meson meson-0.63
-- 
cgit v1.2.3


From 4f1b5cd3efbb0dac60c8318a65af851ff50395d5 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:42 -0400
Subject: gnu: gst-libav: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-libav): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index bf0ba11c1f..4b5ccf33c0 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1008,7 +1008,7 @@ (define-public gst-plugins-ugly
 (define-public gst-libav
   (package
     (name "gst-libav")
-    (version "1.22.1")
+    (version "1.22.2")
     (source
      (origin
        (method url-fetch)
@@ -1017,7 +1017,7 @@ (define-public gst-libav
          "https://gstreamer.freedesktop.org/src/" name "/"
          name "-" version ".tar.xz"))
        (sha256
-        (base32 "1yxmc3jchqyw0gcc5193640xf70s2dl55nzqh6jbghrsvhjyhn69"))))
+        (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw"))))
     (build-system meson-build-system)
     (arguments (list #:meson meson-0.63))
     (native-inputs
-- 
cgit v1.2.3


From 02d95dea187953f1a417da942446fe82a8ed7932 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:43 -0400
Subject: gnu: gst-editing-services: Update to 1.22.2.

* gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 4b5ccf33c0..20ca2b2e3f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1035,7 +1035,7 @@ (define-public gst-libav
 (define-public gst-editing-services
   (package
     (name "gst-editing-services")
-    (version "1.22.1")
+    (version "1.22.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1043,7 +1043,7 @@ (define-public gst-editing-services
                     "gst-editing-services-" version ".tar.xz"))
               (sha256
                (base32
-                "0f0l2qanwi8msv16aqi3xxpslw9wn4rg1ibix6hbk940xw45x7hg"))))
+                "1gyfw11ns2la1cm6gvvvv5qj3q5gcvcypc3wk8kdwmrqzij18fs5"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From 2273cb602d3a03cce0940de713075c71ba77b2fc Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 11 Apr 2023 21:00:43 -0400
Subject: gnu: python-gst: Update to 1.22.2.

* gnu/packages/gstreamer.scm (python-gst): Update to 1.22.2.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 20ca2b2e3f..0d051438e3 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1104,7 +1104,7 @@ (define-public gst-plugins-bad-minimal
 (define-public python-gst
   (package
     (name "python-gst")
-    (version "1.22.1")
+    (version "1.22.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1112,7 +1112,7 @@ (define-public python-gst
                     "gst-python-" version ".tar.xz"))
               (sha256
                (base32
-                "1fryl7rifgjkcc3wsfn4c3as3znhr8y8jnsib8kn8nk83m28l04n"))))
+                "1bak46bj92gyz613m99mnl0yw0qhbhq5dfxifnvldgp45kcb7wmy"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
cgit v1.2.3