.gitignore

@@ -1 +1 @@
-SOURCES/gst-plugins-good-1.22.1.tar.xz
+SOURCES/gst-plugins-good-1.24.6.tar.xz

.gstreamer1-plugins-good.metadata

@@ -1 +1 @@
-4c8346aa97ca82f88b988471781f6b18b4e5642c SOURCES/gst-plugins-good-1.22.1.tar.xz
+e906b7cd13652156ec4e10a71b69b85bb30367d4 SOURCES/gst-plugins-good-1.24.6.tar.xz

SOURCES/0001-flacparse-Avoid-integer-overflow-in-available-data-c.patch

@@ -1,55 +0,0 @@
-From cf36c771ea7f4e42603c2b5880432bc8c7d3dff1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 13 Jun 2023 13:20:16 +0300
-Subject: [PATCH 1/7] flacparse: Avoid integer overflow in available data check
- for image tags
-
-If the image length as stored in the file is some bogus integer then
-adding it to the current byte readers position can overflow and wrongly
-have the check for enough available data succeed.
-
-This then later can cause NULL pointer dereferences or out of bounds
-reads/writes when actually reading the image data.
-
-Fixes ZDI-CAN-20775
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2661
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4894>
----
- .../gst-plugins-good/gst/audioparsers/gstflacparse.c        | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/audioparsers/gstflacparse.c b/subprojects/gst-plugins-good/gst/audioparsers/gstflacparse.c
-index a53b7ebc77..8ee450c65a 100644
---- a/subprojects/gst-plugins-good/gst/audioparsers/gstflacparse.c
-+++ b/subprojects/gst-plugins-good/gst/audioparsers/gstflacparse.c
-@@ -1111,6 +1111,7 @@ gst_flac_parse_handle_picture (GstFlacParse * flacparse, GstBuffer * buffer)
-   GstMapInfo map;
-   guint32 img_len = 0, img_type = 0;
-   guint32 img_mimetype_len = 0, img_description_len = 0;
-+  const guint8 *img_data;
- 
-   gst_buffer_map (buffer, &map, GST_MAP_READ);
-   gst_byte_reader_init (&reader, map.data, map.size);
-@@ -1137,7 +1138,7 @@ gst_flac_parse_handle_picture (GstFlacParse * flacparse, GstBuffer * buffer)
-   if (!gst_byte_reader_get_uint32_be (&reader, &img_len))
-     goto error;
- 
--  if (gst_byte_reader_get_pos (&reader) + img_len > map.size)
-+  if (!gst_byte_reader_get_data (&reader, img_len, &img_data))
-     goto error;
- 
-   GST_INFO_OBJECT (flacparse, "Got image of %d bytes", img_len);
-@@ -1146,8 +1147,7 @@ gst_flac_parse_handle_picture (GstFlacParse * flacparse, GstBuffer * buffer)
-     if (flacparse->tags == NULL)
-       flacparse->tags = gst_tag_list_new_empty ();
- 
--    gst_tag_list_add_id3_image (flacparse->tags,
--        map.data + gst_byte_reader_get_pos (&reader), img_len, img_type);
-+    gst_tag_list_add_id3_image (flacparse->tags, img_data, img_len, img_type);
-   }
- 
-   gst_buffer_unmap (buffer, &map);
--- 
-2.47.0
-

SOURCES/0002-qtdemux-Avoid-integer-overflow-when-parsing-Theora-e.patch

@@ -1,41 +0,0 @@
-From b990afeaf306972756e154d4542b2ab1170e506c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Thu, 26 Sep 2024 22:16:06 +0300
-Subject: [PATCH 2/7] qtdemux: Avoid integer overflow when parsing Theora
- extension
-
-Thanks to Antonio Morales for finding and reporting the issue.
-
-Fixes GHSL-2024-166
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3851
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8094>
----
- subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-index 5723fce466..75a5a53713 100644
---- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-@@ -8206,7 +8206,7 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
-   end -= 8;
- 
-   while (buf < end) {
--    gint size;
-+    guint32 size;
-     guint32 type;
- 
-     size = QT_UINT32 (buf);
-@@ -8214,7 +8214,7 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
- 
-     GST_LOG_OBJECT (qtdemux, "%p %p", buf, end);
- 
--    if (buf + size > end || size <= 0)
-+    if (end - buf < size || size < 8)
-       break;
- 
-     buf += 8;
--- 
-2.47.0
-

SOURCES/0003-gdkpixbufdec-Check-if-initializing-the-video-info-ac.patch

@@ -1,49 +0,0 @@
-From 85a46b70bbc5b353136052e3aba00adf761335b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 2 Oct 2024 14:44:21 +0300
-Subject: [PATCH 3/7] gdkpixbufdec: Check if initializing the video info
- actually succeeded
-
-Otherwise a 0-byte buffer would be allocated, which gives NULL memory when
-mapped.
-
-Thanks to Antonio Morales for finding and reporting the issue.
-
-Fixes GHSL-2024-118
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3876
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8103>
----
- .../gst-plugins-good/ext/gdk_pixbuf/gstgdkpixbufdec.c    | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/subprojects/gst-plugins-good/ext/gdk_pixbuf/gstgdkpixbufdec.c b/subprojects/gst-plugins-good/ext/gdk_pixbuf/gstgdkpixbufdec.c
-index 5482998c0d..de5f054964 100644
---- a/subprojects/gst-plugins-good/ext/gdk_pixbuf/gstgdkpixbufdec.c
-+++ b/subprojects/gst-plugins-good/ext/gdk_pixbuf/gstgdkpixbufdec.c
-@@ -322,7 +322,8 @@ gst_gdk_pixbuf_dec_flush (GstGdkPixbufDec * filter)
- 
- 
-     gst_video_info_init (&info);
--    gst_video_info_set_format (&info, fmt, width, height);
-+    if (!gst_video_info_set_format (&info, fmt, width, height))
-+      goto format_not_supported;
-     info.fps_n = filter->in_fps_n;
-     info.fps_d = filter->in_fps_d;
-     caps = gst_video_info_to_caps (&info);
-@@ -384,6 +385,12 @@ channels_not_supported:
-         ("%d channels not supported", n_channels));
-     return GST_FLOW_ERROR;
-   }
-+format_not_supported:
-+  {
-+    GST_ELEMENT_ERROR (filter, STREAM, DECODE, (NULL),
-+        ("%d channels with %dx%d not supported", n_channels, width, height));
-+    return GST_FLOW_ERROR;
-+  }
- no_buffer:
-   {
-     GST_DEBUG ("Failed to create outbuffer - %s", gst_flow_get_name (ret));
--- 
-2.47.0
-

SOURCES/0004-matroskademux-Only-unmap-GstMapInfo-in-WavPack-heade.patch

@@ -1,52 +0,0 @@
-From 6a61ee1073c22ec70e88748a5adfe63dad04687f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 30 Sep 2024 16:32:48 +0300
-Subject: [PATCH 4/7] matroskademux: Only unmap GstMapInfo in WavPack header
- extraction error paths if previously mapped
-
-Thanks to Antonio Morales for finding and reporting the issue.
-
-Fixes GHSL-2024-197
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3863
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8057>
----
- subprojects/gst-plugins-good/gst/matroska/matroska-demux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-index 1e771b04d0..fbc773a80a 100644
---- a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-+++ b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-@@ -3885,7 +3885,6 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
-   GstMatroskaTrackAudioContext *audiocontext =
-       (GstMatroskaTrackAudioContext *) stream;
-   GstBuffer *newbuf = NULL;
--  GstMapInfo map, outmap;
-   guint8 *buf_data, *data;
-   Wavpack4Header wvh;
- 
-@@ -3902,11 +3901,11 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
- 
-   if (audiocontext->channels <= 2) {
-     guint32 block_samples, tmp;
-+    GstMapInfo outmap;
-     gsize size = gst_buffer_get_size (*buf);
- 
-     if (size < 4) {
-       GST_ERROR_OBJECT (element, "Too small wavpack buffer");
--      gst_buffer_unmap (*buf, &map);
-       return GST_FLOW_ERROR;
-     }
- 
-@@ -3944,6 +3943,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
-     *buf = newbuf;
-     audiocontext->wvpk_block_index += block_samples;
-   } else {
-+    GstMapInfo map, outmap;
-     guint8 *outdata = NULL;
-     gsize buf_size, size;
-     guint32 block_samples, flags, crc;
--- 
-2.47.0
-

SOURCES/0005-matroskademux-Fix-off-by-one-when-parsing-multi-chan.patch

@@ -1,27 +0,0 @@
-From 88c503100c2861c59a84c6b60fec90245db506a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 30 Sep 2024 16:33:39 +0300
-Subject: [PATCH 5/7] matroskademux: Fix off-by-one when parsing multi-channel
- WavPack
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8057>
----
- subprojects/gst-plugins-good/gst/matroska/matroska-demux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-index fbc773a80a..4fd0a3ae58 100644
---- a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-+++ b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
-@@ -3970,7 +3970,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
-     data += 4;
-     size -= 4;
- 
--    while (size > 12) {
-+    while (size >= 12) {
-       flags = GST_READ_UINT32_LE (data);
-       data += 4;
-       size -= 4;
--- 
-2.47.0
-

SOURCES/0006-qtdemux-Fix-integer-overflow-when-allocating-the-sam.patch

@@ -1,59 +0,0 @@
-From 64862bdf7e9811413e23a05206bdcc0856deead6 Mon Sep 17 00:00:00 2001
-From: Antonio Morales <antonio-morales@github.com>
-Date: Thu, 26 Sep 2024 18:39:37 +0300
-Subject: [PATCH 6/7] qtdemux: Fix integer overflow when allocating the samples
- table for fragmented MP4
-
-This can lead to out of bounds writes and NULL pointer dereferences.
-
-Fixes GHSL-2024-094, GHSL-2024-237, GHSL-2024-241
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3839
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8059>
----
- subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-index 75a5a53713..adace0b534 100644
---- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-@@ -3334,6 +3334,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
-   gint i;
-   guint8 *data;
-   guint entry_size, dur_offset, size_offset, flags_offset = 0, ct_offset = 0;
-+  guint new_n_samples;
-   QtDemuxSample *sample;
-   gboolean ismv = FALSE;
-   gint64 initial_offset;
-@@ -3434,14 +3435,13 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
-     goto fail;
-   data = (guint8 *) gst_byte_reader_peek_data_unchecked (trun);
- 
--  if (stream->n_samples + samples_count >=
--      QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample))
-+  if (!g_uint_checked_add (&new_n_samples, stream->n_samples, samples_count) ||
-+      new_n_samples >= QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample))
-     goto index_too_big;
- 
-   GST_DEBUG_OBJECT (qtdemux, "allocating n_samples %u * %u (%.2f MB)",
--      stream->n_samples + samples_count, (guint) sizeof (QtDemuxSample),
--      (stream->n_samples + samples_count) *
--      sizeof (QtDemuxSample) / (1024.0 * 1024.0));
-+      new_n_samples, (guint) sizeof (QtDemuxSample),
-+      (new_n_samples) * sizeof (QtDemuxSample) / (1024.0 * 1024.0));
- 
-   /* create a new array of samples if it's the first sample parsed */
-   if (stream->n_samples == 0) {
-@@ -3450,7 +3450,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
-     /* or try to reallocate it with space enough to insert the new samples */
-   } else
-     stream->samples = g_try_renew (QtDemuxSample, stream->samples,
--        stream->n_samples + samples_count);
-+        new_n_samples);
-   if (stream->samples == NULL)
-     goto out_of_memory;
- 
--- 
-2.47.0
-

SOURCES/0007-qtdemux-Make-sure-only-an-even-number-of-bytes-is-pr.patch

@@ -1,40 +0,0 @@
-From dd171f132d5ffde7fdff6f0e3a8ba83a47422b10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Thu, 26 Sep 2024 09:20:28 +0300
-Subject: [PATCH 7/7] qtdemux: Make sure only an even number of bytes is
- processed when handling CEA608 data
-
-An odd number of bytes would lead to out of bound reads and writes, and doesn't
-make any sense as CEA608 comes in byte pairs.
-
-Strip off any leftover bytes and assume everything before that is valid.
-
-Thanks to Antonio Morales for finding and reporting the issue.
-
-Fixes GHSL-2024-195
-Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3841
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8059>
----
- subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-index adace0b534..a72dfa9294 100644
---- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
-@@ -5770,6 +5770,11 @@ convert_to_s334_1a (const guint8 * ccpair, guint8 ccpair_size, guint field,
-   guint8 *storage;
-   gsize i;
- 
-+  /* Strip off any leftover odd bytes and assume everything before is valid */
-+  if (ccpair_size % 2 != 0) {
-+    ccpair_size -= 1;
-+  }
-+
-   /* We are converting from pairs to triplets */
-   *res = ccpair_size / 2 * 3;
-   storage = g_malloc (*res);
--- 
-2.47.0
-

SPECS/gstreamer1-plugins-good.spec

@@ -9,18 +9,36 @@
 %bcond_with nasm
 %endif
 
-%bcond_without qt
+# Only build amrnb/amrwbdec on fedora
+%if 0%{?fedora}
+%bcond_without amr
+%else
+%bcond_with amr
+%endif
+
+# RHEL 10 will provide Qt 6 and drop Qt 5
+%if 0%{?rhel} >= 10
+%bcond_with qt5
+%else
+%bcond_without qt5
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} < 10
+%bcond_with qt6
+%else
+%bcond_without qt6
+%endif
 
 #global gitrel     140
 #global gitcommit  9865730cfa5b3a8b2560d082e7e56b350042d3d2
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 Name:           gstreamer1-plugins-good
-Version:        1.22.1
-Release:        3%{?gitcommit:.git%{shortcommit}}%{?dist}
+Version:        1.24.6
+Release:        1%{?dist}
 Summary:        GStreamer plugins with good code and licensing
 
-License:        LGPLv2+
+License:        CC0-1.0 AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND xlock AND MIT AND BSD-3-Clause AND CC-BY-3.0 
 URL:            http://gstreamer.freedesktop.org/
 
 %if 0%{?gitrel}
@@ -37,14 +55,6 @@ Source0:        http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugin
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 Source1:        gstreamer-good.appdata.xml
 
-Patch0:		0001-flacparse-Avoid-integer-overflow-in-available-data-c.patch
-Patch1:		0002-qtdemux-Avoid-integer-overflow-when-parsing-Theora-e.patch
-Patch2:		0003-gdkpixbufdec-Check-if-initializing-the-video-info-ac.patch
-Patch3:		0004-matroskademux-Only-unmap-GstMapInfo-in-WavPack-heade.patch
-Patch4:		0005-matroskademux-Fix-off-by-one-when-parsing-multi-chan.patch
-Patch5:		0006-qtdemux-Fix-integer-overflow-when-allocating-the-sam.patch
-Patch6:		0007-qtdemux-Make-sure-only-an-even-number-of-bytes-is-pr.patch
-
 BuildRequires:  meson >= 0.48.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -58,7 +68,7 @@ BuildRequires:  gdk-pixbuf2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel >= 1.2.0
 BuildRequires:  libshout-devel
-BuildRequires:  libsoup-devel
+BuildRequires:  libsoup3-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXdamage-devel
@@ -78,14 +88,18 @@ BuildRequires:  mesa-libEGL-devel
 BuildRequires:  lame-devel
 BuildRequires:  mpg123-devel
 BuildRequires:  twolame-devel
+BuildRequires:  qt6-qtshadertools
 %if %{with nasm}
 BuildRequires:  nasm
 %endif
 BuildRequires:  libgudev-devel
+%if %{with amr}
+BuildRequires:  opencore-amr-devel
+%endif
 
 # extras
 %if %{with extras}
-BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  pipewire-jack-audio-connection-kit-devel
 %ifnarch s390 s390x
 BuildRequires:  libavc1394-devel
 BuildRequires:  libdv-devel
@@ -94,6 +108,10 @@ BuildRequires:  libraw1394-devel
 %endif
 %endif
 
+# The soup elements dynamically load either version of libsoup at runtime,
+# defaulting to libsoup3 if libsoup2 is not already loaded in the process
+Recommends:     libsoup3%{?_isa}
+
 # Obsoletes/Provides moved from plugins-bad-free
 Obsoletes:      gstreamer1-plugin-mpg123 < 1.13.1
 Provides:       gstreamer1-plugin-mpg123 = %{version}-%{release}
@@ -127,7 +145,7 @@ good quality and under the LGPL license.
 
 This package (%{name}-gtk) contains the gtksink output plugin.
 
-%if %{with qt}
+%if %{with qt5}
 %package qt
 Summary:         GStreamer "good" plugins qt qml plugin
 Requires:        %{name}%{?_isa} = %{version}-%{release}
@@ -137,6 +155,8 @@ BuildRequires: pkgconfig(Qt5Qml)
 BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5WaylandClient)
+BuildRequires: qt5-qtbase-private-devel
+BuildRequires: qt5-linguist
 
 Supplements: (gstreamer1-plugins-good and qt5-qtdeclarative)
 
@@ -150,6 +170,31 @@ good quality and under the LGPL license.
 This package (%{name}-qt) contains the qtsink output plugin.
 %endif
 
+%if %{with qt6}
+%package qt6
+Summary:         GStreamer "good" plugins qt6 qml plugin
+Requires:        %{name}%{?_isa} = %{version}-%{release}
+
+BuildRequires: pkgconfig(Qt6Gui)
+BuildRequires: pkgconfig(Qt6Qml)
+BuildRequires: pkgconfig(Qt6Quick)
+BuildRequires: pkgconfig(Qt6WaylandClient)
+BuildRequires: pkgconfig(Qt6Linguist)
+BuildRequires: qt6-qtbase-private-devel
+BuildRequires: qt6-linguist
+
+Supplements: (gstreamer1-plugins-good and qt6-qtdeclarative)
+
+%description qt6
+GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+GStreamer Good Plugins is a collection of well-supported plugins of
+good quality and under the LGPL license.
+
+This package (%{name}-qt6) contains the qml6sink output plugin.
+%endif
+
 %if %{with extras}
 %package extras
 Summary:        Extra GStreamer plugins with good code and licensing
@@ -171,13 +216,6 @@ to be installed.
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
-%patch0 -p3
-%patch1 -p3
-%patch2 -p3
-%patch3 -p3
-%patch4 -p3
-%patch5 -p3
-%patch6 -p3
 
 %build
 %meson \
@@ -191,6 +229,8 @@ to be installed.
   -D aalib=disabled \
   -D libcaca=disabled \
   -D rpicamsrc=disabled \
+  -D amrnb=%{?with_amr:enabled}%{!?with_amr:disabled} \
+  -D amrwbdec=%{?with_amr:enabled}%{!?with_amr:disabled} \
   -D jack=%{?with_extras:enabled}%{!?with_extras:disabled} \
 %ifarch s390 s390x
   -D dv=disabled -D dv1394=disabled \
@@ -198,10 +238,12 @@ to be installed.
   -D dv=%{?with_extras:enabled}%{!?with_extras:disabled} \
   -D dv1394=%{?with_extras:enabled}%{!?with_extras:disabled} \
 %endif
-%if 0%{?_module_build} && "%{_module_name}" == "flatpak-runtime"
+%if 0%{?flatpak_runtime}
   -D v4l2-gudev=disabled \
 %endif
-  -D qt6=disabled
+  -D qt-egl=disabled \
+  -D qt5=%{?with_qt5:enabled}%{!?with_qt5:disabled} \
+  -D qt6=%{?with_qt6:enabled}%{!?with_qt6:disabled}
 
 %meson_build
 
@@ -299,13 +341,25 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstmpg123.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttwolame.so
 
+%if %{with amr}
+%{_libdir}/gstreamer-%{majorminor}/libgstamrnb.so
+%{_libdir}/gstreamer-%{majorminor}/libgstamrwbdec.so
+%{_datadir}/gstreamer-%{majorminor}/presets/GstAmrnbEnc.prs
+%endif
 
 %files gtk
 # Plugins with external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstgtk.so
 
+%if %{with qt5}
 %files qt
 %{_libdir}/gstreamer-%{majorminor}/libgstqmlgl.so
+%endif
+
+%if %{with qt6}
+%files qt6
+%{_libdir}/gstreamer-%{majorminor}/libgstqml6.so
+%endif
 
 %if %{with extras}
 %files extras
@@ -319,40 +373,129 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 
 
 %changelog
-* Mon Dec 16 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.1-3
-- CVE-2024-47537, CVE-2024-47539, CVE-2024-47540, CVE-2024-47606,
-  CVE-2024-47613
-  Resolves: RHEL-70954, RHEL-70967, RHEL-70941, RHEL-71027,
-  Resolves: RHEL-71003
-
-* Wed Jan 17 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.1-2
-- CVE-2023-37327: integer overflow leading to heap overwrite in FLAC
-  image tag handling
-- Resolves: RHEL-19471
-
-* Thu Apr 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
+* Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.6-1
+- 1.24.6
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.5-1
+- 1.24.5
+
+* Wed May 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.4-1
+- 1.24.4
+
+* Tue Apr 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.3-1
+- 1.24.3
+
+* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 1.24.0-2
+- Rebuild (qt6)
+
+* Tue Mar 05 2024 Wim Taymans <wtaymans@redhat.com> - 1.24.0-1
+- Update to 1.24.0
+
+* Fri Feb 16 2024 Jan Grulich <jgrulich@redhat.com> - 1.22.9-3
+- Rebuild (qt6)
+
+* Tue Feb 13 2024 Pete Walter <pwalter@fedoraproject.org> - 1.22.9-2
+- Rebuild for libvpx 1.14.x
+
+* Thu Jan 25 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.9-1
+- 1.22.9
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.8-1
+- 1.22.8
+
+* Wed Nov 29 2023 Jan Grulich <jgrulich@redhat.com> - 1.22.7-2
+- Rebuild (qt6)
+
+* Tue Nov 14 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.7-1
+- 1.22.7
+
+* Fri Oct 13 2023 Jan Grulich <jgrulich@redhat.com> - 1.22.5-3
+- Rebuild (qt6)
+
+* Thu Oct 05 2023 Jan Grulich <jgrulich@redhat.com> - 1.22.5-2
+- Rebuild (qt6)
+
+* Fri Jul 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.5-1
+- Update to 1.22.5
+- Disable qt-egl and add some BuildRequires to make things compile.
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jun 18 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.3-2
+- Enable Qt6 plugin, disable Qt5 plugin for RHEL 10
+
+* Thu May 25 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.3-1
+- Update to 1.22.3
+
+* Thu Apr 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.2-1
+- Update to 1.22.2
+
+* Mon Mar 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
 - Update to 1.22.1
 
-* Fri Nov 11 2022 Wim Taymans <wtaymans@redhat.com> - 1.18.4-6
-- Fixes for CVE-2022-1920, CVE-2022-1921, CVE-2022-1922, CVE-2022-1923,
-  CVE-2022-1924, CVE-2022-1925, CVE-2022-2122
-  Resolves: rhbz#2131034, rhbz#2131039, rhbz#2131045, rhbz#2131049,
-            rhbz#2131054, rhbz#2131060, rhbz#2131064
+* Wed Feb 15 2023 Tom Callaway <spot@fedoraproject.org> - 1.22.0-2
+- rebuild for new libvpx
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Jan 24 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.0-1
+- Update to 1.22.0
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-4
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Fri Jan 20 2023 Wim Taymans <wtaymans@redhat.com> - 1.21.90-1
+- Update to 1.21.90
 
-* Fri May 14 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-3
-- Move libdv and friends to extras
-- Resolves: rhbz#1960634
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 11 2023 Wim Taymans <wtaymans@redhat.com> - 1.20.5-1
+- Update to 1.20.5
+
+* Thu Oct 13 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.4-1
+- Update to 1.20.4
+
+* Tue Sep 13 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.20.3-3
+- Rebuilt for flac 1.4.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jul 18 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.3-1
+- Update to 1.20.3
+
+* Fri Feb 4 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.0-1
+- Update to 1.20.0
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jan 27 2022 Tom Callaway <spot@fedoraproject.org> - 1.19.3-4
+- rebuild for libvpx
+
+* Wed Jan 26 2022 Wim Taymans <wtaymans@redhat.com> - 1.19.3-3
+- Fix build
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Nov 11 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.3-1
+- Update to 1.19.3
+
+* Thu Sep 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.2-1
+- Update to 1.19.2
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.1-1
+- Update to 1.19.1
+
+* Fri May 14 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-2
+- Move libdv and friends to extras
 
 * Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
 - Update to 1.18.4