7 changed files with 511 additions and 484 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gst-plugins-bad-free-1.24.10.tar.xz
+SOURCES/gst-plugins-bad-free-1.22.1.tar.xz
--- a/.gstreamer1-plugins-bad-free.metadata
+++ b/.gstreamer1-plugins-bad-free.metadata
@ -1 +1 @@
-998bd38eefd0ca2b60fc4149a42f2e0383038a2d SOURCES/gst-plugins-bad-free-1.24.10.tar.xz
+fb0172c16d7e8ab7c7c6497f302d64a6e0ff974b SOURCES/gst-plugins-bad-free-1.22.1.tar.xz
--- a/SOURCES/0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch
+++ b/SOURCES/0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch
@ -0,0 +1,323 @@
+From db2e5ccfcf4db7fc3d199d885b07e5eb34770c19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 20 Oct 2023 00:09:57 +0300
+Subject: [PATCH 1/2] mxfdemux: Store GstMXFDemuxEssenceTrack in their own
+ fixed allocation
+
+Previously they were stored inline inside a GArray, but as references to
+the tracks were stored in various other places although the array could
+still be updated (and reallocated!), this could lead to dangling
+references in various places.
+
+Instead now store them in a GPtrArray in their own allocation so each
+track's memory position stays fixed.
+
+Fixes ZDI-CAN-22299
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5638>
+---
+ .../gst-plugins-bad/gst/mxf/mxfdemux.c        | 116 ++++++++----------
+ .../gst-plugins-bad/gst/mxf/mxfdemux.h        |   2 +-
+ 2 files changed, 50 insertions(+), 68 deletions(-)
+
+diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
+index d9eb9a5844..1b58989631 100644
+--- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
+@@ -170,10 +170,25 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
+ }
+ 
+ static void
+-gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
+gst_mxf_demux_essence_track_free (GstMXFDemuxEssenceTrack * t)
+ {
+-  guint i;
+  if (t->offsets)
+    g_array_free (t->offsets, TRUE);
+
+  g_free (t->mapping_data);
+
+  if (t->tags)
+    gst_tag_list_unref (t->tags);
+
+  if (t->caps)
+    gst_caps_unref (t->caps);
+
+  g_free (t);
+}
+ 
+static void
+gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
+{
+   GST_DEBUG_OBJECT (demux, "Resetting MXF state");
+ 
+   g_list_foreach (demux->partitions, (GFunc) gst_mxf_demux_partition_free,
+@@ -182,23 +197,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
+   demux->partitions = NULL;
+ 
+   demux->current_partition = NULL;
+-
+-  for (i = 0; i < demux->essence_tracks->len; i++) {
+-    GstMXFDemuxEssenceTrack *t =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+-
+-    if (t->offsets)
+-      g_array_free (t->offsets, TRUE);
+-
+-    g_free (t->mapping_data);
+-
+-    if (t->tags)
+-      gst_tag_list_unref (t->tags);
+-
+-    if (t->caps)
+-      gst_caps_unref (t->caps);
+-  }
+-  g_array_set_size (demux->essence_tracks, 0);
+  g_ptr_array_set_size (demux->essence_tracks, 0);
+ }
+ 
+ static void
+@@ -216,7 +215,7 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+     GstMXFDemuxEssenceTrack *track =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+        g_ptr_array_index (demux->essence_tracks, i);
+ 
+     track->source_package = NULL;
+     track->delta_id = -1;
+@@ -419,7 +418,7 @@ gst_mxf_demux_partition_postcheck (GstMXFDemux * demux,
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+     GstMXFDemuxEssenceTrack *cand =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+        g_ptr_array_index (demux->essence_tracks, i);
+ 
+     if (cand->body_sid != partition->partition.body_sid)
+       continue;
+@@ -866,8 +865,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+ 
+       for (k = 0; k < demux->essence_tracks->len; k++) {
+         GstMXFDemuxEssenceTrack *tmp =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-            k);
+            g_ptr_array_index (demux->essence_tracks, k);
+ 
+         if (tmp->track_number == track->parent.track_number &&
+             tmp->body_sid == edata->body_sid) {
+@@ -885,24 +883,23 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+       }
+ 
+       if (!etrack) {
+-        GstMXFDemuxEssenceTrack tmp;
+        GstMXFDemuxEssenceTrack *tmp = g_new0 (GstMXFDemuxEssenceTrack, 1);
+ 
+-        memset (&tmp, 0, sizeof (tmp));
+-        tmp.body_sid = edata->body_sid;
+-        tmp.index_sid = edata->index_sid;
+-        tmp.track_number = track->parent.track_number;
+-        tmp.track_id = track->parent.track_id;
+-        memcpy (&tmp.source_package_uid, &package->parent.package_uid, 32);
+        tmp->body_sid = edata->body_sid;
+        tmp->index_sid = edata->index_sid;
+        tmp->track_number = track->parent.track_number;
+        tmp->track_id = track->parent.track_id;
+        memcpy (&tmp->source_package_uid, &package->parent.package_uid, 32);
+ 
+         if (demux->current_partition->partition.body_sid == edata->body_sid &&
+             demux->current_partition->partition.body_offset == 0)
+-          tmp.position = 0;
+          tmp->position = 0;
+         else
+-          tmp.position = -1;
+          tmp->position = -1;
+ 
+-        g_array_append_val (demux->essence_tracks, tmp);
+        g_ptr_array_add (demux->essence_tracks, tmp);
+         etrack =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+            g_ptr_array_index (demux->essence_tracks,
+             demux->essence_tracks->len - 1);
+         new = TRUE;
+       }
+@@ -1050,13 +1047,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+ 
+     next:
+       if (new) {
+-        g_free (etrack->mapping_data);
+-        if (etrack->tags)
+-          gst_tag_list_unref (etrack->tags);
+-        if (etrack->caps)
+-          gst_caps_unref (etrack->caps);
+-
+-        g_array_remove_index (demux->essence_tracks,
+        g_ptr_array_remove_index (demux->essence_tracks,
+             demux->essence_tracks->len - 1);
+       }
+     }
+@@ -1069,7 +1060,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+     GstMXFDemuxEssenceTrack *etrack =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+        g_ptr_array_index (demux->essence_tracks, i);
+ 
+     if (!etrack->source_package || !etrack->source_track || !etrack->caps) {
+       GST_ERROR_OBJECT (demux, "Failed to update essence track %u", i);
+@@ -1438,7 +1429,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
+ 
+     for (k = 0; k < demux->essence_tracks->len; k++) {
+       GstMXFDemuxEssenceTrack *tmp =
+-          &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k);
+          g_ptr_array_index (demux->essence_tracks, k);
+ 
+       if (tmp->source_package == source_package &&
+           tmp->source_track == source_track) {
+@@ -1927,8 +1918,7 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
+   pad->current_essence_track = NULL;
+ 
+   for (k = 0; k < demux->essence_tracks->len; k++) {
+-    GstMXFDemuxEssenceTrack *tmp =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k);
+    GstMXFDemuxEssenceTrack *tmp = g_ptr_array_index (demux->essence_tracks, k);
+ 
+     if (tmp->source_package == source_package &&
+         tmp->source_track == source_track) {
+@@ -2712,7 +2702,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
+   if (!etrack) {
+     for (i = 0; i < demux->essence_tracks->len; i++) {
+       GstMXFDemuxEssenceTrack *tmp =
+-          &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+          g_ptr_array_index (demux->essence_tracks, i);
+ 
+       if (tmp->body_sid == demux->current_partition->partition.body_sid &&
+           (tmp->track_number == track_number || tmp->track_number == 0)) {
+@@ -3916,8 +3906,7 @@ from_track_offset:
+   gst_mxf_demux_set_partition_for_offset (demux, demux->offset);
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+-    GstMXFDemuxEssenceTrack *t =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
+ 
+     if (index_start_position != -1 && t == etrack)
+       t->position = index_start_position;
+@@ -3941,8 +3930,7 @@ from_track_offset:
+       /* Handle EOS */
+       for (i = 0; i < demux->essence_tracks->len; i++) {
+         GstMXFDemuxEssenceTrack *t =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-            i);
+            g_ptr_array_index (demux->essence_tracks, i);
+ 
+         if (t->position > 0)
+           t->duration = t->position;
+@@ -4180,8 +4168,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
+           guint i;
+           for (i = 0; i < demux->essence_tracks->len; i++) {
+             GstMXFDemuxEssenceTrack *etrack =
+-                &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-                i);
+                g_ptr_array_index (demux->essence_tracks, i);
+ 
+             if (etrack->body_sid != partition->partition.body_sid)
+               continue;
+@@ -4652,9 +4639,8 @@ gst_mxf_demux_pad_to_track_and_position (GstMXFDemux * demux,
+   /* Get the corresponding essence track for the given source package and stream id */
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+     GstMXFDemuxEssenceTrack *track =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+-    GST_LOG_OBJECT (pad,
+-        "Looking at essence track body_sid:%d index_sid:%d",
+        g_ptr_array_index (demux->essence_tracks, i);
+    GST_LOG_OBJECT (pad, "Looking at essence track body_sid:%d index_sid:%d",
+         track->body_sid, track->index_sid);
+     if (clip->source_track_id == 0 || (track->track_id == clip->source_track_id
+             && mxf_umid_is_equal (&clip->source_package_id,
+@@ -4903,8 +4889,7 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event)
+   }
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+-    GstMXFDemuxEssenceTrack *t =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
+     t->position = -1;
+   }
+ 
+@@ -5342,8 +5327,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
+   }
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+-    GstMXFDemuxEssenceTrack *t =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
+     t->position = -1;
+   }
+ 
+@@ -5642,7 +5626,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+ 
+       for (i = 0; i < demux->essence_tracks->len; i++) {
+         GstMXFDemuxEssenceTrack *t =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
+            g_ptr_array_index (demux->essence_tracks, i);
+ 
+         if (t->position > 0)
+           t->duration = t->position;
+@@ -5683,8 +5667,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+ 
+           for (i = 0; i < demux->essence_tracks->len; i++) {
+             GstMXFDemuxEssenceTrack *etrack =
+-                &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-                i);
+                g_ptr_array_index (demux->essence_tracks, i);
+             etrack->position = -1;
+           }
+           ret = TRUE;
+@@ -5708,8 +5691,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+ 
+       for (i = 0; i < demux->essence_tracks->len; i++) {
+         GstMXFDemuxEssenceTrack *t =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-            i);
+            g_ptr_array_index (demux->essence_tracks, i);
+         t->position = -1;
+       }
+       demux->current_partition = NULL;
+@@ -5982,7 +5964,7 @@ gst_mxf_demux_finalize (GObject * object)
+ 
+   g_ptr_array_free (demux->src, TRUE);
+   demux->src = NULL;
+-  g_array_free (demux->essence_tracks, TRUE);
+  g_ptr_array_free (demux->essence_tracks, TRUE);
+   demux->essence_tracks = NULL;
+ 
+   g_hash_table_destroy (demux->metadata);
+@@ -6059,8 +6041,8 @@ gst_mxf_demux_init (GstMXFDemux * demux)
+   g_rw_lock_init (&demux->metadata_lock);
+ 
+   demux->src = g_ptr_array_new ();
+-  demux->essence_tracks =
+-      g_array_new (FALSE, FALSE, sizeof (GstMXFDemuxEssenceTrack));
+  demux->essence_tracks = g_ptr_array_new_with_free_func ((GDestroyNotify)
+      gst_mxf_demux_essence_track_free);
+ 
+   gst_segment_init (&demux->segment, GST_FORMAT_TIME);
+ 
+diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
+index d079a1de1a..1dc8a4edb5 100644
+--- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
+@@ -266,7 +266,7 @@ struct _GstMXFDemux
+   GList *partitions;
+   GstMXFDemuxPartition *current_partition;
+ 
+-  GArray *essence_tracks;
+  GPtrArray *essence_tracks;
+ 
+   GList *pending_index_table_segments;
+   GList *index_tables; /* one per BodySID / IndexSID */
+-- 
+2.43.0
+
--- a/SOURCES/0002-codecparsers-av1-Clip-max-tile-rows-and-cols-values.patch
+++ b/SOURCES/0002-codecparsers-av1-Clip-max-tile-rows-and-cols-values.patch
@ -0,0 +1,65 @@
+From 73f1409447033b8e3291a51893d5a027e2be15fc Mon Sep 17 00:00:00 2001
+From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+Date: Tue, 21 Nov 2023 14:26:54 +0100
+Subject: [PATCH 2/2] codecparsers: av1: Clip max tile rows and cols values
+
+Clip tile rows and cols to 64 as describe in AV1 specification
+to avoid writing outside array range but preserve sb_cols
+and sb_rows value which are used to futher computation.
+
+Fixes ZDI-CAN-22226 / CVE-2023-44429
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5734>
+---
+ .../gst-libs/gst/codecparsers/gstav1parser.c       | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
+index 22ffefd168..7ef583c7f5 100644
+--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
+@@ -2243,7 +2243,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
+     tile_width_sb = (sb_cols + (1 << parser->state.tile_cols_log2) -
+         1) >> parser->state.tile_cols_log2;
+     i = 0;
+-    for (start_sb = 0; start_sb < sb_cols; start_sb += tile_width_sb) {
+    /* Fill mi_col_starts[] and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS;
+        start_sb += tile_width_sb) {
+       parser->state.mi_col_starts[i] = start_sb << sb_shift;
+       i += 1;
+     }
+@@ -2272,7 +2274,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
+     tile_height_sb = (sb_rows + (1 << parser->state.tile_rows_log2) -
+         1) >> parser->state.tile_rows_log2;
+     i = 0;
+-    for (start_sb = 0; start_sb < sb_rows; start_sb += tile_height_sb) {
+    /* Fill mi_row_starts[] and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS;
+        start_sb += tile_height_sb) {
+       parser->state.mi_row_starts[i] = start_sb << sb_shift;
+       i += 1;
+     }
+@@ -2287,7 +2291,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
+   } else {
+     widest_tile_sb = 0;
+     start_sb = 0;
+-    for (i = 0; start_sb < sb_cols; i++) {
+    /* Fill mi_col_starts[] and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS; i++) {
+       parser->state.mi_col_starts[i] = start_sb << sb_shift;
+       max_width = MIN (sb_cols - start_sb, max_tile_width_sb);
+       tile_info->width_in_sbs_minus_1[i] =
+@@ -2312,7 +2317,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
+     max_tile_height_sb = MAX (max_tile_area_sb / widest_tile_sb, 1);
+ 
+     start_sb = 0;
+-    for (i = 0; start_sb < sb_rows; i++) {
+    /* Fill mi_row_starts[] and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS; i++) {
+       parser->state.mi_row_starts[i] = start_sb << sb_shift;
+       max_height = MIN (sb_rows - start_sb, max_tile_height_sb);
+       tile_info->height_in_sbs_minus_1[i] =
+-- 
+2.43.0
+
--- a/SOURCES/gst-p-bad-cleanup.sh
+++ b/SOURCES/gst-p-bad-cleanup.sh
@ -34,8 +34,6 @@ bayer
 camerabin
 camerabin2
 cdxaparse
-codecalpha
-codectimestamper
 coloreffects
 colorspace
 compositor
@ -44,7 +42,6 @@ dccp
 debugutils
 dtmf
 dvbsubenc
-dvbsuboverlay
 faceoverlay
 festival
 fieldanalysis
@ -58,7 +55,6 @@ h264parse
 hdvparse
 hls
 id3tag
-insertbin
 inter
 interlace
 invtelecine
@ -70,7 +66,6 @@ legacyresample
 librfb
 liveadder
 midi
-mse
 mve
 mpegdemux
 mpeg4videoparse
@ -83,7 +78,6 @@ netsim
 nsf
 nuvdemux
 onvif
-openh264
 patchdetect
 pcapparse
 pnm
@ -101,7 +95,6 @@ sdi
 sdp
 segmentclip
 selector
-siren
 smooth
 speed
 stereo
@ -110,7 +103,6 @@ switchbin
 timecode
 transcode
 tta
-unixfd
 valve
 videofilters
 videoframe_audiolevel
@ -124,7 +116,10 @@ y4m
 "

 NOT_ALLOWED="
+dvbsuboverlay
 dvdspu
+real
+siren
 "

 error()
--- a/SOURCES/openh264-add-license-file.patch
+++ b/SOURCES/openh264-add-license-file.patch
@ -1,45 +0,0 @@
-From b13e925daa574fb07aac0271f2b51c25ecb9d483 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Wed, 8 Nov 2023 14:41:14 +0100
-Subject: [PATCH 1/1] openh264: Add LICENSE file
-
-The openh264 plugin is BSD-licensed, different from the rest of the
-gst-plugins-bad. This commit splits the license text out in its own file
-to make it easier for binary distributions to distribute the license
-text.
---
- .../gst-plugins-bad/ext/openh264/LICENSE      | 22 +++++++++++++++++++
- 1 file changed, 22 insertions(+)
- create mode 100644 subprojects/gst-plugins-bad/ext/openh264/LICENSE
-
-diff --git a/subprojects/gst-plugins-bad/ext/openh264/LICENSE b/subprojects/gst-plugins-bad/ext/openh264/LICENSE
-new file mode 100644
-index 00000000000..e57601b4fb6
--- /dev/null
-+++ b/subprojects/gst-plugins-bad/ext/openh264/LICENSE
-@@ -0,0 +1,22 @@
-+Copyright (c) 2014, Ericsson AB. All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without modification,
-+are permitted provided that the following conditions are met:
-+
-+1. Redistributions of source code must retain the above copyright notice, this
-+list of conditions and the following disclaimer.
-+
-+2. Redistributions in binary form must reproduce the above copyright notice, this
-+list of conditions and the following disclaimer in the documentation and/or other
-+materials provided with the distribution.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-+OF SUCH DAMAGE.
-- 
-GitLab
-
--- a/SPECS/gstreamer1-plugins-bad-free.spec
+++ b/SPECS/gstreamer1-plugins-bad-free.spec
@ -2,38 +2,37 @@
 %global         _gobject_introspection  1.31.1

 # Only have extras package on fedora
-%bcond extras %{defined fedora}
-%bcond opencv %[ 0%{?fedora} >= 39 ]
-%bcond openh264 %[ 0%{?fedora} >= 40 ]
-%bcond svtav1 %[ 0%{?fedora} >= 40 ]
-# requires new webrtc-audio-processing-1
-%bcond webrtcdsp %[ 0%{?fedora} >= 40 || 0%{?rhel} >= 10 ]
+%if 0%{?fedora}
+%bcond_without extras
+%else
+%bcond_with extras
+%endif

 #global gitrel     140
 #global gitcommit  4ca3a22b6b33ad8be4383063e76f79c4d346535d
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})

 Name:           gstreamer1-plugins-bad-free
-Version:        1.24.10
-Release:        1%{?dist}
+Version:        1.22.1
+Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins

 License:        LGPLv2+ and LGPLv2
 URL:            http://gstreamer.freedesktop.org/
 %if 0%{?gitrel}
-# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-bad
-# cd gst-plugins-bad; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
+# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-good
+# cd gst-plugins-good; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 %else
 # The source is:
-# https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
+# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 %endif
 Source0:        gst-plugins-bad-free-%{version}.tar.xz
 Source1:        gst-p-bad-cleanup.sh

-# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5622
-Patch:          openh264-add-license-file.patch
+Patch0:		0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch
+Patch1:		0002-codecparsers-av1-Clip-max-tile-rows-and-cols-values.patch

 BuildRequires:  meson >= 0.48.0
 BuildRequires:  gcc-c++
@ -79,24 +78,13 @@ BuildRequires:  libwebp-devel
 BuildRequires:  mesa-libEGL-devel
 BuildRequires:  vulkan-devel
 #BuildRequires:  mesa-vulkan-devel
+BuildRequires:  webrtc-audio-processing-devel
 %if 0
 BuildRequires:  wpewebkit-devel
 BuildRequires:  wpebackend-fdo-devel
 %endif
 BuildRequires:  glslc
 BuildRequires:  libdrm-devel
-BuildRequires:  libva-devel
-%if %{with svtav1}
-BuildRequires:  svt-av1-devel
-%endif
-BuildRequires:  liblc3-devel
-BuildRequires:  json-glib-devel
-%if %{with openh264}
-BuildRequires:  pkgconfig(openh264)
-%endif
-%if %{with webrtcdsp}
-BuildRequires:  pkgconfig(webrtc-audio-processing-1)
-%endif

 %if %{with extras}
 BuildRequires:  ladspa-devel
@ -119,15 +107,16 @@ BuildRequires:  libcurl-devel
 BuildRequires:  libssh2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  game-music-emu-devel
+BuildRequires:  libkate-devel
 BuildRequires:  libmodplug-devel
-BuildRequires:  libmpcdec-devel
 ## Plugins not ported
 #BuildRequires:  libmusicbrainz-devel
 #BuildRequires:  libtimidity-devel
+BuildRequires:  libva-devel
 BuildRequires:  openal-soft-devel
-%if %{with opencv}
-BuildRequires:  opencv-devel
-%endif
+## If enabled, adds ~90 additional deps; perhaps can be moved to a
+## subpackage?
+#BuildRequires:  opencv-devel
 BuildRequires:  openjpeg2-devel
 BuildRequires:  pkgconfig(spandsp) >= 0.0.6
 ## Plugins not ported
@ -142,20 +131,13 @@ BuildRequires:  libnice-devel
 BuildRequires:  pkgconfig(ldacBT-enc)
 %endif
 BuildRequires:  qrencode-devel
-BuildRequires:  vo-amrwbenc-devel
-BuildRequires:  libavtp-devel
-BuildRequires:  libdca-devel
-BuildRequires:  flite-devel
+BuildRequires:  json-glib-devel
 %endif

-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
 # libgstfdkaac.so used to be shipped in -nonfree
 Obsoletes: gstreamer1-plugins-bad-nonfree < 1.16.1-2
 %endif
-# dtsdec, dvbsuboverlay, siren used to be shipped in -freeworld
-Conflicts: gstreamer1-plugins-bad-freeworld < 1.22.7-2

 # Drop after f36
 Provides: gst-transcoder = 1.16.0-4
@ -232,49 +214,6 @@ plugin which allows playback of midi files.
 %endif


-%if %{with opencv}
-%package opencv
-Summary:         GStreamer "bad" plugins OpenCV plugins
-Requires:        %{name}%{?_isa} = %{version}-%{release}
-Requires:        opencv-data
-
-%description opencv
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-gstreamer-plugins-bad contains plug-ins that aren't tested well enough,
-or the code is not of good enough quality.
-
-This package (%{name}-opencv) contains the OpenCV plugins.
-%endif
-
-
-%if %{with openh264}
-%package -n gstreamer1-plugin-openh264
-Summary:        GStreamer OpenH264 plugin
-License:        LGPL-2.0-or-later AND BSD-2-Clause
-# Prefer actual openh264 library over the noopenh264 stub
-Suggests:       openh264%{_isa}
-
-%description -n gstreamer1-plugin-openh264
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-This package contains the OpenH264 plugin.
-%endif
-
-
-%package libs
-Summary:        Runtime libraries for the GStreamer media framework "bad" plug-ins
-
-%description libs
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-This package contains the runtime libraries for plugins that
-aren't tested well enough, or the code is not of good enough quality.
-
-
 %package devel
 Summary:        Development files for the GStreamer media framework "bad" plug-ins
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@ -294,7 +233,9 @@ aren't tested well enough, or the code is not of good enough quality.


 %prep
-%autosetup -n gst-plugins-bad-%{version} -p3
+%setup -q -n gst-plugins-bad-%{version}
+%patch0 -p3
+%patch1 -p3

 %build
 %meson \
@ -307,35 +248,28 @@ aren't tested well enough, or the code is not of good enough quality.
    %{!?with_extras:-D directsound=disabled -D dts=disabled } \
    %{!?with_extras:-D fluidsynth=disabled -D openexr=disabled } \
    %{!?with_extras:-D curl=disabled -D curl-ssh2=disabled } \
-    %{!?with_extras:-D ttml=disabled } \
+    %{!?with_extras:-D ttml=disabled -D kate=disabled } \
    %{!?with_extras:-D modplug=disabled } \
    %{!?with_extras:-D openal=disabled } \
-    %{!?with_opencv:-D opencv=disabled } \
-    %{!?with_openh264:-D openh264=disabled } \
-    %{!?with_svtav1:-D svtav1=disabled } \
-    %{!?with_extras:-D openjpeg=disabled } \
+    %{!?with_extras:-D opencv=disabled -D openjpeg=disabled } \
    %{!?with_extras:-D wildmidi=disabled -D zbar=disabled } \
    %{!?with_extras:-D gme=disabled -D lv2=disabled } \
    %{!?with_extras:-D webrtc=disabled -D aom=disabled } \
    %{!?with_extras:-D teletext=disabled -D srt=disabled } \
    %{!?with_extras:-D openmpt=disabled -D microdns=disabled } \
    %{!?with_extras:-D ladspa=disabled } \
-    %{!?with_extras:-D avtp=disabled -D dts=disabled } \
-    %{!?with_extras:-D flite=disabled } \
    -D doc=disabled -D magicleap=disabled -D msdk=disabled \
-    -D faac=disabled -D faad=disabled \
+    -D dts=disabled -D faac=disabled -D faad=disabled \
    -D mpeg2enc=disabled -D mplex=disabled \
    -D neon=disabled -D rtmp=disabled \
-    -D sbc=disabled \
-    %{!?with_extras:-D spandsp=disabled } \
-    %{!?with_extras:-D voamrwbenc=disabled } \
-    -D x265=disabled \
-    -D dvdspu=disabled \
+    -D flite=disabled -D sbc=disabled -D opencv=disabled \
+    %{!?with_extras:-D spandsp=disabled -D va=disabled } \
+    -D voamrwbenc=disabled -D x265=disabled \
+    -D dvbsuboverlay=disabled -D dvdspu=disabled -D siren=disabled \
    -D opensles=disabled -D tinyalsa=disabled \
-    -D wasapi=disabled -D wasapi2=disabled \
+    -D wasapi=disabled -D wasapi2=disabled -D avtp=disabled \
    -D dc1394=disabled -D directfb=disabled -D iqa=disabled \
-    -D libde265=disabled -D openni2=disabled \
-    %{!?with_extras:-D musepack=disabled } \
+    -D libde265=disabled -D musepack=disabled -D openni2=disabled \
    -D svthevcenc=disabled -D voaacenc=disabled \
    -D zxing=disabled -D wpe=disabled -D x11=disabled \
 %ifarch s390x
@ -344,23 +278,15 @@ aren't tested well enough, or the code is not of good enough quality.
    %{!?with_extras:-D ldac=disabled } 		\
 %endif
    %{!?with_extras:-D qroverlay=disabled } 		\
-    -D gs=disabled -D isac=disabled \
+    -D openh264=disabled -D gs=disabled -D isac=disabled \
    -D onnx=disabled -D openaptx=disabled -Dgpl=enabled \
-    -D amfcodec=disabled -D directshow=disabled -D qsv=disabled \
-    %{!?with_webrtcdsp:-D webrtcdsp=disabled } \
-    -D aja=disabled -D qt6d3d11=disabled
+    -D amfcodec=disabled -D directshow=disabled -D qsv=disabled

 %meson_build

 %install
 %meson_install

-%if %{with opencv}
-# no pkgconfig file or GIR, nothing aside from the plugin uses the library
-rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/opencv/*
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgstopencv-%{majorminor}.so
-%endif
-
 # Register as an AppStream component to be visible in the software center
 #
 # NOTE: It would be *awesome* if this file was maintained by the upstream
@ -411,58 +337,24 @@ cat > $RPM_BUILD_ROOT%{_metainfodir}/gstreamer-bad-free.appdata.xml <<EOF
 </component>
 EOF

-%if %{with openh264}
-cat > $RPM_BUILD_ROOT%{_metainfodir}/gstreamer-openh264.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Kalev Lember <klember@redhat.com> -->
-<component type="codec">
-  <id>gstreamer-openh264</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>GStreamer Multimedia Codecs - H.264</name>
-  <summary>Multimedia playback for H.264</summary>
-  <description>
-    <p>
-      This addon includes a codec for H.264 playback and encoding.
-    </p>
-    <p>
-      These codecs can be used to encode and decode media files where the
-      format is not patent encumbered.
-    </p>
-    <p>
-      A codec decodes audio and video for playback or editing and is also
-      used for transmission or storage.
-      Different codecs are used in video-conferencing, streaming media and
-      video editing applications.
-    </p>
-  </description>
-  <url type="homepage">http://gstreamer.freedesktop.org/</url>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer</url>
-  <url type="help">http://gstreamer.freedesktop.org/documentation/</url>
-  <url type="donation">http://www.gnome.org/friends/</url>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-%endif
-
 %find_lang gst-plugins-bad-%{majorminor}

+# unpackaged files
+rm $RPM_BUILD_ROOT%{_bindir}/playout
+
 %ldconfig_scriptlets

 %files -f gst-plugins-bad-%{majorminor}.lang
 %license COPYING
 %doc AUTHORS NEWS README.md README.static-linking RELEASE REQUIREMENTS

-%{_metainfodir}/gstreamer-bad-free.appdata.xml
+%{_metainfodir}/*.appdata.xml
 %{_bindir}/gst-transcoder-%{majorminor}

 # presets
-%dir %{_datadir}/gstreamer-%{majorminor}/
 %dir %{_datadir}/gstreamer-%{majorminor}/presets/
 %{_datadir}/gstreamer-%{majorminor}/presets/GstFreeverb.prs
-%dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/
-%dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/device/
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/device/dvd.gep
-%dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/avi.gep
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/flv.gep
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/mkv.gep
@ -472,15 +364,60 @@ EOF
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/ogv.gep
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/ts.gep
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/webm.gep
-%dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/online-services/
 %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/online-services/youtube.gep

+# opencv data
+#{_datadir}/gst-plugins-bad/%{majorminor}/opencv_haarcascades/
+
+%{_libdir}/libgstadaptivedemux-%{majorminor}.so.*
+%{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.*
+%{_libdir}/libgstbadaudio-%{majorminor}.so.*
+%{_libdir}/libgstcodecparsers-%{majorminor}.so.*
+%{_libdir}/libgstcodecs-%{majorminor}.so.*
+%{_libdir}/libgstcuda-%{majorminor}.so.*
+%{_libdir}/libgstinsertbin-%{majorminor}.so.*
+%{_libdir}/libgstisoff-%{majorminor}.so.*
+%{_libdir}/libgstmpegts-%{majorminor}.so.*
+#{_libdir}/libgstopencv-%{majorminor}.so.*
+%{_libdir}/libgstplay-%{majorminor}.so.*
+%{_libdir}/libgstplayer-%{majorminor}.so.*
+%{_libdir}/libgstphotography-%{majorminor}.so.*
+%{_libdir}/libgstsctp-%{majorminor}.so.*
+%{_libdir}/libgsttranscoder-%{majorminor}.so.*
+%{_libdir}/libgsturidownloader-%{majorminor}.so.*
+%{_libdir}/libgstvulkan-%{majorminor}.so.*
+%if %{with extras}
+%{_libdir}/libgstva-%{majorminor}.so.*
+%endif
+%{_libdir}/libgstwebrtc-%{majorminor}.so.*
+%if %{with extras}
+%{_libdir}/libgstwebrtcnice-%{majorminor}.so.*
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 7
+%{_libdir}/libgstwayland-%{majorminor}.so.*
+%endif
+
+%{_libdir}/girepository-1.0/CudaGst-1.0.typelib
+%{_libdir}/girepository-1.0/GstBadAudio-1.0.typelib
+%{_libdir}/girepository-1.0/GstCodecs-1.0.typelib
+%{_libdir}/girepository-1.0/GstCuda-1.0.typelib
+%{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib
+%{_libdir}/girepository-1.0/GstMpegts-1.0.typelib
+%{_libdir}/girepository-1.0/GstPlay-1.0.typelib
+%{_libdir}/girepository-1.0/GstPlayer-1.0.typelib
+%{_libdir}/girepository-1.0/GstTranscoder-1.0.typelib
+%if %{with extras}
+%{_libdir}/girepository-1.0/GstVa-1.0.typelib
+%endif
+%{_libdir}/girepository-1.0/GstVulkan-1.0.typelib
+%{_libdir}/girepository-1.0/GstVulkanWayland-1.0.typelib
+%{_libdir}/girepository-1.0/GstWebRTC-1.0.typelib
+
 # Plugins without external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstaccurip.so
 %{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
-%{_libdir}/gstreamer-%{majorminor}/libgstanalyticsoverlay.so
 %{_libdir}/gstreamer-%{majorminor}/libgstasfmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaudiobuffersplit.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaudiofxbad.so
@ -495,11 +432,14 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstcoloreffects.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdash.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdvbsubenc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdvbsuboverlay.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfaceoverlay.so
 %if %{with extras}
 %{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
 %endif
+
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
+%{_libdir}/gstreamer-%{majorminor}/libgstfdkaac.so
+%endif
 %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfieldanalysis.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfreeverb.so
@ -536,7 +476,6 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsegmentclip.so
 %{_libdir}/gstreamer-%{majorminor}/libgstshm.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsiren.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsmoothstreaming.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
@ -551,11 +490,6 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
 %{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcodec2json.so
-%{_libdir}/gstreamer-%{majorminor}/libgstinsertbin.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstunixfd.so
-%{_libdir}/gstreamer-%{majorminor}/libgstuvcgadget.so

 # System (Linux) specific plugins
 %{_libdir}/gstreamer-%{majorminor}/libgstdvb.so
@ -569,14 +503,10 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstclosedcaption.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcolormanagement.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtls.so
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
-%{_libdir}/gstreamer-%{majorminor}/libgstfdkaac.so
-%endif
 %{_libdir}/gstreamer-%{majorminor}/libgsthls.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgtkwayland.so
 %{_libdir}/gstreamer-%{majorminor}/libgstkms.so
-%{_libdir}/gstreamer-%{majorminor}/libgstlc3.so
 %{_libdir}/gstreamer-%{majorminor}/libgstnvcodec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopusparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrist.so
@ -584,15 +514,12 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
-%{_libdir}/gstreamer-%{majorminor}/libgstva.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvulkan.so
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so
 %endif
 %{_libdir}/gstreamer-%{majorminor}/libgstwebp.so
-%if %{with webrtcdsp}
 %{_libdir}/gstreamer-%{majorminor}/libgstwebrtcdsp.so
-%endif
 %if 0
 %{_libdir}/gstreamer-%{majorminor}/libgstwpe.so
 %endif
@ -601,9 +528,6 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstttmlsubs.so
 %endif
-%if %{with svtav1}
-%{_libdir}/gstreamer-%{majorminor}/libgstsvtav1.so
-%endif

 #debugging plugin
 %{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
@ -611,28 +535,23 @@ EOF

 %if %{with extras}
 %files extras
-# presets
-%{_datadir}/gstreamer-%{majorminor}/presets/GstVoAmrwbEnc.prs
-
 # Plugins with external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstaom.so
 %{_libdir}/gstreamer-%{majorminor}/libgstassrender.so
-%{_libdir}/gstreamer-%{majorminor}/libgstavtp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbs2b.so
 %{_libdir}/gstreamer-%{majorminor}/libgstchromaprint.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcurl.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdtsdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgstflite.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgme.so
+%{_libdir}/gstreamer-%{majorminor}/libgstkate.so
 %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 %ifnarch s390x
 %{_libdir}/gstreamer-%{majorminor}/libgstldac.so
 %endif
 %{_libdir}/gstreamer-%{majorminor}/libgstmicrodns.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmusepack.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenal.so
+#{_libdir}/gstreamer-%{majorminor}/libgstopencv.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenexr.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenjpeg.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenmpt.so
@ -640,7 +559,7 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstspandsp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstteletext.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvoamrwbenc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstva.so

 %files zbar
 # Plugins with external dependencies
@ -655,68 +574,6 @@ EOF
 %{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
 %endif

-%if %{with opencv}
-%files opencv
-# Plugins with external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstopencv.so
-%{_libdir}/libgstopencv-%{majorminor}.so.0{,.*}
-%endif
-
-%if %{with openh264}
-%files -n gstreamer1-plugin-openh264
-%license COPYING
-%license ext/openh264/LICENSE
-%{_metainfodir}/gstreamer-openh264.appdata.xml
-%{_libdir}/gstreamer-1.0/libgstopenh264.so
-%endif
-
-%files libs
-%license COPYING
-%{_libdir}/libgstanalytics-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstadaptivedemux-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstbadaudio-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstcodecparsers-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstcodecs-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstcuda-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstdxva-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstinsertbin-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstisoff-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstmpegts-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstmse-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstplay-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstplayer-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstphotography-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstsctp-%{majorminor}.so.0{,.*}
-%{_libdir}/libgsttranscoder-%{majorminor}.so.0{,.*}
-%{_libdir}/libgsturidownloader-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstvulkan-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstva-%{majorminor}.so.0{,.*}
-%{_libdir}/libgstwebrtc-%{majorminor}.so.0{,.*}
-%if %{with extras}
-%{_libdir}/libgstwebrtcnice-%{majorminor}.so.0{,.*}
-%endif
-%if 0%{?fedora} || 0%{?rhel} > 7
-%{_libdir}/libgstwayland-%{majorminor}.so.0{,.*}
-%endif
-
-%{_libdir}/girepository-1.0/CudaGst-1.0.typelib
-%{_libdir}/girepository-1.0/GstAnalytics-1.0.typelib
-%{_libdir}/girepository-1.0/GstBadAudio-1.0.typelib
-%{_libdir}/girepository-1.0/GstCodecs-1.0.typelib
-%{_libdir}/girepository-1.0/GstCuda-1.0.typelib
-%{_libdir}/girepository-1.0/GstDxva-1.0.typelib
-%{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib
-%{_libdir}/girepository-1.0/GstMpegts-1.0.typelib
-%{_libdir}/girepository-1.0/GstMse-1.0.typelib
-%{_libdir}/girepository-1.0/GstPlay-1.0.typelib
-%{_libdir}/girepository-1.0/GstPlayer-1.0.typelib
-%{_libdir}/girepository-1.0/GstTranscoder-1.0.typelib
-%{_libdir}/girepository-1.0/GstVa-1.0.typelib
-%{_libdir}/girepository-1.0/GstVulkan-1.0.typelib
-%{_libdir}/girepository-1.0/GstVulkanWayland-1.0.typelib
-%{_libdir}/girepository-1.0/GstWebRTC-1.0.typelib
-
 %files devel
 %if 0
 %doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
@ -724,34 +581,30 @@ EOF
 %endif

 %{_datadir}/gir-1.0/CudaGst-%{majorminor}.gir
-%{_datadir}/gir-1.0/GstAnalytics-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstBadAudio-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstCodecs-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstCuda-%{majorminor}.gir
-%{_datadir}/gir-1.0/GstDxva-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstInsertBin-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstMpegts-%{majorminor}.gir
-%{_datadir}/gir-1.0/GstMse-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstPlay-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstPlayer-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstTranscoder-%{majorminor}.gir
+%if %{with extras}
 %{_datadir}/gir-1.0/GstVa-%{majorminor}.gir
+%endif
 %{_datadir}/gir-1.0/GstVulkan-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstVulkanWayland-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstWebRTC-%{majorminor}.gir

-%{_libdir}/libgstanalytics-%{majorminor}.so
 %{_libdir}/libgstadaptivedemux-%{majorminor}.so
 %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so
 %{_libdir}/libgstbadaudio-%{majorminor}.so
 %{_libdir}/libgstcuda-%{majorminor}.so
 %{_libdir}/libgstcodecparsers-%{majorminor}.so
 %{_libdir}/libgstcodecs-%{majorminor}.so
-%{_libdir}/libgstdxva-%{majorminor}.so
 %{_libdir}/libgstinsertbin-%{majorminor}.so
 %{_libdir}/libgstisoff-%{majorminor}.so
 %{_libdir}/libgstmpegts-%{majorminor}.so
-%{_libdir}/libgstmse-%{majorminor}.so
 #{_libdir}/libgstopencv-%{majorminor}.so
 %{_libdir}/libgstplay-%{majorminor}.so
 %{_libdir}/libgstplayer-%{majorminor}.so
@ -760,7 +613,9 @@ EOF
 %{_libdir}/libgsttranscoder-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
 %{_libdir}/libgstvulkan-%{majorminor}.so
+%if %{with extras}
 %{_libdir}/libgstva-%{majorminor}.so
+%endif
 %{_libdir}/libgstwebrtc-%{majorminor}.so
 %if %{with extras}
 %{_libdir}/libgstwebrtcnice-%{majorminor}.so
@ -770,7 +625,6 @@ EOF
 %endif

 %{_includedir}/gstreamer-%{majorminor}/gst/audio
-%{_includedir}/gstreamer-%{majorminor}/gst/analytics
 %{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc
 %{_includedir}/gstreamer-%{majorminor}/gst/codecparsers
 %{_includedir}/gstreamer-%{majorminor}/gst/cuda/
@ -778,33 +632,34 @@ EOF
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography*
 %{_includedir}/gstreamer-%{majorminor}/gst/isoff/
 %{_includedir}/gstreamer-%{majorminor}/gst/mpegts
-%{_includedir}/gstreamer-%{majorminor}/gst/mse/
 #{_includedir}/gstreamer-%{majorminor}/gst/opencv
 %{_includedir}/gstreamer-%{majorminor}/gst/play
 %{_includedir}/gstreamer-%{majorminor}/gst/player
 %{_includedir}/gstreamer-%{majorminor}/gst/sctp
 %{_includedir}/gstreamer-%{majorminor}/gst/transcoder
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader
+%if %{with extras}
 %{_includedir}/gstreamer-%{majorminor}/gst/va/
+%endif
 %{_includedir}/gstreamer-%{majorminor}/gst/vulkan/
 %{_includedir}/gstreamer-%{majorminor}/gst/wayland/
 %{_includedir}/gstreamer-%{majorminor}/gst/webrtc/

 # pkg-config files
-%{_libdir}/pkgconfig/gstreamer-analytics-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-bad-audio-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-cuda-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-codecparsers-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-insertbin-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-mpegts-%{majorminor}.pc
-%{_libdir}/pkgconfig/gstreamer-mse-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-photography-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-player-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-sctp-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-transcoder-%{majorminor}.pc
+%if %{with extras}
 %{_libdir}/pkgconfig/gstreamer-va-%{majorminor}.pc
+%endif
 %{_libdir}/pkgconfig/gstreamer-vulkan-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-vulkan-wayland-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-wayland-%{majorminor}.pc
@ -815,198 +670,32 @@ EOF


 %changelog
-* Thu Dec 12 2024 Wim Taymans <wtaymans@redhat.com> - 1.24.10-1
- Update to 1.24.10
-  Resolves: RHEL-70406
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.24.6-2
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.24.6-1
- Rebuilt for MSVSphere 10
-
-* Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.6-1
- 1.24.6
-
-* Thu Jul 25 2024 Sérgio Basto <sergio@serjux.com> - 1.24.5-3
- Rebuild for opencv 4.10.0
-
-* 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
-
-* Thu May 30 2024 Robert-André Mauchin <zebob.m@gmail.com> - 1.24.4-2
- Rebuild for svt-av1 2.1.0
+* Tue Dec 12 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-2
+- Patch CVE-2023-44429: AV1 codec parser heap-based buffer overflow
+- Patch CVE-2023-44446: MXF demuxer use-after-free
+- Resolves: RHEL-17030, RHEL-17039

-* 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
-
-* Mon Apr 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.0-3
- openexr rebuild
-
-* Wed Mar 13 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.24.0-2
- Re-enable webrtcdsp for f40+ and ELN
-
-* Tue Mar 05 2024 Wim Taymans <wtaymans@redhat.com> - 1.24.0-1
- Update to 1.24.0
-
-* Thu Feb 08 2024 Kalev Lember <klember@redhat.com> - 1.22.9-3
- Add gstreamer1-plugin-openh264 subpackage with the openh264 plugin
-
-* Tue Feb 06 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.9-2
- Rebuilt for opencv-4.9.0
-
-* 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-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 08 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.8-3
- Backport of "va: fixes for Mesa driver"
- Resolves: rhbz#2256693
-
-* Wed Dec 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.8-2
- Enable dvbsuboverlay and siren plugins
- Enable avtp, dtsdec, and flite plugins in extras
-
-* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.8-1
- 1.22.8
-
-* Tue Nov 21 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 1.22.7-2
- Move gstva from extras into main package
-
-* Tue Nov 14 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.7-1
- 1.22.7
-
-* Fri Sep 22 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.5-2
- Separate libs subpackage
- Enable opencv as separate subpackage
-
-* Fri Jul 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.5-1
- Update to 1.22.5
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu May 25 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.3-1
- Update to 1.22.3
-
-* Sun May 21 2023 Sérgio Basto <sergio@serjux.com> - 1.22.2-4
- Remove obsolete of plugins-bad-freeworld to workaround a dnf bug
-  https://bugzilla.redhat.com/show_bug.cgi?id=1867376#c9
-
-* Thu Apr 27 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.2-3
- Fix migration of musepack and voamrwbenc to -bad-free-extras
-
-* Mon Apr 24 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.2-2
- Enable musepack and voamrwbenc in extras
-
-* 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
+* Thu Apr 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
 - Update to 1.22.1

-* Tue Jan 24 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.0-1
- Update to 1.22.0
-
-* Fri Jan 20 2023 Wim Taymans <wtaymans@redhat.com> - 1.21.90-1
- Update to 1.21.90
-
-* 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
- Remove unwanted crypto dependencies.
-
-* Mon Nov 14 2022 Stephen Gallagher <sgallagh@redhat.com> - 1.20.4-2
- Drop vdpau configure option
- The libgstva plugin is now excluded from file listings when disabled
- Resolves: rhbz#2141093
-
-* Thu Oct 13 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.4-1
- Update to 1.20.4
-
-* 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
-
-* Wed Jun 22 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.20.0-4
- Rebuilt for new aom
-
-* Sat Jun 18 2022 Scott Talbert <swt@techie.net> - 1.20.0-3
- Rebuild for srt-1.5.0 (#2097636, #2098341)
-
-* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 1.20.0-2
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
-
-* Fri Feb 4 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.0-1
- Update to 1.20.0
-
-* Thu Feb 03 2022 Scott Talbert <swt@techie.net> - 1.19.3-6
- Enable rtmp2 plugin (#1915517)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 Scott Talbert <swt@techie.net> - 1.19.3-4
- Fix GstPlayer with GstPlayerVideoOverlayVideoRenderer (#2035937)
-
-* Mon Jan 10 2022 Scott Talbert <swt@techie.net> - 1.19.3-3
- Add BR for wayland-protocols-devel to fix another FTBFS
-
-* Mon Nov 22 2021 Scott Talbert <swt@techie.net> - 1.19.3-2
- Fix FTBFS with meson 0.60.1 (#2025782)
-
-* Thu Nov 11 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.3-1
- Update to 1.19.3
- Remove ofa plugin, is was removed
-
-* Thu Sep 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.2-1
- Update to 1.19.2
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.19.1-8
- Rebuilt with OpenSSL 3.0.0
-
-* Sat Aug 21 2021 Richard Shaw <hobbes1069@gmail.com> - 1.19.1-7
- Rebuild for OpenEXR/Imath 3.1.
-
-* Tue Aug 10 2021 Richard Shaw <hobbes1069@gmail.com> - 1.19.1-6
- Rebuild for OpenEXR 3.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.1-4
- Enable sctp plugin
-
-* Mon Jun 21 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.19.1-3
- Fluidsynth rebuild.
+* Mon Nov 07 2022 Tomas Popela <tpopela@redhat.com> - 1.18.4-6
+- Fix FTBFS by BR wayland-protocols-devel
+- Resolves: rhbz#2140540

-* Sun Jun 13 2021 Robert-André Mauchin <zebob.m@gmail.com> - 1.19.1-2
- Rebuilt for aom v3.1.1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Thu Jun 03 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.1-1
- Update to 1.19.1
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065

-* Wed May 26 2021 Nicolas Chauvet <kwizart@gmail.com> - 1.18.4-3
- Rebuilt for srt
+* Mon Jun 07 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-3
+- Apply vulkan multilib patch
+- Resolves: rhbz#1915341

-* Tue Apr 6 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-2
- Add patch to fix multilib issues with vulkan (#1915341)
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
 - Update to 1.18.4